Merge pull request #309 from goaop/feature/php71-nullable-types

Add support for nullable types for the PHP7.1
goaop · Jan 5, 2017 · c79ecee · c79ecee
2 parents 96c7426 + c212ff9
commit c79ecee
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Proxy/AbstractProxy.php b/src/Proxy/AbstractProxy.php
@@ -103,11 +103,12 @@ protected function getParameters(array $parameters)
     protected function getParameterCode(ReflectionParameter $parameter)
     {
         $type = '';
-        if (PHP_VERSION_ID >= 50700) {
+        if (PHP_VERSION_ID >= 70000) {
             $reflectionType = $parameter->getType();
             if ($reflectionType) {
-                $nsPrefix = $reflectionType->isBuiltin() ? '' : '\\';
-                $type     = $nsPrefix . (string) $reflectionType;
+                $nullablePrefix = $reflectionType->allowsNull() ? '?' : '';
+                $nsPrefix       = $reflectionType->isBuiltin() ? '' : '\\';
+                $type           = $nullablePrefix . $nsPrefix . (string) $reflectionType;
             }
         } else {
             if ($parameter->isArray()) {
@@ -204,11 +205,13 @@ protected function prepareArgsLine(ReflectionFunctionAbstract $functionLike)
      */
     protected function getOverriddenFunction(ReflectionFunctionAbstract $functionLike, $body)
     {
-        $reflectionReturnType = PHP_VERSION_ID >= 50700 ? $functionLike->getReturnType() : '';
+        $reflectionReturnType = PHP_VERSION_ID >= 70000 ? $functionLike->getReturnType() : '';
         $modifiersLine        = '';
         if ($reflectionReturnType) {
-            $nsPrefix             = $reflectionReturnType->isBuiltin() ? '' : '\\';
-            $reflectionReturnType = $nsPrefix . (string)$reflectionReturnType;
+            $nullablePrefix = $reflectionReturnType->allowsNull() ? '?' : '';
+            $nsPrefix       = $reflectionReturnType->isBuiltin() ? '' : '\\';
+
+            $reflectionReturnType = $nullablePrefix . $nsPrefix . (string) $reflectionReturnType;
         }
         if ($functionLike instanceof ReflectionMethod) {
             $modifiersLine = join(' ', Reflection::getModifierNames($functionLike->getModifiers()));