MC-17251: Creating a preference for category product indexer breaks setup:di:compile

- Changed \Magento\Framework\Async\Code\Generator\ProxyDeferredGenerator (CR comment)

Author: MorozovaNP

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/Product/Action/FullTest.php

@@ -3,15 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
 use Magento\Catalog\Model\Indexer\Category\Product\Action\Full as OriginObject;
 use Magento\TestFramework\Catalog\Model\Indexer\Category\Product\Action\Full as PreferenceObject;
 use Magento\Framework\Interception\PluginListInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 /**
- * Class FullTest
- * @package Magento\Catalog\Model\Indexer\Category\Product\Action
+ * Test for Magento\Catalog\Model\Indexer\Category\Product\Action\Full *
  */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
@@ -28,14 +31,28 @@ class FullTest extends \PHPUnit\Framework\TestCase
     private $pluginList;
 
     /**
-     * Prepare data for test
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritDoc
      */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->configure(['preferences' => [OriginObject::class => PreferenceObject::class]]);
-        $this->interceptor = $objectManager->get(OriginObject::class);
-        $this->pluginList = $objectManager->get(PluginListInterface::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $preferenceObject = $this->objectManager->get(PreferenceObject::class);
+        $this->objectManager->addSharedInstance($preferenceObject, OriginObject::class);
+        $this->interceptor = $this->objectManager->get(OriginObject::class);
+        $this->pluginList = $this->objectManager->get(PluginListInterface::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        $this->objectManager->removeSharedInstance(OriginObject::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/MediaStorage/Helper/File/Storage/DatabaseTest.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\MediaStorage\Helper\File\Storage;
 
 use Magento\Framework\ObjectManagerInterface;
@@ -50,7 +52,10 @@ protected function setUp()
     /**
      * test for \Magento\MediaStorage\Model\File\Storage\Database::deleteFolder()
      *
+     * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/MediaStorage/_files/database_mode.php
+     * @magentoConfigFixture current_store system/media_storage_configuration/media_storage 1
+     * @magentoConfigFixture current_store system/media_storage_configuration/media_database default_setup
      */
     public function testDeleteFolder()
     {

lib/internal/Magento/Framework/Async/Code/Generator/ProxyDeferredGenerator.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\Async\Code\Generator;
@@ -151,7 +150,7 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
-        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
+        $returnTypeValue = $this->getReturnTypeValue($method);
         $methodInfo = [
             'name' => $method->getName(),
             'parameters' => $parameters,
@@ -208,6 +207,7 @@ protected function _getMethodBody(
         } else {
             $methodCall = sprintf('%s(%s)', $name, implode(', ', $parameters));
         }
+
         //Waiting for deferred result and using it's methods.
         return "\$this->wait();\n"
             .($withoutReturn ? '' : 'return ')."\$this->instance->$methodCall;";
@@ -231,24 +231,27 @@ protected function _validateData()
                 $result = false;
             }
         }
+
         return $result;
     }
 
     /**
      * Returns return type
      *
-     * @param mixed $returnType
+     * @param \ReflectionMethod $method
      * @return null|string
      */
-    private function getReturnTypeValue($returnType): ?string
+    private function getReturnTypeValue(\ReflectionMethod $method): ?string
     {
         $returnTypeValue = null;
+        $returnType = $method->getReturnType();
         if ($returnType) {
             $returnTypeValue = ($returnType->allowsNull() ? '?' : '');
             $returnTypeValue .= ($returnType->getName() === 'self')
-                ? $this->getSourceClassName()
+                ? $this->_getFullyQualifiedClassName($method->getDeclaringClass()->getName())
                 : $returnType->getName();
         }
+
         return $returnTypeValue;
     }
 }

lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\Interception\Code\Generator;
@@ -137,8 +136,8 @@ protected function _getMethodInfo(\ReflectionMethod $method)
 }
 METHOD_BODY
             ),
-            'returnType' => $returnTypeValue,
-            'docblock' => ['shortDescription' => '{@inheritdoc}'],
+                'returnType' => $returnTypeValue,
+                'docblock' => ['shortDescription' => '{@inheritdoc}'],
         ];
 
         return $methodInfo;

lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php

@@ -5,7 +5,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\ObjectManager\Code\Generator;