Merge pull request #75 from microsoft/dev

v0.8.1
microsoft · Jul 10, 2023 · 8d5b6b9 · 8d5b6b9
2 parents 8e5bda3 + db95402
commit 8d5b6b9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,3 +4,6 @@ parameters:
   polluteScopeWithLoopInitialAssignments: false
   paths:
     - src
+  reportUnmatchedIgnoredErrors: false
+  ignoreErrors:
+    - '/^Parameter #1 \$[A-Za-z_0-9]+ of function is_subclass_of expects object\|string, mixed given.$/'
diff --git a/src/Types/TypeUtils.php b/src/Types/TypeUtils.php
@@ -29,7 +29,7 @@ public static function validateCollectionValues($values, string $type): void
         if (is_array($values)) {
             foreach ($values as $value) {
                 $debugType = get_debug_type($value);
-                if ($type !== $debugType) {
+                if ($type !== $debugType && !is_subclass_of($value, $type)) {
                     throw new UnexpectedValueException("Collection of type=$type contains value of type=$debugType");
                 }
             }

diff --git a/tests/Types/TypeUtilsTest.php b/tests/Types/TypeUtilsTest.php
@@ -41,8 +41,23 @@ public function testInvalidValueThrowsException(): void
             }
         }
     }
+
+    public function testValidationWithChildClasses(): void
+    {
+        $this->expectNotToPerformAssertions();
+        TypeUtils::validateCollectionValues([new ChildCustomType(), new ChildCustomType()], TestCustomType::class);
+        TypeUtils::validateCollectionValues([new ChildCustomType(), new ChildCustomType()], TestInterface::class);
+    }
 }
 
 class TestCustomType {
 
 }
+
+class ChildCustomType extends TestCustomType implements TestInterface {
+
+}
+
+interface TestInterface {
+
+}