Update test suite to check object internal type.

Introduce a new TestAsset\ObjectHintsClass as a sample to be used in test. Also update generator tests to check for object type.

Author: shulard

test/Generator/MethodGeneratorTest.php

@@ -22,6 +22,7 @@
 use ZendTest\Code\TestAsset\EmptyClass;
 use ZendTest\Code\TestAsset\InternalHintsClass;
 use ZendTest\Code\TestAsset\IterableHintsClass;
+use ZendTest\Code\TestAsset\ObjectHintsClass;
 use ZendTest\Code\TestAsset\NullableReturnTypeHintedClass;
 use ZendTest\Code\TestAsset\ReturnTypeHintedClass;
 
@@ -364,9 +365,19 @@ public function returnTypeHintClassesProvider()
             [NullableReturnTypeHintedClass::class, 'otherClassReturn', '?\\' . InternalHintsClass::class],
             [IterableHintsClass::class, 'iterableReturnValue', 'iterable'],
             [IterableHintsClass::class, 'nullableIterableReturnValue', '?iterable'],
+            [ObjectHintsClass::class, 'objectReturnValue', 'object'],
+            [ObjectHintsClass::class, 'nullableObjectReturnValue', '?object'],
         ];
 
-        return $parameters;
+        return array_filter(
+            $parameters,
+            function (array $parameter) {
+                return PHP_VERSION_ID >= 70200
+                    || (
+                        false === strpos($parameter[2], 'object')
+                    );
+            }
+        );
     }
 
     /**

test/Generator/ParameterGeneratorTest.php

@@ -21,6 +21,7 @@
 use ZendTest\Code\TestAsset\EmptyClass;
 use ZendTest\Code\TestAsset\InternalHintsClass;
 use ZendTest\Code\TestAsset\IterableHintsClass;
+use ZendTest\Code\TestAsset\ObjectHintsClass;
 use ZendTest\Code\TestAsset\NullableHintsClass;
 use ZendTest\Code\TestAsset\NullNullableDefaultHintsClass;
 use ZendTest\Code\TestAsset\VariadicParametersClass;
@@ -345,9 +346,6 @@ public function validClassNameProvider()
             ['mixed'],
             ['Mixed'],
             ['MIXED'],
-            ['object'],
-            ['Object'],
-            ['OBJECT'],
             ['resource'],
             ['Resource'],
             ['RESOURCE'],
@@ -464,17 +462,30 @@ public function reflectionHintsProvider()
             [IterableHintsClass::class, 'iterableParameter', 'foo', 'iterable'],
             [IterableHintsClass::class, 'nullableIterableParameter', 'foo', '?iterable'],
             [IterableHintsClass::class, 'nullDefaultIterableParameter', 'foo', '?iterable'],
+            [ObjectHintsClass::class, 'objectParameter', 'foo', 'object'],
+            [ObjectHintsClass::class, 'nullableObjectParameter', 'foo', '?object'],
+            [ObjectHintsClass::class, 'nullDefaultObjectParameter', 'foo', '?object'],
         ];
 
+        $compatibleParameters = array_filter(
+            $parameters,
+            function (array $parameter) {
+                return PHP_VERSION_ID >= 70200
+                    || (
+                        false === strpos($parameter[3], 'object')
+                    );
+            }
+        );
+
         // just re-organizing the keys so that the phpunit data set makes sense in errors:
         return array_combine(
             array_map(
                 function (array $definition) {
                     return $definition[0] . '#' . $definition[1];
                 },
-                $parameters
+                $compatibleParameters
             ),
-            $parameters
+            $compatibleParameters
         );
     }
 

test/Generator/TypeGeneratorTest.php

@@ -117,9 +117,9 @@ public function validTypeProvider()
             ['iterable', 'iterable'],
             ['Iterable', 'iterable'],
             ['ITERABLE', 'iterable'],
-            ['object', '\\object'],
-            ['Object', '\\Object'],
-            ['OBJECT', '\\OBJECT'],
+            ['object', 'object'],
+            ['Object', 'object'],
+            ['OBJECT', 'object'],
             ['mixed', '\\mixed'],
             ['Mixed', '\\Mixed'],
             ['MIXED', '\\MIXED'],
@@ -157,9 +157,9 @@ public function validTypeProvider()
             ['?iterable', '?iterable'],
             ['?Iterable', '?iterable'],
             ['?ITERABLE', '?iterable'],
-            ['?object', '?\\object'],
-            ['?Object', '?\\Object'],
-            ['?OBJECT', '?\\OBJECT'],
+            ['?object', '?object'],
+            ['?Object', '?object'],
+            ['?OBJECT', '?object'],
             ['?mixed', '?\\mixed'],
             ['?Mixed', '?\\Mixed'],
             ['?MIXED', '?\\MIXED'],
@@ -241,6 +241,9 @@ public function invalidTypeProvider()
             ['\\iterable'],
             ['\\Iterable'],
             ['\\ITERABLE'],
+            ['\\object'],
+            ['\\Object'],
+            ['\\OBJECT'],
         ];
 
         return array_combine(

test/TestAsset/ObjectHintsClass.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace ZendTest\Code\TestAsset;
+
+class ObjectHintsClass extends EmptyClass
+{
+    public function objectParameter(object $foo)
+    {
+    }
+
+    public function nullableObjectParameter(?object $foo)
+    {
+    }
+
+    public function nullDefaultObjectParameter(object $foo = null)
+    {
+    }
+
+    public function objectReturnValue() : object
+    {
+    }
+
+    public function nullableObjectReturnValue() : ?object
+    {
+    }
+}