Fixed stub types for SplFixedArray

phpstan · Jul 23, 2021 · cacc8bb · cacc8bb
1 parent da3790e
commit cacc8bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/stubs/ArrayObject.stub b/stubs/ArrayObject.stub
@@ -88,9 +88,9 @@ class ArrayObject implements IteratorAggregate, ArrayAccess
 
 /**
  * @template TValue
- * @implements Iterator<int, TValue>
- * @implements IteratorAggregate<int, TValue>
- * @implements ArrayAccess<int, TValue>
+ * @implements Iterator<int, TValue|null>
+ * @implements IteratorAggregate<int, TValue|null>
+ * @implements ArrayAccess<int, TValue|null>
  */
 class SplFixedArray implements Iterator, IteratorAggregate, ArrayAccess, Countable
 {
@@ -102,7 +102,7 @@ class SplFixedArray implements Iterator, IteratorAggregate, ArrayAccess, Countab
 	public static function fromArray(array $array, bool $save_indexes = true): SplFixedArray { }
 
 	/**
-	 * @return array<int, TValue>
+	 * @return array<int, TValue|null>
 	 */
 	public function toArray(): array { }
 }
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -446,6 +446,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5129.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4970.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5322.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/splfixedarray-iterator-types.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/splfixedarray-iterator-types.php b/tests/PHPStan/Analyser/data/splfixedarray-iterator-types.php
@@ -0,0 +1,17 @@
+<?php
+
+class HelloWorld
+{
+	/**
+	 * @var int[]|\SplFixedArray
+	 * @phpstan-var \SplFixedArray<int>
+	 */
+	public $array;
+
+	public function dump() : void{
+		foreach($this->array as $id => $v){
+			\PHPStan\Testing\assertType('int|null', $this->array[$id]);
+			\PHPStan\Testing\assertType('int|null', $v);
+		}
+	}
+}