Fixing nullable return types under latest PHP 7.1 RC. Closes #206.

Author: ezzatron

.travis.yml

@@ -31,7 +31,6 @@ matrix:
           group: edge
     fast_finish: true
     allow_failures:
-        - php: 7.1
         - php: nightly
         - php: hhvm-nightly
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Phony changelog
 
+## Next release
+
+- **[FIXED]** Fixed nullable return type support for newer PHP 7.1 release
+  candidates ([#206]).
+
+[#206]: https://github.com/eloquent/phony/issues/206
+
 ## 0.14.1 (2016-11-04)
 
 - **[FIXED]** Checking for nullable type support no longer causes fatal errors

src/Mock/MockGenerator.php

@@ -289,7 +289,11 @@ public static function ${returnsReference}__callStatic(
                 $isBuiltin = $isBuiltin && false === strpos($typeString, '\\');
                 // @codeCoverageIgnoreEnd
             } else {
-                $typeString = (string) $type;
+                if ($type->allowsNull()) {
+                    $typeString = '?' . $type; // @codeCoverageIgnore
+                } else {
+                    $typeString = (string) $type;
+                }
             }
 
             if ($isBuiltin) {
@@ -488,7 +492,11 @@ private function generateMethods($methods)
                         $isBuiltin && false === strpos($typeString, '\\');
                     // @codeCoverageIgnoreEnd
                 } else {
-                    $typeString = (string) $type;
+                    if ($type->allowsNull()) {
+                        $typeString = '?' . $type; // @codeCoverageIgnore
+                    } else {
+                        $typeString = (string) $type;
+                    }
                 }
 
                 if ($isBuiltin) {
@@ -681,7 +689,11 @@ public function ${returnsReference}__call(
                 $isBuiltin = $isBuiltin && false === strpos($typeString, '\\');
                 // @codeCoverageIgnoreEnd
             } else {
-                $typeString = (string) $type;
+                if ($type->allowsNull()) {
+                    $typeString = '?' . $type; // @codeCoverageIgnore
+                } else {
+                    $typeString = (string) $type;
+                }
             }
 
             if ($isBuiltin) {

test/src/Test/TestInterfaceWithNullableTypes.php

@@ -15,11 +15,11 @@
 
 interface TestInterfaceWithNullableTypes
 {
-    public function staticMethodA(?string $string, ?stdClass $object) : ?TestClassA;
-    public function staticMethodB() : ?int;
-    public function methodA(?string $string, ?stdClass $object) : ?TestClassA;
-    public function methodB() : ?int;
+    public function staticMethodA( ? string $string, ? stdClass $object) : ? TestClassA;
+    public function staticMethodB() : ? int;
+    public function methodA( ? string $string, ? stdClass $object) : ? TestClassA;
+    public function methodB() : ? int;
 
-    public function __call($name, array $arguments) : ?int;
-    public static function __callStatic($name, array $arguments) : ?int;
+    public function __call($name, array $arguments) : ? int;
+    public static function __callStatic($name, array $arguments) : ? int;
 }