ACPT-1429: PR stabilization

Author: adifucan

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -22,6 +22,7 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 100.0.2
  */
 abstract class AbstractType

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

@@ -220,12 +220,42 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
                 return true;
             }
 
-            if ($rowData[$attrCode] === $this->context->getEmptyAttributeValueConstant() && !$attrParams['is_required']) {
+            if ($rowData[$attrCode] === $this->context->getEmptyAttributeValueConstant()
+                && !$attrParams['is_required']) {
                 return true;
             }
         }
 
+        $valid = $this->validateByAttributeType($attrCode, $attrParams, $rowData);
+
+        if ($valid && !empty($attrParams['is_unique'])) {
+            if (isset($this->_uniqueAttributes[$attrCode][$rowData[$attrCode]])
+                && ($this->_uniqueAttributes[$attrCode][$rowData[$attrCode]] != $rowData[Product::COL_SKU])) {
+                $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_UNIQUE_ATTRIBUTE]);
+                return false;
+            }
+            $this->_uniqueAttributes[$attrCode][$rowData[$attrCode]] = $rowData[Product::COL_SKU];
+        }
+
+        if (!$valid) {
+            $this->setInvalidAttribute($attrCode);
+        }
+
+        return (bool)$valid;
+    }
+
+    /**
+     * Validates attribute type.
+     *
+     * @param string $attrCode
+     * @param array $attrParams
+     * @param array $rowData
+     * @return bool
+     */
+    private function validateByAttributeType(string $attrCode, array $attrParams, array $rowData): bool
+    {
         $valid = false;
+
         switch ($attrParams['type']) {
             case 'varchar':
             case 'text':
@@ -266,20 +296,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
                 break;
         }
 
-        if ($valid && !empty($attrParams['is_unique'])) {
-            if (isset($this->_uniqueAttributes[$attrCode][$rowData[$attrCode]])
-                && ($this->_uniqueAttributes[$attrCode][$rowData[$attrCode]] != $rowData[Product::COL_SKU])) {
-                $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_UNIQUE_ATTRIBUTE]);
-                return false;
-            }
-            $this->_uniqueAttributes[$attrCode][$rowData[$attrCode]] = $rowData[Product::COL_SKU];
-        }
-
-        if (!$valid) {
-            $this->setInvalidAttribute($attrCode);
-        }
-
-        return (bool)$valid;
+        return $valid;
     }
 
     /**

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php

@@ -15,11 +15,11 @@ class Media extends AbstractImportValidator implements RowValidatorInterface
      * @deprecated As this regexp doesn't give guarantee of correct url validation
      * @see \Magento\Framework\Url\Validator::isValid()
      */
-    const URL_REGEXP = '|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i';
+    private const URL_REGEXP = '|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i';
 
-    const PATH_REGEXP = '#^(?!.*[\\/]\.{2}[\\/])(?!\.{2}[\\/])[-\w.\\/]+$#';
+    private const PATH_REGEXP = '#^(?!.*[\\/]\.{2}[\\/])(?!\.{2}[\\/])[-\w.\\/]+$#';
 
-    const ADDITIONAL_IMAGES = 'additional_images';
+    private const ADDITIONAL_IMAGES = 'additional_images';
 
     /**
      * The url validator. Checks if given url is valid.
@@ -40,14 +40,16 @@ public function __construct(Validator $validator = null)
      * @deprecated
      * @see \Magento\CatalogImportExport\Model\Import\Product::getMultipleValueSeparator()
      */
-    const ADDITIONAL_IMAGES_DELIMITER = ',';
+    private const ADDITIONAL_IMAGES_DELIMITER = ',';
 
     /**
      * @var array
      */
     protected $mediaAttributes = ['image', 'small_image', 'thumbnail'];
 
     /**
+     * Checks if the provided $string parameter is a valid URL or not.
+     *
      * @param string $string
      * @return bool
      * @deprecated 100.2.0 As this method doesn't give guarantee of correct url validation.
@@ -59,6 +61,8 @@ protected function checkValidUrl($string)
     }
 
     /**
+     * Validates a provided string as a file or directory path.
+     *
      * @param string $string
      * @return bool
      */
@@ -68,6 +72,8 @@ protected function checkPath($string)
     }
 
     /**
+     * Checks whether a file or directory exists at a given path
+     *
      * @param string $path
      * @return bool
      */

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php

@@ -24,7 +24,7 @@ public function __construct(\Magento\CatalogImportExport\Model\Import\Product\St
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isValid($value)
     {

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -612,6 +612,18 @@ private function getFieldAndValuePairs(array|string $variation): array
         }
 
         $fieldAndValuePairsText = explode($this->_entityModel->getMultipleValueSeparator(), $variation);
+
+        return $this->processFieldAndValuePairs($fieldAndValuePairsText);
+    }
+
+    /**
+     * Process field and value pairs.
+     *
+     * @param array $fieldAndValuePairsText
+     * @return array
+     */
+    private function processFieldAndValuePairs(array $fieldAndValuePairsText): array
+    {
         $fieldAndValuePairs = [];
         $fieldName = null;
 

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -837,12 +837,20 @@ protected function prepareSampleData($rowCol, $entityId = null)
     private function prepareStructuredSampleData(array $samples, $entityId = null): array
     {
         $result = [];
+
         foreach ($samples as $sample) {
-            $result[] = array_merge(
-                $this->dataSample,
-                ['product_id' => $entityId],
-                $this->parseStructuredSampleOption($sample)
-            );
+            $structuredSampleOption = $this->parseStructuredSampleOption($sample);
+
+            $temp = [];
+            foreach ($this->dataSample as $key => $value) {
+                $temp[$key] = $value;
+            }
+            $temp['product_id'] = $entityId;
+            foreach ($structuredSampleOption as $key => $value) {
+                $temp[$key] = $value;
+            }
+
+            $result[] = $temp;
         }
 
         return $result;
@@ -883,12 +891,17 @@ protected function prepareLinkData($rowCol, $entityId = null)
     private function prepareStructuredLinkData(array $links, $entityId = null): array
     {
         $result = [];
+
         foreach ($links as $link) {
-            $result[] = array_merge(
-                $this->dataLink,
-                ['product_id' => $entityId],
-                $this->parseStructuredLinkOption($link)
-            );
+            $linkOptions = $this->parseStructuredLinkOption($link);
+            $newLink = $this->dataLink;
+
+            foreach ($linkOptions as $key => $value) {
+                $newLink[$key] = $value;
+            }
+
+            $newLink['product_id'] = $entityId;
+            $result[] = $newLink;
         }
 
         return $result;

app/code/Magento/ImportExport/Model/Import/Source/Json.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ImportExport\Model\Import\Source;
 
 use Magento\Framework\Exception\ValidatorException;
@@ -66,7 +68,7 @@ public function __construct(
         // convert all scalar values to strings
         $this->items = array_map(function ($item) {
             return array_map(function ($value) {
-                return is_scalar($value) ? strval($value) : $value;
+                return is_scalar($value) ? (string) $value : $value;
             }, $item);
         }, $this->items);
         if (isset($this->items[0])) {
@@ -106,6 +108,7 @@ public function rewind()
      * @param int $position
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function seek($position)
     {
         $this->position = $position;