fix getArrays

phpstan · Dec 26, 2022 · 29273e7 · 29273e7
1 parent 727ccd6
commit 29273e7
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 0 deletions.
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -145,6 +145,11 @@ public function getOptionalKeys(): array
 		return $this->optionalKeys;
 	}
 
+	public function getArrays(): array
+	{
+		return $this->getAllArrays();
+	}
+
 	/**
 	 * @return self[]
 	 */

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -109,6 +109,10 @@ public function getArrays(): array
 	{
 		$arrays = [];
 		foreach ($this->types as $type) {
+			if (!$type instanceof ArrayType) {
+				continue;
+			}
+
 			foreach ($type->getArrays() as $array) {
 				$arrays[] = $array;
 			}

diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -116,6 +116,10 @@ public function getArrays(): array
 	{
 		$arrays = [];
 		foreach ($this->types as $type) {
+			if (!$type instanceof ArrayType) {
+				return [];
+			}
+
 			foreach ($type->getArrays() as $array) {
 				$arrays[] = $array;
 			}

diff --git a/tests/PHPStan/Type/UnionTypeTest.php b/tests/PHPStan/Type/UnionTypeTest.php
@@ -1347,4 +1347,77 @@ public function dataGetConstantStrings(): iterable
 		];
 	}
 
+	/**
+	 * @dataProvider dataGetArrays
+	 * @param list<string> $expectedDescriptions
+	 */
+	public function testGetArrays(
+		Type $unionType,
+		array $expectedDescriptions,
+	): void
+	{
+		$arrays = $unionType->getArrays();
+
+		$actualDescriptions = [];
+		foreach ($arrays as $arrayType) {
+			$actualDescriptions[] = $arrayType->describe(VerbosityLevel::precise());
+		}
+
+		$this->assertSame($expectedDescriptions, $actualDescriptions);
+	}
+
+	public function dataGetArrays(): iterable
+	{
+		yield from [
+			[
+				TypeCombinator::union(
+					new ConstantStringType('hello'),
+					new ConstantStringType('world'),
+				),
+				[],
+			],
+			[
+				TypeCombinator::union(
+					TypeCombinator::intersect(
+						new ConstantArrayType(
+							[new ConstantIntegerType(1), new ConstantIntegerType(2)],
+							[new IntegerType(), new StringType()],
+							2,
+							[0, 1],
+						),
+						new NonEmptyArrayType(),
+					),
+					new ConstantArrayType(
+						[new ConstantIntegerType(0), new ConstantIntegerType(1)],
+						[new ObjectType(Foo::class), new ObjectType(stdClass::class)],
+						2,
+					),
+				),
+				[
+					'array{1?: int, 2?: string}',
+					'array{RecursionCallable\Foo, stdClass}',
+				],
+			],
+			[
+				TypeCombinator::union(
+					new ArrayType(new IntegerType(), new StringType()),
+					new ConstantArrayType(
+						[new ConstantIntegerType(1), new ConstantIntegerType(2)],
+						[new IntegerType(), new StringType()],
+						2,
+						[0, 1],
+					),
+					new ConstantArrayType(
+						[new ConstantIntegerType(0), new ConstantIntegerType(1)],
+						[new ObjectType(Foo::class), new ObjectType(stdClass::class)],
+						2,
+					),
+				),
+				[
+					'array<int, int|RecursionCallable\Foo|stdClass|string>',
+				],
+			],
+		];
+	}
+
 }