Merge pull request #57 from flagbit/akeneo5

Update for Akeneo 5

.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: "ubuntu-18.04"
     strategy:
       matrix:
-        php-versions: ['7.3']
+        php-versions: ['7.4']
 
     steps:
       - uses: "actions/[email protected]"
@@ -40,7 +40,7 @@ jobs:
     runs-on: "ubuntu-18.04"
     strategy:
       matrix:
-        php-versions: [ '7.3' ]
+        php-versions: [ '7.4' ]
 
     steps:
       - uses: "actions/[email protected]"

.scrutinizer.yml

@@ -6,7 +6,7 @@ build:
           - libmagickwand-dev
           - libmagickcore-dev
         php:
-          version: 7.3
+          version: 7.4
           pecl_extensions:
             - apcu
             - imagick

CHANGELOG-5.0.md

@@ -0,0 +1,3 @@
+# 5.0.0
+
+- Add support for Akeneo 5.0.0.

CONTRIBUTING.md

@@ -6,7 +6,9 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 
 | Branch | Akeneo Compatibility |
 | ------------- |:-------------:|
-| `master` | `>= 3.0.0` |
+| `master` | `>= 5.0.0` |
+| `4.0` | `>= 4.0.0` |
+| `3.0` | `>= 3.0.0` |
 | `2.X` | `>= 2.0.5 & < 3.0.0` |
 | `2.0` | `>= 2.0.0 & < 2.0.5` |
 | `1.X` | `>= 1.6.0 & < 2.0.0` |

README.md

@@ -114,6 +114,7 @@ php bin/console --env=prod doctrine:migrations:migrate
 
 This extension supports the latest Akeneo PIM CE/EE stable versions:
 
+* 5.0
 * 4.0
 * 3.2 (LTS)
 * 3.0 (LTS)

composer.json

@@ -34,7 +34,7 @@
   },
   "require": {
     "ext-json": "*",
-    "akeneo/pim-community-dev": "^4.0"
+    "akeneo/pim-community-dev": "^5.0"
   },
   "require-dev": {
     "phpspec/phpspec": "^6.1",

jest/integration/formextensions.test.js

@@ -14,6 +14,7 @@ describe('Form Extensions', function() {
                 operators: [ 'IN', 'EMPTY', 'NOT EMPTY' ]
             },
             position: 100,
+            feature: null,
             code: 'akeneo-attribute-select-filter'
         };
 

spec/Flagbit/Bundle/TableAttributeBundle/Component/Product/Factory/Value/TableValueFactorySpec.php

@@ -64,7 +64,7 @@ public function it_throws_exception_on_empty_data()
 
     private function createAttribute(bool $isScopable, bool $isLocalizable): Attribute
     {
-        return new Attribute('code', 'flagbit_catalog_table', [], $isLocalizable, $isScopable, null, false, 'backend', ['de_DE', 'en_US']);
+        return new Attribute('code', 'flagbit_catalog_table', [], $isLocalizable, $isScopable, null, null, false, 'backend', ['de_DE', 'en_US']);
     }
 
     public function it_supports_attribute_type()

src/Resources/config/form_extensions/attribute/edit.yml

@@ -1,12 +1,9 @@
 extensions:
     flagbit-catalog-table-attribute-edit-form:
-        module: pim/attribute-edit-form/tab/choices
+        module: flagbit/product/field/choices
         parent: pim-attribute-edit-form-form-tabs
         targetZone: container
         position: 110
-        config:
-            label: flagbit.table_attribute.form.attribute.tab.title
-            activeForTypes: [flagbit_catalog_table]
 
     flagbit-catalog-table-attribute-edit-form-options-grid:
         module: flagbit/options-grid

src/Resources/config/query_builders.xml

@@ -7,7 +7,7 @@
     <services>
 
         <service id="flagbit_catalog_table.doctrine.query.filter.columns" class="%pim_catalog.query.elasticsearch.filter.option.class%">
-            <argument type="service" id="pim_catalog.validator.helper.attribute"/>
+            <argument type="service" id="pim_catalog.validator.helper.attribute_filter"/>
             <argument type="service" id="pim_catalog.repository.attribute_option"/>
             <argument type="collection">
                 <argument>flagbit_catalog_table</argument>

src/Resources/config/requirejs.yml

@@ -15,6 +15,7 @@ config:
         flagbit/tablecolumnview:                        flagbittableattribute/js/tablecolumnview
         flagbit/inittable:                              flagbittableattribute/js/inittable
         flagbit/options-grid:                           flagbittableattribute/js/options-grid
+        flagbit/product/field/choices:                  flagbittableattribute/js/product/field/choices
 
     config:
         pim/form/common/attributes/create-button:

src/Resources/public/js/product/field/choices.js

@@ -0,0 +1,47 @@
+'use strict';
+
+define([
+    'underscore',
+    'oro/translator',
+    'pim/form',
+    'pim/template/common/form-container'
+],
+function (
+    _,
+    __,
+    BaseForm,
+    template
+) {
+    return BaseForm.extend({
+        className: 'tab-content',
+        template: _.template(template),
+
+        /**
+         * {@inheritdoc}
+         */
+        initialize: function () {
+            BaseForm.prototype.initialize.apply(this, arguments);
+        },
+
+        /**
+         * {@inheritdoc}
+         */
+        configure: function () {
+            this.trigger('tab:register', {
+                code: this.code,
+                label: __('flagbit.table_attribute.form.attribute.tab.title')
+            });
+
+            return BaseForm.prototype.configure.apply(this, arguments);
+        },
+
+        /**
+         * {@inheritdoc}
+         */
+        render: function () {
+            this.$el.html(this.template());
+
+            this.renderExtensions();
+        }
+    });
+});

tests/Kernel/config/packages/test/imports.yml

@@ -16,6 +16,7 @@ imports:
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/test_fake/oneup_flysystem.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/oro_filter.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/oro_translation.yml' }
+    - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/services/test/storage.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/security.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/test/security.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/sensio_framework_extra.yml' }
@@ -25,6 +26,7 @@ imports:
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/services/pim_parameters.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/services/services.yml' }
     - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/services/pim.yml' }
+    - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/monolog.yml' }
 #    - { resource: '../../../../../vendor/akeneo/pim-community-dev/config/packages/doctrine.yml' }
 
 doctrine:

tests/Pim/TagsAndServiceOverridesTest.php

@@ -73,6 +73,7 @@ public function testScalarValueCreated()
             false,
             null,
             null,
+            null,
             'flagbit_catalog_table',
             []
         );
@@ -126,6 +127,7 @@ public function testSupportsTableValueFactory()
             false,
             null,
             null,
+            null,
             'flagbit_catalog_table',
             []
         );