Merge remote-tracking branch 'commerce/2.4-develop' into ph-delivery

Author: xmav

app/code/Magento/Catalog/Model/Product/ReservedAttributeCheckerAdapter.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\ReservedAttributeCheckerInterface;
+
+/**
+ * Adapter for \Magento\Catalog\Model\Product\ReservedAttributeList
+ *
+ * Is created to implement proper interface and to use api class ReservedAttributeList
+ * while keeping it backward compatible
+ * @see \Magento\Catalog\Model\Product\ReservedAttributeList
+ */
+class ReservedAttributeCheckerAdapter implements ReservedAttributeCheckerInterface
+{
+    /**
+     * @var ReservedAttributeList
+     */
+    private $reservedAttributeList;
+
+    /**
+     * @param ReservedAttributeList $reservedAttributeList
+     */
+    public function __construct(
+        ReservedAttributeList $reservedAttributeList
+    ) {
+        $this->reservedAttributeList = $reservedAttributeList;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isReservedAttribute(AbstractAttribute $attribute): bool
+    {
+        return $this->reservedAttributeList->isReservedAttribute($attribute);
+    }
+}

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -55,7 +55,7 @@ class Category extends AbstractResource
     protected $_isActiveAttributeId = null;
 
     /**
-     * Store id
+     * Id of store
      *
      * @var int
      */
@@ -69,14 +69,14 @@ class Category extends AbstractResource
     protected $_eventManager = null;
 
     /**
-     * Category collection factory
+     * Collection factory of category
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
      */
     protected $_categoryCollectionFactory;
 
     /**
-     * Category tree factory
+     * Tree factory of category
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
      */
@@ -103,7 +103,6 @@ class Category extends AbstractResource
     private $metadataPool;
 
     /**
-     * Category constructor.
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Factory $modelFactory
@@ -114,6 +113,8 @@ class Category extends AbstractResource
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param MetadataPool|null $metadataPool
+     * @param EntityManager|null $entityManager
+     * @param Category\AggregateCount|null $aggregateCount
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -126,7 +127,9 @@ public function __construct(
         Processor $indexerProcessor,
         $data = [],
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        MetadataPool $metadataPool = null
+        MetadataPool $metadataPool = null,
+        \Magento\Framework\EntityManager\EntityManager $entityManager = null,
+        \Magento\Catalog\Model\ResourceModel\Category\AggregateCount $aggregateCount = null
     ) {
         parent::__construct(
             $context,
@@ -142,6 +145,10 @@ public function __construct(
         $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->entityManager = $entityManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\EntityManager\EntityManager::class);
+        $this->aggregateCount = $aggregateCount ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\ResourceModel\Category\AggregateCount::class);
     }
 
     /**
@@ -220,7 +227,7 @@ protected function _getTree()
     protected function _beforeDelete(\Magento\Framework\DataObject $object)
     {
         parent::_beforeDelete($object);
-        $this->getAggregateCount()->processDelete($object);
+        $this->aggregateCount->processDelete($object);
         $this->deleteChildren($object);
     }
 
@@ -1092,8 +1099,8 @@ public function load($object, $entityId, $attributes = [])
         }
 
         $this->loadAttributesForObject($attributes, $object);
-        $object = $this->getEntityManager()->load($object, $entityId);
-        if (!$this->getEntityManager()->has($object)) {
+        $object = $this->entityManager->load($object, $entityId);
+        if (!$this->entityManager->has($object)) {
             $object->isObjectNew(true);
         }
         return $this;
@@ -1104,7 +1111,7 @@ public function load($object, $entityId, $attributes = [])
      */
     public function delete($object)
     {
-        $this->getEntityManager()->delete($object);
+        $this->entityManager->delete($object);
         $this->_eventManager->dispatch(
             'catalog_category_delete_after_done',
             ['product' => $object, 'category' => $object]
@@ -1121,38 +1128,10 @@ public function delete($object)
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
-        $this->getEntityManager()->save($object);
+        $this->entityManager->save($object);
         return $this;
     }
 
-    /**
-     * Returns EntityManager object
-     *
-     * @return EntityManager
-     */
-    private function getEntityManager()
-    {
-        if (null === $this->entityManager) {
-            $this->entityManager = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\EntityManager::class);
-        }
-        return $this->entityManager;
-    }
-
-    /**
-     * Returns AggregateCount object
-     *
-     * @return Category\AggregateCount
-     */
-    private function getAggregateCount()
-    {
-        if (null === $this->aggregateCount) {
-            $this->aggregateCount = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Model\ResourceModel\Category\AggregateCount::class);
-        }
-        return $this->aggregateCount;
-    }
-
     /**
      * Get category with children.
      *

app/code/Magento/Catalog/etc/di.xml

@@ -73,7 +73,7 @@
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
-    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="Magento\Catalog\Model\MassAction" />
     <preference for="Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface" type="Magento\Catalog\Model\ProductLink\Data\ListCriteria" />
     <preference for="Magento\Catalog\Api\CategoryListDeleteBySkuInterface" type="Magento\Catalog\Model\CategoryLinkRepository"/>
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
@@ -1333,4 +1333,13 @@
             <argument name="imageResizeScheduler" xsi:type="object">Magento\MediaStorage\Service\ImageResizeScheduler\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Eav\Model\ReservedAttributeChecker">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="product_reserved_attribute_codes" xsi:type="object">\Magento\Catalog\Model\Product\ReservedAttributeCheckerAdapter</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>