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

- Added more common fix
- Reverted changes in Magento\Catalog\Model\Indexer\Category\Product\Action\Full

Author: MorozovaNP

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -150,9 +150,9 @@ private function switchTables(): void
     /**
      * Refresh entities index
      *
-     * @return AbstractAction
+     * @return $this
      */
-    public function execute(): AbstractAction
+    public function execute(): self
     {
         $this->createTables();
         $this->clearReplicaTables();

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

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception\Code\Generator;
 
 /**
@@ -58,6 +60,7 @@ protected function _getDefaultConstructorDefinition()
                 ? "parent::__construct({$this->_getParameterList($parameters)});"
                 : "parent::__construct();";
         }
+
         return [
             'name' => '__construct',
             'parameters' => $parameters,
@@ -81,6 +84,7 @@ protected function _getClassMethods()
                 $methods[] = $this->_getMethodInfo($method);
             }
         }
+
         return $methods;
     }
 
@@ -109,7 +113,7 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
-        $returnTypeValue = $this->getReturnTypeValue($method->getReturnType());
+        $returnTypeValue = $this->getReturnTypeValue($method);
         $methodInfo = [
             'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(),
             'parameters' => $parameters,
@@ -184,6 +188,7 @@ protected function _generateCode()
         $this->_classGenerator->addTrait('\\' . \Magento\Framework\Interception\Interceptor::class);
         $interfaces[] = '\\' . \Magento\Framework\Interception\InterceptorInterface::class;
         $this->_classGenerator->setImplementedInterfaces($interfaces);
+
         return parent::_generateCode();
     }
 
@@ -211,24 +216,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/ObjectManager/Code/Generator/Proxy.php

@@ -6,6 +6,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\ObjectManager\Code\Generator;
 
 /**
@@ -73,6 +75,7 @@ protected function _getClassProperties()
                 'tags' => [['name' => 'var', 'description' => 'bool']],
             ],
         ];
+
         return $properties;
     }
 
@@ -154,6 +157,7 @@ protected function _generateCode()
             $this->_classGenerator->setExtendedClass($typeName);
             $this->_classGenerator->setImplementedInterfaces(['\\' . self::NON_INTERCEPTABLE_INTERFACE]);
         }
+
         return parent::_generateCode();
     }
 
@@ -173,7 +177,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,
@@ -269,24 +273,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;
     }
 }