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

phpstan-bot · web-flow · commit 8c6124ecaea4 · 2024-09-26T17:14:25.000+02:00
diff --git a/tests/PHPStan/Analyser/data/param-out.php b/tests/PHPStan/Analyser/data/param-out.php
@@ -315,7 +315,7 @@ function testParseStr() {
 	echo $output['arr'][1];//baz
 	*/
 
-	\PHPStan\Testing\assertType('array<int|string, array|string>', $output);
+	\PHPStan\Testing\assertType('array<int|string, array|lowercase-string>', $output);
 }
 
 function fooSimilar() {
@@ -501,4 +501,3 @@ function testMatch() {
 	preg_match('#.*#', 'foo', $matches);
 	assertType('array{0?: string}', $matches);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ function testParseStr() {`
`315`	`315`	`echo $output['arr'][1];//baz`
`316`	`316`	`*/`
`317`	`317`
`318`		`- \PHPStan\Testing\assertType('array<int\|string, array\|string>', $output);`
	`318`	`+ \PHPStan\Testing\assertType('array<int\|string, array\|lowercase-string>', $output);`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`function fooSimilar() {`
`@@ -501,4 +501,3 @@ function testMatch() {`
`501`	`501`	`preg_match('#.*#', 'foo', $matches);`
`502`	`502`	`assertType('array{0?: string}', $matches);`
`503`	`503`	`}`
`504`		`-`