Merge pull request #780 from davedevelopment/cater-for-object-type-hints

Cater for object type hints in PHP 7.2
mockery · Aug 22, 2017 · afc610b · afc610b
2 parents b5b7fda + 2fb26a5
commit afc610b
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 1 deletion.
diff --git a/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php b/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php
@@ -112,6 +112,11 @@ protected function renderTypeHint(Parameter $param)
             'string',
             'iterable',
         );
+
+        if (version_compare(PHP_VERSION, '7.2.0-dev') >= 0) {
+            $languageTypeHints[] = 'object';
+        }
+
         $typeHint = trim($param->getTypeHintAsString());
 
         if (!empty($typeHint)) {

diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -710,6 +710,11 @@ public function mockery_returnValueForMethod($name)
             case 'void':
                 return null;
 
+            case 'object':
+                if (version_compare(PHP_VERSION, '7.2.0-dev') >= 0) {
+                    return \Mockery::mock();
+                }
+
             default:
                 return \Mockery::mock($type);
         }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -18,8 +18,10 @@
             <exclude>./tests/Mockery/MockingVariadicArgumentsTest.php</exclude>
             <exclude>./tests/Mockery/MockingParameterAndReturnTypesTest.php</exclude>
             <exclude>./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php</exclude>
+            <exclude>./tests/Mockery/Php72LanguageFeaturesTest.php</exclude>
             <file phpVersion="7.0.0-dev" phpVersionOperator=">=">./tests/Mockery/MockingParameterAndReturnTypesTest.php</file>
             <file phpVersion="7.0.0-dev" phpVersionOperator=">=">./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php</file>
+            <file phpVersion="7.2.0-dev" phpVersionOperator=">=">./tests/Mockery/Php72LanguageFeaturesTest.php</file>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/tests/Mockery/DemeterChainTest.php b/tests/Mockery/DemeterChainTest.php
@@ -28,7 +28,7 @@ class DemeterChainTest extends MockeryTestCase
 
     public function setUp()
     {
-        $this->mock = $this->mock = Mockery::mock('object')->shouldIgnoreMissing();
+        $this->mock = $this->mock = Mockery::mock()->shouldIgnoreMissing();
     }
 
     public function tearDown()

diff --git a/tests/Mockery/Php72LanguageFeaturesTest.php b/tests/Mockery/Php72LanguageFeaturesTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace test\Mockery;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+/**
+ * @requires PHP 7.2.0-dev
+ */
+class Php72LanguageFeaturesTest extends MockeryTestCase
+{
+    /** @test */
+    public function it_can_mock_a_class_with_an_object_argument_type_hint()
+    {
+        $mock = mock(ArgumentObjectTypeHint::class);
+        $object = new \stdClass;
+        $mock->allows()->foo($object);
+
+        $mock->foo($object);
+    }
+
+    /** @test */
+    public function it_can_mock_a_class_with_an_object_return_type_hint()
+    {
+        $mock = spy(ReturnTypeObjectTypeHint::class);
+
+        $object = $mock->foo();
+
+        $this->assertTrue(is_object($object));
+    }
+}
+
+class ArgumentObjectTypeHint 
+{
+    function foo(object $foo) {}
+}
+
+class ReturnTypeObjectTypeHint 
+{
+    function foo(): object {}
+}