MAGETWO-89899: Proxy generator does not understand PHP 7.1 syntax

Author: Oleksandr Gorkun

dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php

@@ -110,4 +110,16 @@ public static function publicChildStatic()
     final public function publicChildFinal()
     {
     }
+
+    public function public71(
+        $arg1,
+        string $arg2,
+        ?int $arg3,
+        ?int $arg4 = null
+    ): void {
+    }
+
+    public function public71Another(?\DateTime $arg1, $arg2 = null): ?string
+    {
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample

@@ -2,6 +2,8 @@
 namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace;
 
 /**
+ * Interceptor class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+ *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -54,6 +56,32 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71');
+        if (!$pluginInfo) {
+             parent::public71($arg1, $arg2, $arg3, $arg4);
+        } else {
+             $this->___callPlugins('public71', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71Another');
+        if (!$pluginInfo) {
+            return parent::public71Another($arg1, $arg2);
+        } else {
+            return $this->___callPlugins('public71Another', func_get_args(), $pluginInfo);
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample

@@ -114,6 +114,22 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
         return $this->_getSubject()->publicChildWithoutParameters();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void
+    {
+        $this->_getSubject()->public71($arg1, $arg2, $arg3, $arg4);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string
+    {
+        return $this->_getSubject()->public71Another($arg1, $arg2);
+    }
+
     /**
      * {@inheritdoc}
      */

lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php

@@ -47,6 +47,7 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
         'abstract' => 'setAbstract',
         'visibility' => 'setVisibility',
         'body' => 'setBody',
+        'returntype' => 'setReturnType'
     ];
 
     /**

lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php

@@ -313,7 +313,8 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
         $parameterInfo = [
             'name' => $parameter->getName(),
             'passedByReference' => $parameter->isPassedByReference(),
-            'type' => $parameter->getType(),
+            'type' => $parameter->hasType()
+                ? $parameter->getType()->getName() : null,
             'variadic' => $parameter->isVariadic()
         ];
 
@@ -336,6 +337,10 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
             }
         }
 
+        if ($parameter->allowsNull() && $parameterInfo['type']) {
+            $parameterInfo['type'] = '?' .$parameterInfo['type'];
+        }
+
         return $parameterInfo;
     }
 

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

@@ -102,18 +102,24 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
+        $returnType = $method->getReturnType();
+        $returnTypeValue = $returnType
+            ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName()
+            : null;
         $methodInfo = [
             'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(),
             'parameters' => $parameters,
             'body' => "\$pluginInfo = \$this->pluginList->getNext(\$this->subjectType, '{$method->getName()}');\n" .
                 "if (!\$pluginInfo) {\n" .
-                "    return parent::{$method->getName()}({$this->_getParameterList(
+                "    " .($returnTypeValue === 'void' ? '' : 'return')
+                ." parent::{$method->getName()}({$this->_getParameterList(
                 $parameters
             )});\n" .
             "} else {\n" .
-            "    return \$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" .
+            "    " .($returnTypeValue === 'void' ? '' : 'return')
+            ." \$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" .
             "}",
-            'returnType' => $method->getReturnType(),
+            'returnType' => $returnTypeValue,
             'docblock' => ['shortDescription' => '{@inheritdoc}'],
         ];
 

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

@@ -159,11 +159,20 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
+        $returnType = $method->getReturnType();
+        $returnTypeValue = $returnType
+            ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName()
+            : null;
         $methodInfo = [
             'name' => $method->getName(),
             'parameters' => $parameters,
-            'body' => $this->_getMethodBody($method->getName(), $parameterNames),
+            'body' => $this->_getMethodBody(
+                $method->getName(),
+                $parameterNames,
+                $returnTypeValue === 'void'
+            ),
             'docblock' => ['shortDescription' => '{@inheritdoc}'],
+            'returntype' => $returnTypeValue,
         ];
 
         return $methodInfo;
@@ -212,16 +221,22 @@ protected function _getDefaultConstructorDefinition()
      *
      * @param string $name
      * @param array $parameters
+     * @param bool $withoutReturn
      * @return string
      */
-    protected function _getMethodBody($name, array $parameters = [])
-    {
+    protected function _getMethodBody(
+        $name,
+        array $parameters = [],
+        bool $withoutReturn = false
+    ) {
         if (count($parameters) == 0) {
             $methodCall = sprintf('%s()', $name);
         } else {
             $methodCall = sprintf('%s(%s)', $name, implode(', ', $parameters));
         }
-        return 'return $this->_getSubject()->' . $methodCall . ';';
+
+        return ($withoutReturn ? '' : 'return ')
+            .'$this->_getSubject()->' . $methodCall . ';';
     }
 
     /**