Merge pull request #1075 from GrahamCampbell/patch-1

[1.3] Support iterable and removed uneeded check
mockery · Jul 8, 2020 · f3626ba · f3626ba
2 parents 42daaa7 + 48b23ad
commit f3626ba
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -724,7 +724,10 @@ public function mockery_returnValueForMethod($name)
             case 'int':    return 0;
             case 'float':  return 0.0;
             case 'bool':   return false;
-            case 'array':  return [];
+
+            case 'array':
+            case 'iterable':
+                return [];
 
             case 'callable':
             case '\Closure':
@@ -740,9 +743,7 @@ public function mockery_returnValueForMethod($name)
                 return null;
 
             case 'object':
-                if (\PHP_VERSION_ID >= 70200) {
-                    return \Mockery::mock();
-                }
+                return \Mockery::mock();
 
             default:
                 return \Mockery::mock($returnType);

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,6 +7,7 @@
         <testsuite name="Mockery Test Suite">
             <directory suffix="Test.php">./tests</directory>
             <directory phpVersion="7.0.0" phpVersionOperator=">=">./tests/PHP70</directory>
+            <directory phpVersion="7.1.0" phpVersionOperator=">=">./tests/PHP71</directory>
             <directory phpVersion="7.2.0" phpVersionOperator=">=">./tests/PHP72</directory>
         </testsuite>
 
@@ -15,6 +16,7 @@
             <directory suffix="Test.php">./tests/PHP56</directory>
 
             <exclude>./tests/PHP70</exclude>
+            <exclude>./tests/PHP71</exclude>
             <exclude>./tests/PHP72</exclude>
         </testsuite>
     </testsuites>

diff --git a/tests/PHP71/Php71LanguageFeaturesTest.php b/tests/PHP71/Php71LanguageFeaturesTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace test\Mockery;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+/**
+ * @requires PHP 7.1.0-dev
+ */
+class Php71LanguageFeaturesTest extends MockeryTestCase
+{
+    public function testMockingIterableReturnType()
+    {
+        $mock = mock("test\Mockery\ReturnTypeIterableTypeHint");
+
+        $mock->shouldReceive("returnIterable");
+        $this->assertSame([], $mock->returnIterable());
+    }
+}
+
+abstract class ReturnTypeIterableTypeHint
+{
+    public function returnIterable(): iterable
+    {
+    }
+}