Merge pull request #58 from akeneo/release/100.2.4

Release/100.2.4
akeneo · Oct 16, 2019 · 5e81379 · 5e81379
2 parents 98fb417 + 6e2472b
commit 5e81379
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,4 +22,9 @@
 * Fix missing where statement on delete in website association feature
 * Fix product website request if attribute is not filled in Akeneo
 * Fix duplicate node in config.xml file
-* Add check on family label to prevent import error on duplicate labels in Akeneo
+* Add check on family label to prevent import error on duplicate labels in Akeneo
+
+### Version 100.2.4 :
+* Fix import command description
+* Convert uppercase attribute mapping to lowercase
+* Set import job response after step finish events
diff --git a/Console/Command/AkeneoConnectorImportCommand.php b/Console/Command/AkeneoConnectorImportCommand.php
@@ -69,10 +69,11 @@ public function __construct(
     protected function configure()
     {
         $this->setName('akeneo_connector:import')->setDescription('Import Akeneo data to Magento')->addOption(
-                self::IMPORT_CODE,
-                null,
-                InputOption::VALUE_REQUIRED
-            );
+            self::IMPORT_CODE,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'Code of import job to run. To run multiple jobs consecutively, use comma-separated import job codes'
+        );
     }
 
     /**

diff --git a/Helper/Config.php b/Helper/Config.php
@@ -742,9 +742,7 @@ public function isCategoryUsedInProductUrl($storeId = null)
     public function isUrlKeyMapped()
     {
         /** @var mixed $matches */
-        $matches = $this->scopeConfig->getValue(self::PRODUCT_ATTRIBUTE_MAPPING);
-        /** @var mixed[] $matches */
-        $matches = $this->serializer->unserialize($matches);
+        $matches = $this->getAttributeMapping();
         if (!is_array($matches)) {
             return false;
         }
@@ -764,4 +762,25 @@ public function isUrlKeyMapped()
 
         return false;
     }
+
+    /**
+     * Get the attribute mapping, with lowered values
+     *
+     * @return mixed
+     */
+    public function getAttributeMapping()
+    {
+        /** @var mixed $matches */
+        $matches = $this->scopeConfig->getValue(self::PRODUCT_ATTRIBUTE_MAPPING);
+        $matches = $this->serializer->unserialize($matches);
+        /** @var mixed $loweredMatchs */
+        $loweredMatches = [];
+        /** @var string[] $match */
+        foreach ($matches as $match) {
+            $match           = array_map('strtolower', $match);
+            $loweredMatches[] = $match;
+        }
+
+        return $loweredMatches;
+    }
 }
diff --git a/Job/Import.php b/Job/Import.php
@@ -443,16 +443,14 @@ public function execute()
             $this->stop(true);
             $this->setMessage($exception->getMessage());
         }
-        /** @var array $response */
-        $response = $this->getResponse();
 
         $this->eventManager->dispatch('akeneo_connector_import_step_finish', ['import' => $this]);
         $this->eventManager->dispatch(
             'akeneo_connector_import_step_finish_'.strtolower($this->getCode()),
             ['import' => $this]
         );
 
-        return $response;
+        return $this->getResponse();
     }
 
     /**

diff --git a/Job/Product.php b/Job/Product.php
@@ -447,8 +447,7 @@ public function addRequiredData()
         }
 
         /** @var string|array $matches */
-        $matches = $this->scopeConfig->getValue(ConfigHelper::PRODUCT_ATTRIBUTE_MAPPING);
-        $matches = $this->serializer->unserialize($matches);
+        $matches = $this->configHelper->getAttributeMapping();
         if (!is_array($matches)) {
             return;
         }

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "php-http/guzzle6-adapter": "^1.1"
   },
   "type": "magento2-module",
-  "version": "100.2.3",
+  "version": "100.2.4",
   "license": [
     "OSL-3.0",
     "AFL-3.0"