Merge branch 'develop' into rb

firegento · Oct 21, 2022 · f16d7c5 · f16d7c5
2 parents bc21051 + 6d32161
commit f16d7c5
Show file tree

Hide file tree

Showing 24 changed files with 100 additions and 79 deletions.
diff --git a/Exception/ImportException.php b/Exception/ImportException.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
+ */
+
 declare(strict_types=1);
 
 namespace FireGento\FastSimpleImport\Exception;

diff --git a/Exception/RuntimeException.php b/Exception/RuntimeException.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
+ */
+
 declare(strict_types=1);
 
 namespace FireGento\FastSimpleImport\Exception;

diff --git a/Exception/ValidationException.php b/Exception/ValidationException.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
+ */
+
 declare(strict_types=1);
 
 namespace FireGento\FastSimpleImport\Exception;

diff --git a/Model/Adapters/ArrayAdapter.php b/Model/Adapters/ArrayAdapter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Adapters;

diff --git a/Model/Adapters/ArrayAdapterFactory.php b/Model/Adapters/ArrayAdapterFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Adapters;

diff --git a/Model/Adapters/ImportAdapterFactoryInterface.php b/Model/Adapters/ImportAdapterFactoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Adapters;

diff --git a/Model/Adapters/NestedArrayAdapter.php b/Model/Adapters/NestedArrayAdapter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Adapters;
@@ -26,9 +26,9 @@ public function __construct(array $data, string $multipleValueSeparator = ', ')
     }
 
     /**
-     * Transform nested array to string
+     * Transform nested array to flat array of strings
      */
-    private function convertToArray(array &$line)
+    private function convertToArray(array &$line): void
     {
         $implodeStr = $this->multipleValueSeparator;
         $array = array_map(

diff --git a/Model/Adapters/NestedArrayAdapterFactory.php b/Model/Adapters/NestedArrayAdapterFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Adapters;

diff --git a/Model/Config.php b/Model/Config.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
+
 namespace FireGento\FastSimpleImport\Model;
 
 use Magento\Framework\App\Helper\AbstractHelper;
@@ -16,8 +17,7 @@ class Config extends AbstractHelper
     private const XML_PATH_VALIDATION_STRATEGY     = 'fastsimpleimport/default/validation_strategy';
     private const XML_PATH_ALLOWED_ERROR_COUNT     = 'fastsimpleimport/default/allowed_error_count';
     private const XML_PATH_IMPORT_IMAGES_FILE_FIR  = 'fastsimpleimport/default/import_images_file_dir';
-
-    public const  XML_PATH_CATEGORY_PATH_SEPERATOR = 'fastsimpleimport/default/category_path_seperator';
+    private const XML_PATH_CATEGORY_PATH_SEPERATOR = 'fastsimpleimport/default/category_path_seperator';
 
     public function __construct(
         Context $context
@@ -54,4 +54,9 @@ public function getImportFileDir(): string
     {
         return $this->scopeConfig->getValue(self::XML_PATH_IMPORT_IMAGES_FILE_FIR);
     }
+
+    public function getCategoryPathSeparator(): string
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CATEGORY_PATH_SEPERATOR);
+    }
 }
diff --git a/Model/Config/Source/Behavior.php b/Model/Config/Source/Behavior.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Config\Source;
@@ -14,10 +14,8 @@ class Behavior implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * Return available behaviors
-     *
-     * @return array
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         if ($this->options === null) {
             $this->options = [

diff --git a/Model/Config/Source/ValidationStrategy.php b/Model/Config/Source/ValidationStrategy.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model\Config\Source;
@@ -14,10 +14,8 @@ class ValidationStrategy implements \Magento\Framework\Option\ArrayInterface
 
     /**
      * Return available validation strategies
-     *
-     * @return array
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         if ($this->options === null) {
             $this->options = [

diff --git a/Model/Enterprise/CategoryImportVersion.php b/Model/Enterprise/CategoryImportVersion.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
+ */
+
 namespace FireGento\FastSimpleImport\Model\Enterprise;
 
 use Magento\Staging\Model\VersionManager;

diff --git a/Model/Enterprise/VersionFeaturesFactory.php b/Model/Enterprise/VersionFeaturesFactory.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
+ */
+
 namespace FireGento\FastSimpleImport\Model\Enterprise;
 
 use Magento\Framework\ObjectManagerInterface;

diff --git a/Model/Import/Category.php b/Model/Import/Category.php
@@ -216,6 +216,7 @@ class Category extends \Magento\ImportExport\Model\Import\AbstractEntity
     private CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator;
     private UrlPersistInterface $urlPersist;
     private CategoryRepositoryInterface $categoryRepository;
+    private Config $config;
 
     public function __construct(
         StringUtils $string,
@@ -239,6 +240,7 @@ public function __construct(
         CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
         CategoryRepositoryInterface $categoryRepository,
         UrlPersistInterface $urlPersist,
+        Config $config,
         array $data = []
     ) {
         parent::__construct(
@@ -279,8 +281,9 @@ public function __construct(
             ->initAttributes()
             ->initAttributeSetId();
 
-        $this->entityTable = $this->defaultCategory->getResource()->getEntityTable();
+        $this->entityTable                  = $this->defaultCategory->getResource()->getEntityTable();
         $this->categoryImportVersionFeature = $this->versionFeatures->create('CategoryImportVersion');
+        $this->config                       = $config;
     }
 
     /**
@@ -382,10 +385,7 @@ private function initCategories(): self
                     $this->categoriesWithRoots[$rootCategoryName] = [];
                 }
 
-                $index = $this->implodeEscaped(
-                    $this->_scopeConfig->getValue(Config::XML_PATH_CATEGORY_PATH_SEPERATOR),
-                    $path
-                );
+                $index = $this->implodeEscaped($this->config->getCategoryPathSeparator(), $path);
                 $this->categoriesWithRoots[$rootCategoryName][$index] = [
                     'entity_id' => $category->getId(),
                     CategoryInterface::KEY_PATH => $category->getData(CategoryInterface::KEY_PATH),
@@ -417,10 +417,7 @@ private function implodeEscaped(?string $glue, array $array): string
         foreach ($array as $value) {
             $newArray[] = str_replace($glue, '\\' . $glue, $value);
         }
-        return implode(
-            $this->_scopeConfig->getValue(Config::XML_PATH_CATEGORY_PATH_SEPERATOR),
-            $newArray
-        );
+        return implode($this->config->getCategoryPathSeparator(), $newArray);
     }
 
     /**
@@ -616,10 +613,11 @@ private function indexDeleteEvents(): self
      * @return $this
      * @throws \Exception
      */
-    private function reindexUpdatedCategories($categoryId)
+    protected function reindexUpdatedCategories($categoryId)
     {
-        /** @var $category CategoryModel */
-        $category = $this->defaultCategory->load($categoryId);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $this->categoryRepository->get($categoryId);
+
         foreach ($category->getStoreIds() as $storeId) {
             if ($storeId == 0) {
                 continue;
@@ -859,15 +857,11 @@ private function getCategoryName(array $rowData): string
         if (isset($rowData[CategoryModel::KEY_NAME]) && strlen($rowData[CategoryModel::KEY_NAME])) {
             return $rowData[CategoryModel::KEY_NAME];
         }
-
-        $categoryParts = $this->explodeEscaped(
-            $rowData[self::COL_CATEGORY],
-            $this->_scopeConfig->getValue(Config::XML_PATH_CATEGORY_PATH_SEPERATOR)
-        );
+        $categoryParts = $this->explodeEscaped($this->config->getCategoryPathSeparator(), $rowData[self::COL_CATEGORY]);
         return end($categoryParts);
     }
 
-    private function explodeEscaped(string $string, string $delimiter = '/'): array
+    private function explodeEscaped(string $delimiter, string $string): array
     {
         $exploded = explode($delimiter, $string);
         $fixed = [];
@@ -910,15 +904,10 @@ protected function getParentCategory(array $rowData)
             );
             $parent = $categoryParts[count($categoryParts) - 2];
         } else {
-            $categoryParts = $this->explodeEscaped(
-                $rowData[self::COL_CATEGORY],
-                $this->_scopeConfig->getValue(Config::XML_PATH_CATEGORY_PATH_SEPERATOR)
-            );
+            $categoryParts = $this->explodeEscaped($this->config->getCategoryPathSeparator(),
+                $rowData[self::COL_CATEGORY]);
             array_pop($categoryParts);
-            $parent = $this->implodeEscaped(
-                $this->_scopeConfig->getValue(Config::XML_PATH_CATEGORY_PATH_SEPERATOR),
-                $categoryParts
-            );
+            $parent = $this->implodeEscaped($this->config->getCategoryPathSeparator(), $categoryParts);
         }
 
         if ($parent) {
@@ -1170,7 +1159,9 @@ private function getUploader(): Uploader
     private function saveCategoryEntity(array $entityRowsIn, array $entityRowsUp): self
     {
         if ($entityRowsIn) {
-            $entityRowsIn = $this->categoryImportVersionFeature->processCategory($entityRowsIn);
+            if ($this->categoryImportVersionFeature !== null) {
+                $entityRowsIn = $this->categoryImportVersionFeature->processCategory($entityRowsIn);
+            }
 
             $this->_connection->insertMultiple($this->entityTable, $entityRowsIn);
         }
@@ -1197,9 +1188,11 @@ private function saveCategoryEntity(array $entityRowsIn, array $entityRowsUp): s
      */
     private function saveCategoryAttributes(array $attributesData): self
     {
-        $entityFieldName = $this->categoryImportVersionFeature ?
-            $this->categoryImportVersionFeature->getEntityFieldName() :
-            'entity_id';
+        if ($this->categoryImportVersionFeature !== null) {
+            $entityFieldName = $this->categoryImportVersionFeature->getEntityFieldName();
+        } else {
+            $entityFieldName = 'entity_id';
+        }
 
         $entityIds = array();
 

diff --git a/Model/Import/Proxy/Category/ResourceModel.php b/Model/Import/Proxy/Category/ResourceModel.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
+
 namespace FireGento\FastSimpleImport\Model\Import\Proxy\Category;
 
 class ResourceModel extends \Magento\Catalog\Model\ResourceModel\Category

diff --git a/Model/Importer.php b/Model/Importer.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Model;

diff --git a/ResourceModel/ImportData.php b/ResourceModel/ImportData.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\ResourceModel;

diff --git a/Service/ImportErrorService.php b/Service/ImportErrorService.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 
 namespace FireGento\FastSimpleImport\Service;

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">

diff --git a/etc/config.xml b/etc/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">

diff --git a/etc/di.xml b/etc/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 FireGento e.V. - All rights reserved.
- * See LICENSE.md bundled with this module for license details.
+ * @copyright © 2016 - 2022 FireGento e.V. - All rights reserved.
+ * @license https://opensource.org/licenses/GPL-3.0 GPL-3
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"