Merge pull request #540 from magento-performance/ACPT-1327-without-ACPT-1327

ACPT-1327 without ACPT-1327

Author: andimov

app/code/Magento/Catalog/Model/Product/Media/Config.php

@@ -30,7 +30,7 @@ class Config implements ConfigInterface, ResetAfterRequestInterface
     private $attributeHelper;
 
     /**
-     * @var string[]
+     * @var string[]|null
      */
     private $mediaAttributeCodes;
 
@@ -206,6 +206,6 @@ private function getAttributeHelper()
      */
     public function _resetState(): void
     {
-        $this->mediaAttributeCodes = [];
+        $this->mediaAttributeCodes = null;
     }
 }

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php

@@ -18,6 +18,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -29,9 +30,9 @@ class DynamicField implements FieldProviderInterface
     /**
      * Category collection.
      *
-     * @var Collection
+     * @var CollectionFactory
      */
-    private $categoryCollection;
+    private $categoryCollectionFactory;
 
     /**
      * Customer group repository.
@@ -41,8 +42,6 @@ class DynamicField implements FieldProviderInterface
     private $groupRepository;
 
     /**
-     * Search criteria builder.
-     *
      * @var SearchCriteriaBuilder
      */
     private $searchCriteriaBuilder;
@@ -79,8 +78,10 @@ class DynamicField implements FieldProviderInterface
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
-     * @param Collection $categoryCollection
+     * @param Collection $categoryCollection @deprecated @see $categoryCollectionFactory
      * @param StoreManagerInterface|null $storeManager
+     * @param CollectionFactory|null $categoryCollectionFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -90,15 +91,17 @@ public function __construct(
         FieldNameResolver $fieldNameResolver,
         AttributeProvider $attributeAdapterProvider,
         Collection $categoryCollection,
-        ?StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null,
+        ?CollectionFactory $categoryCollectionFactory = null
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->fieldTypeConverter = $fieldTypeConverter;
         $this->indexTypeConverter = $indexTypeConverter;
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
-        $this->categoryCollection = $categoryCollection;
+        $this->categoryCollectionFactory = $categoryCollectionFactory
+            ?: ObjectManager::getInstance()->get(CollectionFactory::class);
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
@@ -108,7 +111,7 @@ public function __construct(
     public function getFields(array $context = []): array
     {
         $allAttributes = [];
-        $categoryIds = $this->categoryCollection->getAllIds();
+        $categoryIds = $this->categoryCollectionFactory->create()->getAllIds();
         $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
         $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
         foreach ($categoryIds as $categoryId) {

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
 
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\Data\GroupSearchResultsInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
@@ -111,8 +112,13 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->onlyMethods(['getAllIds'])
             ->getMock();
+        $categoryCollection = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
+            ->getMock();
+        $categoryCollection->method('create')
+            ->willReturn($this->categoryCollection);
         $this->storeManager = $this->createMock(StoreManagerInterface::class);
-
         $this->provider = new DynamicField(
             $this->fieldTypeConverter,
             $this->indexTypeConverter,
@@ -121,7 +127,8 @@ protected function setUp(): void
             $this->fieldNameResolver,
             $this->attributeAdapterProvider,
             $this->categoryCollection,
-            $this->storeManager
+            $this->storeManager,
+            $categoryCollection
         );
     }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/PaymentGraphQl/StoreConfigTest.php

@@ -12,11 +12,10 @@
 /**
  * Test coverage for zero subtotal and check/money order payment methods in the store config
  *
- * @magentoDbIsolation enabled
  */
 class StoreConfigTest extends GraphQlAbstract
 {
-    const STORE_CONFIG_QUERY = <<<QUERY
+    public const STORE_CONFIG_QUERY = <<<QUERY
 {
     storeConfig {
         zero_subtotal_enabled