Merge branch refs/heads/1.12.x into 2.1.x

phpstan · Jan 15, 2025 · c53ed37 · c53ed37
2 parents 4811a1a + d38ed50
commit c53ed37
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type;
 
 use ArrayAccess;
+use ArrayObject;
 use Closure;
 use Countable;
 use Iterator;
@@ -615,6 +616,7 @@ public function toArray(): Type
 
 		if (
 			!$classReflection->getNativeReflection()->isUserDefined()
+			|| $classReflection->is(ArrayObject::class)
 			|| UniversalObjectCratesClassReflectionExtension::isUniversalObjectCrate(
 				$reflectionProvider,
 				$classReflection,

diff --git a/tests/PHPStan/Analyser/nsrt/bug-12182.php b/tests/PHPStan/Analyser/nsrt/bug-12182.php
@@ -0,0 +1,19 @@
+<?php // lint >= 8.0
+
+namespace Bug12182;
+
+use ArrayObject;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @extends ArrayObject<int, string>
+ */
+class HelloWorld extends ArrayObject
+{
+	public function __construct(private int $a = 42) {
+	}
+}
+
+function (HelloWorld $hw): void {
+	assertType('array', (array) $hw);
+};