Downgrade arrays less

ondrejmirtes · ondrejmirtes · commit 5f1a4a5b9c65 · 2022-09-22T14:50:20.000+02:00
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -594,7 +594,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 		}
 		if (count($arrayTypes) === 1) {
 			return [
-				self::intersect(...self::optimizeConstantArrays($arrayTypes), ...$accessoryTypes),
+				self::intersect(...$arrayTypes, ...$accessoryTypes),
 			];
 		}
 
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -958,6 +958,18 @@ public function testArrayUnion(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug7963(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7963.php');
+		$this->assertNoErrors($errors);
+	}
+
+	public function testBug7963Two(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7963-two.php');
+		$this->assertNoErrors($errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1039,6 +1039,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8033.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-union-unshift.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7987.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7963-three.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/data/bug-7963-three.php b/tests/PHPStan/Analyser/data/bug-7963-three.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Bug7963Three;
+
+use function PHPStan\Testing\assertType;
+
+function (): void {
+	/**
+	 * @var array{
+	 *     foo: string|null,
+	 *     bar: string|null,
+	 *     baz: string|null,
+	 *     abc: string|null,
+	 *     qwe: string|null,
+	 *     xyz: string|null,
+	 * } $arr
+	 */
+	$arr = [];
+
+	$str = 'Info: ';
+	$str .= $arr['foo'] !== null ? "[foo:$arr[foo]]" : '[no-foo]';
+	$str .= $arr['bar'] !== null ? "[bar:$arr[bar]]" : '[no-bar]';
+	$str .= $arr['baz'] !== null ? "[baz:$arr[baz]]" : '[no-baz]';
+	assertType('array{foo: string|null, bar: string|null, baz: string|null, abc: string|null, qwe: string|null, xyz: string|null}', $arr);
+	$str .= $arr['abc'] !== null ? "[abc:$arr[abc]]" : '[no-abc]';
+	$str .= $arr['qwe'] !== null ? "[qwe:$arr[qwe]]" : '[no-qwe]';
+	$str .= $arr['xyz'] !== null ? "[xyz:$arr[xyz]]" : '[no-xyz]';
+	assertType('array{foo: string|null, bar: string|null, baz: string|null, abc: string|null, qwe: string|null, xyz: string|null}', $arr);
+};
diff --git a/tests/PHPStan/Analyser/data/bug-7963-two.php b/tests/PHPStan/Analyser/data/bug-7963-two.php
diff --git a/tests/PHPStan/Analyser/data/bug-7963.php b/tests/PHPStan/Analyser/data/bug-7963.php

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp`
`594`	`594`	`}`
`595`	`595`	`if (count($arrayTypes) === 1) {`
`596`	`596`	`return [`
`597`		`- self::intersect(...self::optimizeConstantArrays($arrayTypes), ...$accessoryTypes),`
	`597`	`+ self::intersect(...$arrayTypes, ...$accessoryTypes),`
`598`	`598`	`];`
`599`	`599`	`}`
`600`	`600`
Original file line number	Diff line number	Diff line change
`@@ -1039,6 +1039,7 @@ public function dataFileAsserts(): iterable`
`1039`	`1039`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8033.php');`
`1040`	`1040`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/constant-array-union-unshift.php');`
`1041`	`1041`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7987.php');`
	`1042`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7963-three.php');`
`1042`	`1043`	`}`
`1043`	`1044`
`1044`	`1045`	`/**`