iterable (PHP 7.1 internal union type) should be recognized as "spe…

…cial" in return type generation code
zendframework · Sep 16, 2016 · 1efb23f · 1efb23f
1 parent 8e785fd
commit 1efb23f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/test/Generator/MethodGeneratorTest.php b/test/Generator/MethodGeneratorTest.php
@@ -16,6 +16,7 @@
 use ZendTest\Code\TestAsset\ClassWithByRefReturnMethod;
 use ZendTest\Code\TestAsset\EmptyClass;
 use ZendTest\Code\TestAsset\InternalHintsClass;
+use ZendTest\Code\TestAsset\IterableHintsClass;
 use ZendTest\Code\TestAsset\NullableReturnTypeHintedClass;
 use ZendTest\Code\TestAsset\ReturnTypeHintedClass;
 
@@ -359,13 +360,18 @@ public function returnTypeHintClassesProvider()
             [NullableReturnTypeHintedClass::class, 'parentReturn', '?\\' . EmptyClass::class],
             [NullableReturnTypeHintedClass::class, 'classReturn', '?\\' . NullableReturnTypeHintedClass::class],
             [NullableReturnTypeHintedClass::class, 'otherClassReturn', '?\\' . InternalHintsClass::class],
+            [IterableHintsClass::class, 'iterableReturnValue', 'iterable'],
+            [IterableHintsClass::class, 'nullableIterableReturnValue', '?iterable'],
         ];
 
         return array_filter(
             $parameters,
             function (array $parameter) {
                 return PHP_VERSION_ID >= 70100
-                    || (false === strpos($parameter[2], '?') && 'void' !== strtolower($parameter[2]));
+                    || (
+                        false === strpos($parameter[2], '?')
+                        && ! in_array(strtolower($parameter[2]), ['void', 'iterable'])
+                    );
             }
         );
     }