🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #30069: Stabilize CMS Page asset links tests (by @konarshankar07)
 - #30011: Directory and filename must be no more than 255 characters in length (by @lfluvisotto)
 - #30153: [Performance] Fix array merge in loop (by @ihor-sviziev)
 - #29827: [MFTF] add new  AdminOpenConfigurationStoresPageActionGroup (by @Usik2203)
 - #28379: ISSUE-27397 - Fix phrase handling in widget validation (by @zaximus84)
 - #29015: Module catalog, Attribute Repository code validation regex (by @drc0)
 - #27869: \Magento\Framework\Filesystem\Io\File::read() should be able to accept resource in second argument (by @bnymn)
 - #27585: Remove redundant fieldset in sale rule form (by @edenduong)


Fixed GitHub Issues:
 - #30164: Stabilize CMS Page asset links tests (reported by @sivaschenko) has been fixed in #30069 by @konarshankar07 in 2.4-develop branch
   Related commits:
     1. a93e2e8
     2. 3835116
     3. 89b550a
     4. 34e32f0
     5. 0ba658f
     6. 1eaa4e2
     7. 5df1b7e
     8. 64a2a38
     9. 69b43d7
     10. 2ce4e1e
     11. 9630367
     12. f80005a
     13. 915c776
     14. 999b239

 - #29377: Filename is too long exception when importing media images (reported by @stephansteiner) has been fixed in #30011 by @lfluvisotto in 2.4-develop branch
   Related commits:
     1. 52f39a4

 - #30183: [Issue] [Performance] Fix array merge in loop (reported by @m2-assistant[bot]) has been fixed in #30153 by @ihor-sviziev in 2.4-develop branch
   Related commits:
     1. 2381ab4

 - #29848: [Issue] [MFTF] add new  AdminOpenConfigurationStoresPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29827 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 6c9a976
     2. 3220bcd
     3. cf66a7b
     4. f6ba58c
     5. c703749

 - #27397: Creating custom widget instance validation is weird due to controller type mismatch (reported by @MellenIO) has been fixed in #28379 by @zaximus84 in 2.4-develop branch
   Related commits:
     1. f20b05b
     2. 1e4ef87
     3. 3d82fe3
     4. 0f1c459
     5. d0e8bda

 - #29017: Product Attribute Repository do not respect attribute_code max length (reported by @drc0) has been fixed in #29015 by @drc0 in 2.4-develop branch
   Related commits:
     1. d2c352d
     2. 37dbcf7
     3. 2663ff4
     4. 78ed862
     5. 65a67aa
     6. 428e3d8
     7. 431bfe5

 - #27866: \Magento\Framework\Filesystem\Io\File::read() method is not compatible with \Magento\Framework\Filesystem\Io\IoInterface::read() (reported by @bnymn) has been fixed in #27869 by @bnymn in 2.4-develop branch
   Related commits:
     1. cbc6637
     2. d177789
     3. 4024320
     4. c160b44
     5. ed111ae
     6. a00f2d0
     7. b480c4d
     8. 2b2acee
     9. b5bce0b

 - #29599: [Issue] Remove redundant fieldset in sale rule form (reported by @m2-assistant[bot]) has been fixed in #27585 by @edenduong in 2.4-develop branch
   Related commits:
     1. 8da8356

Author: magento-engcom-team

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -158,6 +158,8 @@ public function __construct(
     protected function initTypeModels()
     {
         $productTypes = $this->_exportConfig->getEntityTypes(CatalogProduct::ENTITY);
+        $disabledAttrs = [];
+        $indexValueAttributes = [];
         foreach ($productTypes as $productTypeName => $productTypeConfig) {
             if (!($model = $this->_typeFactory->create($productTypeConfig['model']))) {
                 throw new \Magento\Framework\Exception\LocalizedException(
@@ -174,21 +176,19 @@ protected function initTypeModels()
             }
             if ($model->isSuitable()) {
                 $this->_productTypeModels[$productTypeName] = $model;
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $this->_indexValueAttributes = array_merge(
-                    $this->_indexValueAttributes,
-                    $model->getIndexValueAttributes()
-                );
+                $disabledAttrs[] = $model->getDisabledAttrs();
+                $indexValueAttributes[] = $model->getIndexValueAttributes();
             }
         }
         if (!$this->_productTypeModels) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('There are no product types available for export')
             );
         }
-        $this->_disabledAttrs = array_unique($this->_disabledAttrs);
+        $this->_disabledAttrs = array_unique(array_merge([], $this->_disabledAttrs, ...$disabledAttrs));
+        $this->_indexValueAttributes = array_unique(
+            array_merge([], $this->_indexValueAttributes, ...$indexValueAttributes)
+        );
         return $this;
     }
 
@@ -518,6 +518,8 @@ protected function getTierPrices(array $listSku, $table)
         if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
             $exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
         }
+        $selectFields = [];
+        $exportData = false;
         if ($table == ImportAdvancedPricing::TABLE_TIER_PRICE) {
             $selectFields = [
                 ImportAdvancedPricing::COL_SKU => 'cpe.sku',

app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php

@@ -117,6 +117,7 @@ public function process(string $encodedMessage)
         $status = OperationInterface::STATUS_TYPE_COMPLETE;
         $errorCode = null;
         $messages = [];
+        $entityParams = [];
         $topicName = $operation->getTopicName();
         $handlers = $this->configuration->getHandlers($topicName);
         try {
@@ -127,7 +128,7 @@ public function process(string $encodedMessage)
             $this->logger->error($e->getMessage());
             $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
             $errorCode = $e->getCode();
-            $messages[] = $e->getMessage();
+            $messages[] = [$e->getMessage()];
         }
 
         $outputData = null;
@@ -136,9 +137,7 @@ public function process(string $encodedMessage)
                 $result = $this->executeHandler($callback, $entityParams);
                 $status = $result['status'];
                 $errorCode = $result['error_code'];
-                // phpcs:disable Magento2.Performance.ForeachArrayMerge
-                $messages = array_merge($messages, $result['messages']);
-                // phpcs:enable Magento2.Performance.ForeachArrayMerge
+                $messages[] = $result['messages'];
                 $outputData = $result['output_data'];
             }
         }
@@ -157,7 +156,7 @@ public function process(string $encodedMessage)
                 );
                 $outputData = $this->jsonHelper->serialize($outputData);
             } catch (\Exception $e) {
-                $messages[] = $e->getMessage();
+                $messages[] = [$e->getMessage()];
             }
         }
 
@@ -167,7 +166,7 @@ public function process(string $encodedMessage)
             $operation->getId(),
             $status,
             $errorCode,
-            implode('; ', $messages),
+            implode('; ', array_merge([], ...$messages)),
             $serializedData,
             $outputData
         );

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenConfigurationStoresPageActionGroup">
+        <annotations>
+            <description>Open configuration stores page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+        <section name="WYSIWYGOptionsSection"/>
+    </page>
+</pages>

app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml

@@ -7,6 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <!--  @deprecated New Page was introduced. Please use "AdminConfigurationStoresPage"  -->
     <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php

@@ -166,9 +166,10 @@ public function testGetterAmount($amountForBundle, $optionList, $expectedResult)
 
         $optionSelections = [];
         foreach ($options as $option) {
-            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $optionSelections = array_merge($optionSelections, $option->getSelections());
+            $optionSelections[] = $option->getSelections();
         }
+        $optionSelections = array_merge([], ...$optionSelections);
+
         $this->selectionPriceListProvider->expects($this->any())->method('getPriceList')->willReturn($optionSelections);
 
         $price = $this->createMock(BundleOptionPrice::class);

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -603,19 +603,15 @@ protected function populateInsertOptionValues(array $optionIds): array
                     if ($assoc['position'] == $this->_cachedOptions[$entityId][$key]['index']
                         && $assoc['parent_id'] == $entityId) {
                         $option['parent_id'] = $entityId;
-                        //phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                        $optionValues = array_merge(
-                            $optionValues,
-                            $this->populateOptionValueTemplate($option, $optionId)
-                        );
+                        $optionValues[] = $this->populateOptionValueTemplate($option, $optionId);
                         $this->_cachedOptions[$entityId][$key]['option_id'] = $optionId;
                         break;
                     }
                 }
             }
         }
 
-        return $optionValues;
+        return array_merge([], ...$optionValues);
     }
 
     /**

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -86,12 +86,13 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
         //Create list of temporary tables based on available attributes attributes
         $valueTables = [];
         foreach ($temporaryEavAttributes as $tableName => $columns) {
-            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $valueTables = array_merge(
-                $valueTables,
-                $this->_createTemporaryTable($this->_getTemporaryTableName($tableName), $columns, $valueFieldSuffix)
+            $valueTables[] = $this->_createTemporaryTable(
+                $this->_getTemporaryTableName($tableName),
+                $columns,
+                $valueFieldSuffix
             );
         }
+        $valueTables = array_merge([], ...$valueTables);
 
         //Fill "base" table which contains all available products
         $this->_fillTemporaryEntityTable($entityTableName, $entityTableColumns, $changedIds);

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Model\Product\Attribute;
 
 use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -218,11 +219,16 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
      */
     protected function generateCode($label)
     {
-        $code = substr(preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)), 0, 30);
+        $code = substr(
+            preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)),
+            0,
+            Attribute::ATTRIBUTE_CODE_MAX_LENGTH
+        );
         $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,29}[a-z0-9]$/']);
         if (!$validatorAttrCode->isValid($code)) {
-            $code = 'attr_' . ($code ?: substr(md5(time()), 0, 8));
+            $code = 'attr_' . ($code ?: substr(hash('sha256', time()), 0, 8));
         }
+
         return $code;
     }
 
@@ -235,7 +241,9 @@ protected function generateCode($label)
      */
     protected function validateCode($code)
     {
-        $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,30}$/']);
+        $validatorAttrCode = new \Zend_Validate_Regex(
+            ['pattern' => '/^[a-z][a-z_0-9]{0,' . Attribute::ATTRIBUTE_CODE_MAX_LENGTH . '}$/']
+        );
         if (!$validatorAttrCode->isValid($code)) {
             throw InputException::invalidFieldValue('attribute_code', $code);
         }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php

@@ -145,11 +145,11 @@ public function testSaveCategoryLinks($newCategoryLinks, $dbCategoryLinks, $affe
         $expectedResult = [];
 
         foreach ($affectedIds as $type => $ids) {
-            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $expectedResult = array_merge($expectedResult, $ids);
+            $expectedResult[] = $ids;
             // Verify if the correct insert, update and/or delete actions are performed:
             $this->setupExpectationsForConnection($type, $ids);
         }
+        $expectedResult = array_merge([], ...$expectedResult);
 
         $actualResult = $this->model->saveCategoryLinks($product, $newCategoryLinks);