Skip to content

Commit 6b84d0a

Browse files
author
Stanislav Idolov
authored
Merge branch '2.4-develop' into patch-1
2 parents f2b20d1 + ae30d5e commit 6b84d0a

File tree

76 files changed

+770
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+770
-328
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ public function __construct(
158158
protected function initTypeModels()
159159
{
160160
$productTypes = $this->_exportConfig->getEntityTypes(CatalogProduct::ENTITY);
161+
$disabledAttrs = [];
162+
$indexValueAttributes = [];
161163
foreach ($productTypes as $productTypeName => $productTypeConfig) {
162164
if (!($model = $this->_typeFactory->create($productTypeConfig['model']))) {
163165
throw new \Magento\Framework\Exception\LocalizedException(
@@ -174,21 +176,19 @@ protected function initTypeModels()
174176
}
175177
if ($model->isSuitable()) {
176178
$this->_productTypeModels[$productTypeName] = $model;
177-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
178-
$this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
179-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
180-
$this->_indexValueAttributes = array_merge(
181-
$this->_indexValueAttributes,
182-
$model->getIndexValueAttributes()
183-
);
179+
$disabledAttrs[] = $model->getDisabledAttrs();
180+
$indexValueAttributes[] = $model->getIndexValueAttributes();
184181
}
185182
}
186183
if (!$this->_productTypeModels) {
187184
throw new \Magento\Framework\Exception\LocalizedException(
188185
__('There are no product types available for export')
189186
);
190187
}
191-
$this->_disabledAttrs = array_unique($this->_disabledAttrs);
188+
$this->_disabledAttrs = array_unique(array_merge([], $this->_disabledAttrs, ...$disabledAttrs));
189+
$this->_indexValueAttributes = array_unique(
190+
array_merge([], $this->_indexValueAttributes, ...$indexValueAttributes)
191+
);
192192
return $this;
193193
}
194194

@@ -518,6 +518,8 @@ protected function getTierPrices(array $listSku, $table)
518518
if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
519519
$exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
520520
}
521+
$selectFields = [];
522+
$exportData = false;
521523
if ($table == ImportAdvancedPricing::TABLE_TIER_PRICE) {
522524
$selectFields = [
523525
ImportAdvancedPricing::COL_SKU => 'cpe.sku',

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public function process(string $encodedMessage)
117117
$status = OperationInterface::STATUS_TYPE_COMPLETE;
118118
$errorCode = null;
119119
$messages = [];
120+
$entityParams = [];
120121
$topicName = $operation->getTopicName();
121122
$handlers = $this->configuration->getHandlers($topicName);
122123
try {
@@ -127,7 +128,7 @@ public function process(string $encodedMessage)
127128
$this->logger->error($e->getMessage());
128129
$status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
129130
$errorCode = $e->getCode();
130-
$messages[] = $e->getMessage();
131+
$messages[] = [$e->getMessage()];
131132
}
132133

133134
$outputData = null;
@@ -136,9 +137,7 @@ public function process(string $encodedMessage)
136137
$result = $this->executeHandler($callback, $entityParams);
137138
$status = $result['status'];
138139
$errorCode = $result['error_code'];
139-
// phpcs:disable Magento2.Performance.ForeachArrayMerge
140-
$messages = array_merge($messages, $result['messages']);
141-
// phpcs:enable Magento2.Performance.ForeachArrayMerge
140+
$messages[] = $result['messages'];
142141
$outputData = $result['output_data'];
143142
}
144143
}
@@ -157,7 +156,7 @@ public function process(string $encodedMessage)
157156
);
158157
$outputData = $this->jsonHelper->serialize($outputData);
159158
} catch (\Exception $e) {
160-
$messages[] = $e->getMessage();
159+
$messages[] = [$e->getMessage()];
161160
}
162161
}
163162

@@ -167,7 +166,7 @@ public function process(string $encodedMessage)
167166
$operation->getId(),
168167
$status,
169168
$errorCode,
170-
implode('; ', $messages),
169+
implode('; ', array_merge([], ...$messages)),
171170
$serializedData,
172171
$outputData
173172
);

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenConfigurationStoresPageActionGroup">
11+
<annotations>
12+
<description>Open configuration stores page.</description>
13+
</annotations>
14+
15+
<amOnPage url="{{AdminConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
16+
<waitForPageLoad stepKey="waitPageLoad"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
10+
<page name="AdminConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
11+
<section name="WYSIWYGOptionsSection"/>
12+
</page>
13+
</pages>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
10+
<!-- @deprecated New Page was introduced. Please use "AdminConfigurationStoresPage" -->
1011
<page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
1112
<section name="WYSIWYGOptionsSection"/>
1213
</page>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,21 @@
3535

3636
<click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
3737
<waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
38+
<waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible1"/>
3839
<click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
3940
<waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
4041
<seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
4142

4243
<click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
4344
<waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
45+
<waitForElementVisible selector="{{AdminMenuSection.catalogProducts}}" stepKey="waitForCatalogProductsVisible"/>
4446
<click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
4547
<waitForPageLoad stepKey="waitForProductsPageLoad"/>
4648
<seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
4749

4850
<click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
4951
<waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
52+
<waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible2"/>
5053
<click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
5154
<waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
5255
<seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,10 @@ public function testGetterAmount($amountForBundle, $optionList, $expectedResult)
166166

167167
$optionSelections = [];
168168
foreach ($options as $option) {
169-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
170-
$optionSelections = array_merge($optionSelections, $option->getSelections());
169+
$optionSelections[] = $option->getSelections();
171170
}
171+
$optionSelections = array_merge([], ...$optionSelections);
172+
172173
$this->selectionPriceListProvider->expects($this->any())->method('getPriceList')->willReturn($optionSelections);
173174

174175
$price = $this->createMock(BundleOptionPrice::class);

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -603,19 +603,15 @@ protected function populateInsertOptionValues(array $optionIds): array
603603
if ($assoc['position'] == $this->_cachedOptions[$entityId][$key]['index']
604604
&& $assoc['parent_id'] == $entityId) {
605605
$option['parent_id'] = $entityId;
606-
//phpcs:ignore Magento2.Performance.ForeachArrayMerge
607-
$optionValues = array_merge(
608-
$optionValues,
609-
$this->populateOptionValueTemplate($option, $optionId)
610-
);
606+
$optionValues[] = $this->populateOptionValueTemplate($option, $optionId);
611607
$this->_cachedOptions[$entityId][$key]['option_id'] = $optionId;
612608
break;
613609
}
614610
}
615611
}
616612
}
617613

618-
return $optionValues;
614+
return array_merge([], ...$optionValues);
619615
}
620616

621617
/**

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
8686
//Create list of temporary tables based on available attributes attributes
8787
$valueTables = [];
8888
foreach ($temporaryEavAttributes as $tableName => $columns) {
89-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
90-
$valueTables = array_merge(
91-
$valueTables,
92-
$this->_createTemporaryTable($this->_getTemporaryTableName($tableName), $columns, $valueFieldSuffix)
89+
$valueTables[] = $this->_createTemporaryTable(
90+
$this->_getTemporaryTableName($tableName),
91+
$columns,
92+
$valueFieldSuffix
9393
);
9494
}
95+
$valueTables = array_merge([], ...$valueTables);
9596

9697
//Fill "base" table which contains all available products
9798
$this->_fillTemporaryEntityTable($entityTableName, $entityTableColumns, $changedIds);

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Catalog\Model\Product\Attribute;
88

99
use Magento\Eav\Api\Data\AttributeInterface;
10+
use Magento\Eav\Model\Entity\Attribute;
1011
use Magento\Framework\Exception\InputException;
1112
use Magento\Framework\Exception\NoSuchEntityException;
1213

@@ -218,11 +219,16 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
218219
*/
219220
protected function generateCode($label)
220221
{
221-
$code = substr(preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)), 0, 30);
222+
$code = substr(
223+
preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)),
224+
0,
225+
Attribute::ATTRIBUTE_CODE_MAX_LENGTH
226+
);
222227
$validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,29}[a-z0-9]$/']);
223228
if (!$validatorAttrCode->isValid($code)) {
224-
$code = 'attr_' . ($code ?: substr(md5(time()), 0, 8));
229+
$code = 'attr_' . ($code ?: substr(hash('sha256', time()), 0, 8));
225230
}
231+
226232
return $code;
227233
}
228234

@@ -235,7 +241,9 @@ protected function generateCode($label)
235241
*/
236242
protected function validateCode($code)
237243
{
238-
$validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,30}$/']);
244+
$validatorAttrCode = new \Zend_Validate_Regex(
245+
['pattern' => '/^[a-z][a-z_0-9]{0,' . Attribute::ATTRIBUTE_CODE_MAX_LENGTH . '}$/']
246+
);
239247
if (!$validatorAttrCode->isValid($code)) {
240248
throw InputException::invalidFieldValue('attribute_code', $code);
241249
}

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeFromProductPageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
</arguments>
1919

2020
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
21-
<see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
21+
<waitForText userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
2222
<click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
23+
<waitForElementVisible selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" stepKey="waitForAttrLabel" />
2324
<fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
2425
<selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
2526
<click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ public function testSaveCategoryLinks($newCategoryLinks, $dbCategoryLinks, $affe
145145
$expectedResult = [];
146146

147147
foreach ($affectedIds as $type => $ids) {
148-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
149-
$expectedResult = array_merge($expectedResult, $ids);
148+
$expectedResult[] = $ids;
150149
// Verify if the correct insert, update and/or delete actions are performed:
151150
$this->setupExpectationsForConnection($type, $ids);
152151
}
152+
$expectedResult = array_merge([], ...$expectedResult);
153153

154154
$actualResult = $this->model->saveCategoryLinks($product, $newCategoryLinks);
155155

‎app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ protected function initCategories()
478478
protected function initTypeModels()
479479
{
480480
$productTypes = $this->_exportConfig->getEntityTypes($this->getEntityTypeCode());
481+
$disabledAttrs = [];
482+
$indexValueAttributes = [];
481483
foreach ($productTypes as $productTypeName => $productTypeConfig) {
482484
if (!($model = $this->_typeFactory->create($productTypeConfig['model']))) {
483485
throw new \Magento\Framework\Exception\LocalizedException(
@@ -494,21 +496,19 @@ protected function initTypeModels()
494496
}
495497
if ($model->isSuitable()) {
496498
$this->_productTypeModels[$productTypeName] = $model;
497-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
498-
$this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
499-
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
500-
$this->_indexValueAttributes = array_merge(
501-
$this->_indexValueAttributes,
502-
$model->getIndexValueAttributes()
503-
);
499+
$disabledAttrs[] = $model->getDisabledAttrs();
500+
$indexValueAttributes[] = $model->getIndexValueAttributes();
504501
}
505502
}
506503
if (!$this->_productTypeModels) {
507504
throw new \Magento\Framework\Exception\LocalizedException(
508505
__('There are no product types available for export.')
509506
);
510507
}
511-
$this->_disabledAttrs = array_unique($this->_disabledAttrs);
508+
$this->_disabledAttrs = array_unique(array_merge([], $this->_disabledAttrs, ...$disabledAttrs));
509+
$this->_indexValueAttributes = array_unique(
510+
array_merge([], $this->_indexValueAttributes, ...$indexValueAttributes)
511+
);
512512

513513
return $this;
514514
}
@@ -1128,7 +1128,7 @@ private function wrapValue($value)
11281128
protected function collectMultirawData()
11291129
{
11301130
$data = [];
1131-
$productIds = [];
1131+
$productLinkIds = [];
11321132
$rowWebsites = [];
11331133
$rowCategories = [];
11341134

@@ -1138,7 +1138,6 @@ protected function collectMultirawData()
11381138
/** @var \Magento\Catalog\Model\Product $item */
11391139
foreach ($collection as $item) {
11401140
$productLinkIds[] = $item->getData($this->getProductEntityLinkField());
1141-
$productIds[] = $item->getId();
11421141
$rowWebsites[$item->getId()] = array_intersect(
11431142
array_keys($this->_websiteIdToCode),
11441143
$item->getWebsites()

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,8 @@ private function initImagesArrayKeys()
12121212
protected function _initTypeModels()
12131213
{
12141214
$productTypes = $this->_importConfig->getEntityTypes($this->getEntityTypeCode());
1215+
$fieldsMap = [];
1216+
$specialAttributes = [];
12151217
foreach ($productTypes as $productTypeName => $productTypeConfig) {
12161218
$params = [$this, $productTypeName];
12171219
if (!($model = $this->_productTypeFactory->create($productTypeConfig['model'], ['params' => $params]))
@@ -1231,14 +1233,13 @@ protected function _initTypeModels()
12311233
if ($model->isSuitable()) {
12321234
$this->_productTypeModels[$productTypeName] = $model;
12331235
}
1234-
// phpcs:disable Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
1235-
$this->_fieldsMap = array_merge($this->_fieldsMap, $model->getCustomFieldsMapping());
1236-
$this->_specialAttributes = array_merge($this->_specialAttributes, $model->getParticularAttributes());
1237-
// phpcs:enable
1236+
$fieldsMap[] = $model->getCustomFieldsMapping();
1237+
$specialAttributes[] = $model->getParticularAttributes();
12381238
}
1239+
$this->_fieldsMap = array_merge([], $this->_fieldsMap, ...$fieldsMap);
12391240
$this->_initErrorTemplates();
12401241
// remove doubles
1241-
$this->_specialAttributes = array_unique($this->_specialAttributes);
1242+
$this->_specialAttributes = array_unique(array_merge([], $this->_specialAttributes, ...$specialAttributes));
12421243

12431244
return $this;
12441245
}

‎app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
111111
*/
112112
private $fileSystem;
113113

114+
/**
115+
* Directory and filename must be no more than 255 characters in length
116+
*/
117+
private $maxFilenameLength = 255;
118+
114119
/**
115120
* @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
116121
* @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
@@ -188,6 +193,13 @@ public function move($fileName, $renameFileOff = false)
188193
unset($result['path']);
189194
$result['name'] = self::getCorrectFileName($result['name']);
190195

196+
// Directory and filename must be no more than 255 characters in length
197+
if (strlen($result['file']) > $this->maxFilenameLength) {
198+
throw new \LengthException(
199+
__('Filename is too long; must be %1 characters or less', $this->maxFilenameLength)
200+
);
201+
}
202+
191203
return $result;
192204
}
193205

0 commit comments

Comments
 (0)