ConstantArrayType::generalize() should generalize item type too

ondrejmirtes · ondrejmirtes · commit fc052c46cfd0 · 2020-11-05T13:56:22.000+01:00
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -613,7 +613,7 @@ public function generalize(): Type
 
 		$arrayType = new ArrayType(
 			TypeUtils::generalizeType($this->getKeyType()),
-			$this->getItemType()
+			TypeUtils::generalizeType($this->getItemType())
 		);
 
 		if (count($this->keyTypes) > count($this->optionalKeys)) {
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -3191,11 +3191,11 @@ public function dataBinaryOperations(): array
 				'$coalesceArray',
 			],
 			[
-				'array<int, 1|2|3>',
+				'array<int, int>',
 				'$arrayToBeUnset',
 			],
 			[
-				'array<int, 1|2|3>',
+				'array<int, int>',
 				'$arrayToBeUnset2',
 			],
 			[
@@ -9140,7 +9140,7 @@ public function dataIsset(): array
 				'$anotherArrayCopy',
 			],
 			[
-				'array<string, 1|2|3|4|null>',
+				'array<string, int|null>',
 				'$yetAnotherArrayCopy',
 			],
 			[
diff --git a/tests/PHPStan/Analyser/data/generics.php b/tests/PHPStan/Analyser/data/generics.php
@@ -97,7 +97,7 @@ function testD($int, $float, $intFloat)
 	assertType('DateTime|int', d($int, new \DateTime()));
 	assertType('DateTime|float|int', d($intFloat, new \DateTime()));
 	assertType('array()|DateTime', d([], new \DateTime()));
-	assertType('(array<string, \'barrrr\'>&nonEmpty)|DateTime', d(['blabla' => 'barrrr'], new \DateTime()));
+	assertType('(array<string, string>&nonEmpty)|DateTime', d(['blabla' => 'barrrr'], new \DateTime()));
 }
 
 /**
diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
@@ -287,4 +287,9 @@ public function testPromotedProperties(): void
 		]);
 	}
 
+	public function testBug4056(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-4056.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Classes/data/bug-4056.php b/tests/PHPStan/Rules/Classes/data/bug-4056.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Bug4056;
+
+$a = new \ArrayObject([
+	'Dummy' => new \ArrayObject([
+		'properties' => [
+			'id' => [
+				'readOnly' => true,
+				'type' => 'integer',
+			],
+			'description' => [
+				'type' => 'string',
+			],
+		],
+	]),
+	'Dummy-list' => new \ArrayObject([
+		'properties' => [
+			'id' => [
+				'readOnly' => true,
+				'type' => 'integer',
+			],
+			'description' => [
+				'type' => 'string',
+			],
+		],
+	]),
+	'Dummy-list_details' => new \ArrayObject([
+		'properties' => [
+			'id' => [
+				'readOnly' => true,
+				'type' => 'integer',
+			],
+			'description' => [
+				'type' => 'string',
+			],
+			'relatedDummy' => new \ArrayObject([
+				'$ref' => '#/definitions/RelatedDummy-list_details',
+			]),
+		],
+	]),
+	'Dummy:OutputDto' => new \ArrayObject([
+		'type' => 'object',
+		'properties' => [
+			'baz' => new \ArrayObject([
+				'readOnly' => true,
+				'type' => 'string',
+			]),
+			'bat' => new \ArrayObject([
+				'type' => 'integer',
+			]),
+		],
+	]),
+	'Dummy:InputDto' => new \ArrayObject([
+		'type' => 'object',
+		'properties' => [
+			'foo' => new \ArrayObject([
+				'type' => 'string',
+			]),
+			'bar' => new \ArrayObject([
+				'type' => 'integer',
+			]),
+		],
+	]),
+	'RelatedDummy-list_details' => new \ArrayObject([
+		'type' => 'object',
+		'properties' => [
+			'name' => new \ArrayObject([
+				'type' => 'string',
+			]),
+		],
+	]),
+]);

Original file line number	Diff line number	Diff line change
`@@ -3191,11 +3191,11 @@ public function dataBinaryOperations(): array`
`3191`	`3191`	`'$coalesceArray',`
`3192`	`3192`	`],`
`3193`	`3193`	`[`
`3194`		`- 'array<int, 1\|2\|3>',`
	`3194`	`+ 'array<int, int>',`
`3195`	`3195`	`'$arrayToBeUnset',`
`3196`	`3196`	`],`
`3197`	`3197`	`[`
`3198`		`- 'array<int, 1\|2\|3>',`
	`3198`	`+ 'array<int, int>',`
`3199`	`3199`	`'$arrayToBeUnset2',`
`3200`	`3200`	`],`
`3201`	`3201`	`[`
`@@ -9140,7 +9140,7 @@ public function dataIsset(): array`
`9140`	`9140`	`'$anotherArrayCopy',`
`9141`	`9141`	`],`
`9142`	`9142`	`[`
`9143`		`- 'array<string, 1\|2\|3\|4\|null>',`
	`9143`	`+ 'array<string, int\|null>',`
`9144`	`9144`	`'$yetAnotherArrayCopy',`
`9145`	`9145`	`],`
`9146`	`9146`	`[`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ function testD($int, $float, $intFloat)`
`97`	`97`	`assertType('DateTime\|int', d($int, new \DateTime()));`
`98`	`98`	`assertType('DateTime\|float\|int', d($intFloat, new \DateTime()));`
`99`	`99`	`assertType('array()\|DateTime', d([], new \DateTime()));`
`100`		`- assertType('(array<string, \'barrrr\'>&nonEmpty)\|DateTime', d(['blabla' => 'barrrr'], new \DateTime()));`
	`100`	`+ assertType('(array<string, string>&nonEmpty)\|DateTime', d(['blabla' => 'barrrr'], new \DateTime()));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -287,4 +287,9 @@ public function testPromotedProperties(): void`
`287`	`287`	`]);`
`288`	`288`	`}`
`289`	`289`
	`290`	`+ public function testBug4056(): void`
	`291`	`+ {`
	`292`	`+ $this->analyse([__DIR__ . '/data/bug-4056.php'], []);`
	`293`	`+ }`
	`294`	`+`
`290`	`295`	`}`