Skip to content

Commit d4630c5

Browse files
JacobBrownAustinJacobBrownAustin
committed
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into ACPT-757&ACPT-773&ACPT-747&ACPT-748&ACPT-675&ACPT-671&ACPT-746
2 parents d7e9b5c + 62aafe2 commit d4630c5

File tree

18 files changed

+398
-43
lines changed

18 files changed

+398
-43
lines changed

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ public function execute()
326326
return $this->returnResult('catalog/*/', [], ['error' => false]);
327327
} catch (\Exception $e) {
328328
$this->messageManager->addErrorMessage($e->getMessage());
329+
if ($attributeId === null) {
330+
unset($data['frontend_input']);
331+
}
329332
$this->_session->setAttributeData($data);
330333
return $this->returnResult(
331334
'catalog/*/edit',

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Magento\CatalogImportExport\Model\Import\Product\StatusProcessor;
1818
use Magento\CatalogImportExport\Model\Import\Product\StockProcessor;
1919
use Magento\CatalogImportExport\Model\StockItemImporterInterface;
20+
use Magento\CatalogImportExport\Model\StockItemProcessorInterface;
2021
use Magento\CatalogInventory\Api\Data\StockItemInterface;
2122
use Magento\Framework\App\Filesystem\DirectoryList;
2223
use Magento\Framework\App\ObjectManager;
@@ -229,7 +230,6 @@ class Product extends AbstractEntity
229230
* @see LinkProcessor
230231
*
231232
* @see Magento_CatalogImportExport::etc/di.xml
232-
*
233233
* @var array
234234
*/
235235
protected $_linkNameToId = [
@@ -620,9 +620,8 @@ class Product extends AbstractEntity
620620
/**
621621
* @var array
622622
* @deprecated 100.0.3
623-
* @see nothing
624-
* @since 100.0.3
625623
*
624+
* @since 100.0.3
626625
* @see we don't recommend this approach anymore
627626
*/
628627
protected $productUrlKeys = [];
@@ -762,6 +761,11 @@ class Product extends AbstractEntity
762761
*/
763762
private $linkProcessor;
764763

764+
/**
765+
* @var StockItemProcessorInterface
766+
*/
767+
private $stockItemProcessor;
768+
765769
/**
766770
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
767771
* @param \Magento\ImportExport\Helper\Data $importExportData
@@ -811,6 +815,7 @@ class Product extends AbstractEntity
811815
* @param StockProcessor|null $stockProcessor
812816
* @param LinkProcessor|null $linkProcessor
813817
* @param File|null $fileDriver
818+
* @param StockItemProcessorInterface|null $stockItemProcessor
814819
* @throws LocalizedException
815820
* @throws \Magento\Framework\Exception\FileSystemException
816821
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -865,7 +870,8 @@ public function __construct(
865870
StatusProcessor $statusProcessor = null,
866871
StockProcessor $stockProcessor = null,
867872
LinkProcessor $linkProcessor = null,
868-
?File $fileDriver = null
873+
?File $fileDriver = null,
874+
?StockItemProcessorInterface $stockItemProcessor = null
869875
) {
870876
$this->_eventManager = $eventManager;
871877
$this->stockRegistry = $stockRegistry;
@@ -929,6 +935,8 @@ public function __construct(
929935
$this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
930936
$this->productRepository = $productRepository ?? ObjectManager::getInstance()
931937
->get(ProductRepositoryInterface::class);
938+
$this->stockItemProcessor = $stockItemProcessor ?? ObjectManager::getInstance()
939+
->get(StockItemProcessorInterface::class);
932940
}
933941

934942
/**
@@ -1292,6 +1300,7 @@ protected function _prepareRowForDb(array $rowData)
12921300
*
12931301
* @deprecated 101.1.0 use linkProcessor Directly
12941302
* @see linkProcessor
1303+
*
12951304
* @return $this
12961305
*/
12971306
protected function _saveLinks()
@@ -2388,6 +2397,7 @@ protected function _saveStockItem()
23882397
{
23892398
while ($bunch = $this->_dataSourceModel->getNextBunch()) {
23902399
$stockData = [];
2400+
$importedData = [];
23912401
$productIdsToReindex = [];
23922402
$stockChangedProductIds = [];
23932403
// Format bunch to stock data rows
@@ -2413,12 +2423,13 @@ protected function _saveStockItem()
24132423

24142424
if (!isset($stockData[$sku])) {
24152425
$stockData[$sku] = $row;
2426+
$importedData[$sku] = $rowData;
24162427
}
24172428
}
24182429

24192430
// Insert rows
24202431
if (!empty($stockData)) {
2421-
$this->stockItemImporter->import($stockData);
2432+
$this->stockItemProcessor->process($stockData, $importedData);
24222433
}
24232434

24242435
$this->reindexStockStatus($stockChangedProductIds);
@@ -2572,6 +2583,7 @@ public function getRowScope(array $rowData)
25722583
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
25732584
* @SuppressWarnings(PHPMD.NPathComplexity)
25742585
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
2586+
* @throws \Zend_Validate_Exception
25752587
*/
25762588
public function validateRow(array $rowData, $rowNum)
25772589
{

‎app/code/Magento/CatalogImportExport/Model/StockItemProcessor.php‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CatalogImportExport\Model;
9+
10+
class StockItemProcessor implements StockItemProcessorInterface
11+
{
12+
/**
13+
* @var StockItemImporterInterface
14+
*/
15+
private $stockItemImporter;
16+
17+
/**
18+
* @param StockItemImporterInterface $stockItemImporter
19+
*/
20+
public function __construct(
21+
StockItemImporterInterface $stockItemImporter
22+
) {
23+
$this->stockItemImporter = $stockItemImporter;
24+
}
25+
26+
/**
27+
* @inheritdoc
28+
*/
29+
public function process(array $stockData, array $importedData): void
30+
{
31+
$this->stockItemImporter->import($stockData);
32+
}
33+
}

‎app/code/Magento/CatalogImportExport/Model/StockItemProcessorInterface.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CatalogImportExport\Model;
9+
10+
use Magento\Framework\Exception\CouldNotSaveException;
11+
use Magento\Framework\Exception\InputException;
12+
use Magento\Framework\Validation\ValidationException;
13+
14+
interface StockItemProcessorInterface
15+
{
16+
/**
17+
* Handle Import of Stock Item Data
18+
*
19+
* @param array $stockData
20+
* @param array $importedData
21+
* @return void
22+
* @throws CouldNotSaveException
23+
* @throws InputException
24+
* @throws ValidationException
25+
*/
26+
public function process(array $stockData, array $importedData): void;
27+
}

‎app/code/Magento/CatalogImportExport/etc/di.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
99
<preference for="Magento\CatalogImportExport\Model\Export\RowCustomizerInterface" type="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite" />
1010
<preference for="Magento\CatalogImportExport\Model\StockItemImporterInterface" type="Magento\CatalogImportExport\Model\StockItemImporter" />
11+
<preference for="Magento\CatalogImportExport\Model\StockItemProcessorInterface" type="Magento\CatalogImportExport\Model\StockItemProcessor" />
1112
<preference for="Magento\CatalogImportExport\Model\Export\ProductFilterInterface" type="Magento\CatalogImportExport\Model\Export\ProductFilters" />
1213
<type name="Magento\ImportExport\Model\Import">
1314
<plugin name="catalogProductFlatIndexerImport" type="Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import" />

‎app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
*/
66
namespace Magento\Config\Model\Config\Structure\Element\Dependency;
77

8-
/**
9-
* @api
10-
* @since 100.0.2
11-
*/
12-
138
/**
149
* Class Field
1510
*
1611
* Fields are used to describe possible values for a type/interface.
12+
*
13+
* @api
14+
* @since 100.0.2
1715
*/
1816
class Field
1917
{

‎app/code/Magento/Customer/Test/Fixture/Customer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
class Customer implements RevertibleDataFixtureInterface
2929
{
3030
private const DEFAULT_DATA = [
31-
'password' => null,
31+
'password' => 'password',
3232
CustomerInterface::ID => null,
3333
CustomerInterface::CONFIRMATION => null,
3434
CustomerInterface::CREATED_AT => null,

‎app/code/Magento/Eav/Model/Entity/Attribute.php‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Eav\Model\Entity;
77

8+
use Magento\Eav\Model\ReservedAttributeCheckerInterface;
89
use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
910
use Magento\Framework\Api\AttributeValueFactory;
1011
use Magento\Framework\App\ObjectManager;
@@ -29,17 +30,17 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
2930
* The value is defined as 60 because in the flat mode attribute code will be transformed into column name.
3031
* MySQL allows only 64 symbols in column name.
3132
*/
32-
const ATTRIBUTE_CODE_MAX_LENGTH = 60;
33+
public const ATTRIBUTE_CODE_MAX_LENGTH = 60;
3334

3435
/**
3536
* Min accepted length of an attribute code.
3637
*/
37-
const ATTRIBUTE_CODE_MIN_LENGTH = 1;
38+
public const ATTRIBUTE_CODE_MIN_LENGTH = 1;
3839

3940
/**
4041
* Tag to use for attributes caching.
4142
*/
42-
const CACHE_TAG = 'EAV_ATTRIBUTE';
43+
public const CACHE_TAG = 'EAV_ATTRIBUTE';
4344

4445
/**
4546
* Prefix of model events names
@@ -69,6 +70,9 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
6970

7071
/**
7172
* @var \Magento\Catalog\Model\Product\ReservedAttributeList
73+
*
74+
* @deprecated Incorrect direct dependency on Product attribute.
75+
* @see \Magento\Eav\Model\Entity\Attribute::$reservedAttributeChecker
7276
*/
7377
protected $reservedAttributeList;
7478

@@ -87,6 +91,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
8791
*/
8892
private $attributeCodeValidator;
8993

94+
/**
95+
* @var ReservedAttributeCheckerInterface|null
96+
*/
97+
private $reservedAttributeChecker;
98+
9099
/**
91100
* @param \Magento\Framework\Model\Context $context
92101
* @param \Magento\Framework\Registry $registry
@@ -108,6 +117,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
108117
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
109118
* @param array $data
110119
* @param AttributeCodeValidator|null $attributeCodeValidator
120+
* @param ReservedAttributeCheckerInterface|null $reservedAttributeChecker
111121
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
112122
* @codeCoverageIgnore
113123
*/
@@ -131,7 +141,8 @@ public function __construct(
131141
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
132142
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
133143
array $data = [],
134-
AttributeCodeValidator $attributeCodeValidator = null
144+
AttributeCodeValidator $attributeCodeValidator = null,
145+
?ReservedAttributeCheckerInterface $reservedAttributeChecker = null
135146
) {
136147
parent::__construct(
137148
$context,
@@ -157,6 +168,9 @@ public function __construct(
157168
$this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
158169
AttributeCodeValidator::class
159170
);
171+
$this->reservedAttributeChecker = $reservedAttributeChecker ?: ObjectManager::getInstance()->get(
172+
ReservedAttributeCheckerInterface::class
173+
);
160174
}
161175

162176
/**
@@ -251,7 +265,7 @@ public function beforeSave()
251265
}
252266

253267
// prevent overriding product data
254-
if (isset($this->_data['attribute_code']) && $this->reservedAttributeList->isReservedAttribute($this)) {
268+
if (isset($this->_data['attribute_code']) && $this->reservedAttributeChecker->isReservedAttribute($this)) {
255269
throw new LocalizedException(
256270
__(
257271
'The attribute code \'%1\' is reserved by system. Please try another attribute code',
@@ -535,6 +549,7 @@ public function __wakeup()
535549
$this->_localeDate = $objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
536550
$this->_localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
537551
$this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
552+
$this->reservedAttributeChecker = $objectManager->get(ReservedAttributeCheckerInterface::class);
538553
$this->dateTimeFormatter = $objectManager->get(DateTimeFormatterInterface::class);
539554
}
540555

‎app/code/Magento/Eav/Model/ReservedAttributeChecker.php‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class ReservedAttributeChecker implements ReservedAttributeCheckerInterface
1919
{
2020
/**
21-
* @var ReservedAttributeCheckerInterface[][]
21+
* @var ReservedAttributeCheckerInterface[]
2222
*/
2323
private $validators;
2424

@@ -37,7 +37,8 @@ public function __construct(
3737
public function isReservedAttribute(AbstractAttribute $attribute): bool
3838
{
3939
$isReserved = false;
40-
$validators = $this->validators[$attribute->getEntityType()->getEntityTypeCode()] ?? [];
40+
$entityTypeCode = $this->getAttributeEntityTypeCode($attribute);
41+
$validators = $this->validators[$entityTypeCode] ?? [];
4142
foreach ($validators as $validator) {
4243
$isReserved = $validator->isReservedAttribute($attribute);
4344
if ($isReserved === true) {
@@ -47,4 +48,21 @@ public function isReservedAttribute(AbstractAttribute $attribute): bool
4748

4849
return $isReserved;
4950
}
51+
52+
/**
53+
* Returns attribute entity type code.
54+
*
55+
* @param AbstractAttribute $attribute
56+
* @return string|null
57+
*/
58+
private function getAttributeEntityTypeCode(AbstractAttribute $attribute): ?string
59+
{
60+
try {
61+
$result = $attribute->getEntityType()->getEntityTypeCode();
62+
} catch (LocalizedException $e) {
63+
$result = null;
64+
}
65+
66+
return $result;
67+
}
5068
}

‎app/code/Magento/Payment/Model/Method/Free.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
*/
2121
class Free extends \Magento\Payment\Model\Method\AbstractMethod
2222
{
23-
const PAYMENT_METHOD_FREE_CODE = 'free';
23+
public const PAYMENT_METHOD_FREE_CODE = 'free';
2424

2525
/**
2626
* XML Paths for configuration constants
2727
*/
28-
const XML_PATH_PAYMENT_FREE_ACTIVE = 'payment/free/active';
28+
public const XML_PATH_PAYMENT_FREE_ACTIVE = 'payment/free/active';
2929

30-
const XML_PATH_PAYMENT_FREE_ORDER_STATUS = 'payment/free/order_status';
30+
public const XML_PATH_PAYMENT_FREE_ORDER_STATUS = 'payment/free/order_status';
3131

32-
const XML_PATH_PAYMENT_FREE_PAYMENT_ACTION = 'payment/free/payment_action';
32+
public const XML_PATH_PAYMENT_FREE_PAYMENT_ACTION = 'payment/free/payment_action';
3333

3434
/**
3535
* Payment Method features
@@ -50,6 +50,11 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
5050
*/
5151
protected $priceCurrency;
5252

53+
/**
54+
* @var bool
55+
*/
56+
protected $_isOffline = true;
57+
5358
/**
5459
* @param \Magento\Framework\Model\Context $context
5560
* @param \Magento\Framework\Registry $registry

0 commit comments

Comments
 (0)