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

@@ -17,6 +17,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;
 
@@ -365,16 +366,22 @@ 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 array_filter(
             $parameters,
             function (array $parameter) {
-                return PHP_VERSION_ID >= 70100
+                return (PHP_VERSION_ID >= 70200
+                    || (
+                        false === strpos($parameter[2], 'object')
+                    ))
+                    && (PHP_VERSION_ID >= 70100
                     || (
                         false === strpos($parameter[2], '?')
                         && ! in_array(strtolower($parameter[2]), ['void', 'iterable'])
-                    );
+                    ));
             }
         );
     }

test/Generator/ParameterGeneratorTest.php

@@ -19,6 +19,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;
@@ -349,9 +350,6 @@ public function validClassNameProvider()
             ['mixed'],
             ['Mixed'],
             ['MIXED'],
-            ['object'],
-            ['Object'],
-            ['OBJECT'],
             ['resource'],
             ['Resource'],
             ['RESOURCE'],
@@ -472,13 +470,24 @@ 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 >= 70100
-                    || (false === strpos($parameter[3], '?') && 'iterable' !== strtolower($parameter[3]));
+
+                return (PHP_VERSION_ID >= 70200
+                    || (
+                        false === strpos($parameter[3], 'object')
+                    ))
+                    && (PHP_VERSION_ID >= 70100
+                    || (
+                        false === strpos($parameter[3], '?')
+                        && ! in_array(strtolower($parameter[3]), ['void', 'iterable'])
+                    ));
             }
         );
 

test/Generator/TypeGeneratorTest.php

@@ -242,6 +242,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
+    {
+    }
+}