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

Author: Oleksandr Gorkun

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

@@ -111,6 +111,16 @@ final public function publicChildFinal()
     {
     }
 
+    /**
+     * @param mixed $arg1
+     * @param string $arg2
+     * @param int|null $arg3
+     * @param int|null $arg4
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
     public function public71(
         $arg1,
         string $arg2,
@@ -119,7 +129,15 @@ public function public71(
     ): void {
     }
 
-    public function public71Another(?\DateTime $arg1, $arg2 = null): ?string
+    /**
+     * @param \DateTime|null $arg1
+     * @param mixed $arg2
+     *
+     * @return null|string
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function public71Another(?\DateTime $arg1, $arg2 = false): ?string
     {
     }
 }

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

@@ -72,7 +72,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
     /**
      * {@inheritdoc}
      */
-    public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string
+    public function public71Another(?\DateTime $arg1, $arg2 = false) : ?string
     {
         $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71Another');
         if (!$pluginInfo) {

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

@@ -125,7 +125,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
     /**
      * {@inheritdoc}
      */
-    public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string
+    public function public71Another(?\DateTime $arg1, $arg2 = false) : ?string
     {
         return $this->_getSubject()->public71Another($arg1, $arg2);
     }

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

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Code\Generator;
 
+use Zend\Code\Generator\ValueGenerator;
+
 abstract class EntityAbstract
 {
     /**
@@ -293,11 +295,64 @@ protected function _fixCodeStyle($sourceCode)
     /**
      * Get value generator for null default value
      *
-     * @return \Zend\Code\Generator\ValueGenerator
+     * @return ValueGenerator
      */
     protected function _getNullDefaultValue()
     {
-        $value = new \Zend\Code\Generator\ValueGenerator(null, \Zend\Code\Generator\ValueGenerator::TYPE_NULL);
+        $value = new ValueGenerator(null, ValueGenerator::TYPE_NULL);
+
+        return $value;
+    }
+
+    /**
+     * @param \ReflectionParameter $parameter
+     *
+     * @return null|string
+     */
+    private function extractParameterType(
+        \ReflectionParameter $parameter
+    ): ?string {
+        /** @var string|null $typeName */
+        $typeName = null;
+        if ($parameter->hasType()) {
+            if ($parameter->isArray()) {
+                $typeName = 'array';
+            } elseif ($parameter->getClass()) {
+                $typeName = $this->_getFullyQualifiedClassName(
+                    $parameter->getClass()->getName()
+                );
+            } elseif ($parameter->isCallable()) {
+                $typeName = 'callable';
+            } else {
+                $typeName = $parameter->getType()->getName();
+            }
+
+            if ($parameter->allowsNull()) {
+                $typeName = '?' .$typeName;
+            }
+        }
+
+        return $typeName;
+    }
+
+    /**
+     * @param \ReflectionParameter $parameter
+     *
+     * @return null|ValueGenerator
+     */
+    private function extractParameterDefaultValue(
+        \ReflectionParameter $parameter
+    ): ?ValueGenerator {
+        /** @var ValueGenerator|null $value */
+        $value = null;
+        if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
+            $valueType = ValueGenerator::TYPE_AUTO;
+            $defaultValue = $parameter->getDefaultValue();
+            if ($defaultValue === null) {
+                $valueType = ValueGenerator::TYPE_NULL;
+            }
+            $value = new ValueGenerator($defaultValue, $valueType);
+        }
 
         return $value;
     }
@@ -313,32 +368,13 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
         $parameterInfo = [
             'name' => $parameter->getName(),
             'passedByReference' => $parameter->isPassedByReference(),
-            'type' => $parameter->hasType()
-                ? $parameter->getType()->getName() : null,
             'variadic' => $parameter->isVariadic()
         ];
-
-        if ($parameter->isArray()) {
-            $parameterInfo['type'] = 'array';
-        } elseif ($parameter->getClass()) {
-            $parameterInfo['type'] = $this->_getFullyQualifiedClassName($parameter->getClass()->getName());
-        } elseif ($parameter->isCallable()) {
-            $parameterInfo['type'] = 'callable';
-        }
-
-        if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
-            $defaultValue = $parameter->getDefaultValue();
-            if (is_string($defaultValue)) {
-                $parameterInfo['defaultValue'] = $parameter->getDefaultValue();
-            } elseif ($defaultValue === null) {
-                $parameterInfo['defaultValue'] = $this->_getNullDefaultValue();
-            } else {
-                $parameterInfo['defaultValue'] = $defaultValue;
-            }
+        if ($type = $this->extractParameterType($parameter)) {
+            $parameterInfo['type'] = $type;
         }
-
-        if ($parameter->allowsNull() && $parameterInfo['type']) {
-            $parameterInfo['type'] = '?' .$parameterInfo['type'];
+        if ($default = $this->extractParameterDefaultValue($parameter)) {
+            $parameterInfo['defaultValue'] = $default;
         }
 
         return $parameterInfo;