List type cast to array is still list

rajyan · web-flow · commit 8b456c524c6d · 2022-11-03T22:43:11.000+01:00
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -304,7 +304,7 @@ public function toString(): Type
 
 	public function toArray(): Type
 	{
-		return new MixedType();
+		return $this;
 	}
 
 	public function toArrayKey(): Type
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -134,6 +134,8 @@ public function toArray(): Type
 			[new ConstantIntegerType(0)],
 			[$this],
 			[1],
+			[],
+			true
 		);
 	}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1119,6 +1119,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-treatPhpDocTypesAsCertainBug.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-retain-expression-types.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7913.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-8280.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -1220,4 +1220,9 @@ public function testCurlSetOpt(): void
 		]);
 	}
 
+	public function testBug8280(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8280.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Functions/data/bug-8280.php b/tests/PHPStan/Rules/Functions/data/bug-8280.php
@@ -0,0 +1,18 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8280;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param list<string> $var
+ */
+function foo($var): void {}
+
+/** @var string|list<string>|null $var */
+if (null !== $var) {
+	assertType('list<string>', (array) $var);
+	foo((array) $var); // should work the same as line below
+	assertType('list<string>', !is_array($var) ? [$var] : $var);
+	foo(!is_array($var) ? [$var] : $var);
+}

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public function toString(): Type`
`304`	`304`
`305`	`305`	`public function toArray(): Type`
`306`	`306`	`{`
`307`		`- return new MixedType();`
	`307`	`+ return $this;`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`public function toArrayKey(): Type`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ public function toArray(): Type`
`134`	`134`	`[new ConstantIntegerType(0)],`
`135`	`135`	`[$this],`
`136`	`136`	`[1],`
	`137`	`+ [],`
	`138`	`+ true`
`137`	`139`	`);`
`138`	`140`	`}`
`139`	`141`
Original file line number	Diff line number	Diff line change
`@@ -1119,6 +1119,7 @@ public function dataFileAsserts(): iterable`
`1119`	`1119`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-treatPhpDocTypesAsCertainBug.php');`
`1120`	`1120`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-retain-expression-types.php');`
`1121`	`1121`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7913.php');`
	`1122`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-8280.php');`
`1122`	`1123`	`}`
`1123`	`1124`
`1124`	`1125`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1220,4 +1220,9 @@ public function testCurlSetOpt(): void`
`1220`	`1220`	`]);`
`1221`	`1221`	`}`
`1222`	`1222`
	`1223`	`+ public function testBug8280(): void`
	`1224`	`+ {`
	`1225`	`+ $this->analyse([__DIR__ . '/data/bug-8280.php'], []);`
	`1226`	`+ }`
	`1227`	`+`
`1223`	`1228`	`}`