Merge pull request #511 from magento-performance/ACPT-987-after-ACPT-…

…1181 ACPT-987: Evaluate State check testing from PR
magento · Apr 26, 2023 · a74f840 · a74f840
2 parents 1c0ed8a + 51efbb3
commit a74f840
Show file tree

Hide file tree

Showing 23 changed files with 1,051 additions and 81 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Loader.php b/app/code/Magento/Config/Model/Config/Loader.php
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * System configuration loader
- */
 namespace Magento\Config\Model\Config;
 
+use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+
 /**
- * Class which can read config by paths
+ * System configuration loader - Class which can read config by paths
  *
- * @package Magento\Config\Model\Config
  * @api
  * @since 100.0.2
  */
@@ -22,15 +21,26 @@ class Loader
      * Config data factory
      *
      * @var \Magento\Framework\App\Config\ValueFactory
+     * @deprecated
+     * @see $collectionFactory
      */
     protected $_configValueFactory;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
     /**
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
+     * @param ?CollectionFactory $collectionFactory
      */
-    public function __construct(\Magento\Framework\App\Config\ValueFactory $configValueFactory)
-    {
+    public function __construct(
+        \Magento\Framework\App\Config\ValueFactory $configValueFactory,
+        CollectionFactory $collectionFactory = null
+    ) {
         $this->_configValueFactory = $configValueFactory;
+        $this->collectionFactory = $collectionFactory ?: ObjectManager::getInstance()->get(CollectionFactory::class);
     }
 
     /**
@@ -44,9 +54,8 @@ public function __construct(\Magento\Framework\App\Config\ValueFactory $configVa
      */
     public function getConfigByPath($path, $scope, $scopeId, $full = true)
     {
-        $configDataCollection = $this->_configValueFactory->create();
-        $configDataCollection = $configDataCollection->getCollection()->addScopeFilter($scope, $scopeId, $path);
-
+        $configDataCollection = $this->collectionFactory->create();
+        $configDataCollection->addScopeFilter($scope, $scopeId, $path);
         $config = [];
         $configDataCollection->load();
         foreach ($configDataCollection->getItems() as $data) {

diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/LoaderTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/LoaderTest.php
@@ -9,7 +9,7 @@
 
 use Magento\Config\Model\Config\Loader;
 use Magento\Config\Model\ResourceModel\Config\Data\Collection;
-use Magento\Framework\App\Config\Value;
+use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
 use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -23,57 +23,40 @@ class LoaderTest extends TestCase
     protected $_model;
 
     /**
-     * @var MockObject
+     * @var MockObject&ValueFactory
      */
     protected $_configValueFactory;
 
     /**
-     * @var MockObject
+     * @var MockObject&Collection
      */
     protected $_configCollection;
 
+    /**
+     * @var MockObject&CollectionFactory
+     */
+    protected $collectionFactory;
+
     protected function setUp(): void
     {
         $this->_configValueFactory = $this->getMockBuilder(ValueFactory::class)
             ->addMethods(['getCollection'])
             ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->_model = new Loader($this->_configValueFactory);
+        $this->collectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->addMethods(['getCollection'])
+            ->onlyMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->_model = new Loader($this->_configValueFactory, $this->collectionFactory);
         $this->_configCollection = $this->createMock(Collection::class);
-        $this->_configCollection->expects(
-            $this->once()
-        )->method(
-            'addScopeFilter'
-        )->with(
-            'scope',
-            'scopeId',
-            'section'
-        )->willReturnSelf();
-
-        $configDataMock = $this->createMock(Value::class);
-        $this->_configValueFactory->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->willReturn(
-            $configDataMock
-        );
-        $configDataMock->expects(
-            $this->any()
-        )->method(
-            'getCollection'
-        )->willReturn(
-            $this->_configCollection
-        );
-
-        $this->_configCollection->expects(
-            $this->once()
-        )->method(
-            'getItems'
-        )->willReturn(
-            [new DataObject(['path' => 'section', 'value' => 10, 'config_id' => 20])]
-        );
+        $this->_configCollection->expects($this->once())->
+            method('addScopeFilter')->with('scope', 'scopeId', 'section')->willReturnSelf();
+        $this->_configValueFactory->expects($this->never())->method('create');
+        $this->collectionFactory->expects($this->any())->method('create')->willReturn($this->_configCollection);
+        $this->_configCollection->expects($this->once())->method('getItems')
+            ->willReturn([new DataObject(['path' => 'section', 'value' => 10, 'config_id' => 20])]);
     }
 
     protected function tearDown(): void

diff --git a/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php b/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
@@ -6,18 +6,15 @@
 
 namespace Magento\Eav\Model\ResourceModel;
 
-use Magento\Catalog\Model\Product;
 use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Class AttributePersistor
+ * Class AttributePersistor persists attributes
  */
 class AttributePersistor
 {
@@ -67,6 +64,8 @@ public function __construct(
     }
 
     /**
+     * Registers delete
+     *
      * @param string $entityType
      * @param int $link
      * @param string $attributeCode
@@ -78,6 +77,8 @@ public function registerDelete($entityType, $link, $attributeCode)
     }
 
     /**
+     * Registers update
+     *
      * @param string $entityType
      * @param int $link
      * @param string $attributeCode
@@ -90,6 +91,8 @@ public function registerUpdate($entityType, $link, $attributeCode, $value)
     }
 
     /**
+     * Registers Insert
+     *
      * @param string $entityType
      * @param int $link
      * @param string $attributeCode
@@ -102,6 +105,8 @@ public function registerInsert($entityType, $link, $attributeCode, $value)
     }
 
     /**
+     * Process deletes
+     *
      * @param string $entityType
      * @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
      * @return void
@@ -132,6 +137,8 @@ public function processDeletes($entityType, $context)
     }
 
     /**
+     * Process inserts
+     *
      * @param string $entityType
      * @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
      * @return void
@@ -194,6 +201,8 @@ private function prepareInsertDataForMultipleSave($entityType, $context)
     }
 
     /**
+     * Process updates
+     *
      * @param string $entityType
      * @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
      * @return void
@@ -329,10 +338,14 @@ public function flush($entityType, $context)
         $this->processDeletes($entityType, $context);
         $this->processInserts($entityType, $context);
         $this->processUpdates($entityType, $context);
-        unset($this->delete, $this->insert, $this->update);
+        $this->delete = [];
+        $this->insert = [];
+        $this->update = [];
     }
 
     /**
+     * Prepares value
+     *
      * @param string $entityType
      * @param string $value
      * @param AbstractAttribute $attribute
@@ -355,6 +368,8 @@ protected function prepareValue($entityType, $value, AbstractAttribute $attribut
     }
 
     /**
+     * Gets scope value
+     *
      * @param ScopeInterface $scope
      * @param AbstractAttribute $attribute
      * @param bool $useDefault

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -76,7 +76,7 @@ input FilterRangeTypeInput @doc(description: "Defines a filter that matches a ra
 }
 
 input FilterMatchTypeInput @doc(description: "Defines a filter that performs a fuzzy search.") {
-    match: String @doc(description: "Use this attribute to exactly match the specified string. For example, to filter on a specific SKU, specify a value such as `24-MB01`.")
+    match: String @doc(description: "Use this attribute to fuzzy match the specified string. For example, to filter on a specific SKU, specify a value such as `24-MB01`.")
 }
 
 input FilterStringTypeInput @doc(description: "Defines a filter for an input string.") {

diff --git a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
@@ -12,6 +12,7 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager\TestProvidesServiceInterface;
 use Magento\Framework\View\Design\Theme\CustomizationFactory;
 use Magento\Framework\View\Design\Theme\CustomizationInterface;
 use Magento\Framework\View\Design\Theme\Domain\Factory;
@@ -29,7 +30,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ThemeTest extends TestCase
+class ThemeTest extends TestCase implements TestProvidesServiceInterface
 {
     /**
      * @var Theme|MockObject
@@ -102,7 +103,6 @@ protected function setUp(): void
         $this->themeModelFactory = $this->createPartialMock(ThemeFactory::class, ['create']);
         $this->validator = $this->createMock(Validator::class);
         $this->appState = $this->createMock(State::class);
-
         $objectManagerHelper = new ObjectManager($this);
         $arguments = $objectManagerHelper->getConstructArguments(
             Theme::class,
@@ -118,10 +118,20 @@ protected function setUp(): void
                 'themeModelFactory' => $this->themeModelFactory
             ]
         );
-
         $this->_model = $objectManagerHelper->getObject(Theme::class, $arguments);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getServiceForObjectManager(string $type) : ?object
+    {
+        if (Collection::class == $type) {
+            return $this->resourceCollection;
+        }
+        return null;
+    }
+
     /**
      * @inheritdoc
      */

diff --git a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
@@ -10,14 +10,15 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Phrase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager\TestProvidesServiceInterface;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use Magento\Variable\Model\ResourceModel\Variable;
 use Magento\Variable\Model\ResourceModel\Variable\Collection;
-use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Framework\Validation\ValidationException;
 
-class VariableTest extends TestCase
+class VariableTest extends TestCase implements TestProvidesServiceInterface
 {
     /**
      * @var  \Magento\Variable\Model\Variable
@@ -79,6 +80,17 @@ protected function setUp(): void
         $this->validationFailedPhrase = __('Validation has failed.');
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getServiceForObjectManager(string $type) : ?object
+    {
+        if (Collection::class == $type) {
+            return $this->resourceCollectionMock;
+        }
+        return null;
+    }
+
     public function testGetValueHtml()
     {
         $type = \Magento\Variable\Model\Variable::TYPE_HTML;

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php
@@ -90,7 +90,7 @@ public function endTest(TestCase $test)
             $values = $this->parse($test);
         } catch (\Throwable $exception) {
             ExceptionHandler::handle(
-                'Unable to parse fixtures',
+                'Unable to parse annotations',
                 get_class($test),
                 $test->getName(false),
                 $exception

diff --git a/...ation/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/...ation/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
@@ -72,11 +72,13 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
      */
     public function __clone()
     {
-        $this->_subject = clone $this->_getSubject();
+        if ($this->_subject) {
+            $this->_subject = clone $this->_getSubject();
+        }
     }
 
     /**
-     * Clone proxied instance
+     * Debug proxied instance
      */
     public function __debugInfo()
     {