More precise return type for gatherAssertTypes

Author: staabm

src/Testing/TypeInferenceTestCase.php

@@ -220,8 +220,13 @@ public function assertFileAsserts(
 	}
 
 	/**
+	 * @return array<string, (
+	 *      array{0: 'type', 1: string, 2: int|float|string|bool|null, 3: string, 4: int, 5?: non-empty-list<non-falsy-string>}|
+	 *      array{0: 'superType', 1: string, 2: string, 3: string, 4: bool, 5: int, 6?: non-empty-list<non-falsy-string>}|
+	 *      array{0: 'variableCertainty', 1: string, 2: TrinaryLogic, 3: TrinaryLogic, 4: string, 5: int, 6?: non-empty-list<non-falsy-string>}
+	 *  )>
+	 *
 	 * @api
-	 * @return array<string, mixed[]>
 	 */
 	public static function gatherAssertTypes(string $file): array
 	{

tests/PHPStan/Analyser/LooseConstComparisonPhp7Test.php

@@ -8,9 +8,6 @@
 class LooseConstComparisonPhp7Test extends TypeInferenceTestCase
 {
 
-	/**
-	 * @return iterable<array<string, mixed[]>>
-	 */
 	public static function dataFileAsserts(): iterable
 	{
 		// compares constants according to the php-version phpstan configuration,

tests/PHPStan/Analyser/LooseConstComparisonPhp8Test.php

@@ -8,9 +8,6 @@
 class LooseConstComparisonPhp8Test extends TypeInferenceTestCase
 {
 
-	/**
-	 * @return iterable<array<string, mixed[]>>
-	 */
 	public static function dataFileAsserts(): iterable
 	{
 		// compares constants according to the php-version phpstan configuration,

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -8,7 +8,6 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use stdClass;
 use function array_merge;
-use function array_shift;
 use function define;
 use function dirname;
 use function implode;
@@ -270,23 +269,24 @@ public function testFile(string $file): void
 		$failures = [];
 
 		foreach ($asserts as $args) {
-			$assertType = array_shift($args);
-			$file = array_shift($args);
+			if ($args[0] === 'type') {
+				$file = $args[1];
 
-			if ($assertType === 'type') {
-				$expected = $args[0];
-				$actual = $args[1];
+				$expected = $args[2];
+				$actual = $args[3];
 
 				if ($expected !== $actual) {
-					$failures[] = sprintf("Line %d:\nExpected: %s\nActual:   %s\n", $args[2], $expected, $actual);
+					$failures[] = sprintf("Line %d:\nExpected: %s\nActual:   %s\n", $args[4], $expected, $actual);
 				}
-			} elseif ($assertType === 'variableCertainty') {
-				$expectedCertainty = $args[0];
-				$actualCertainty = $args[1];
-				$variableName = $args[2];
+			} elseif ($args[0] === 'variableCertainty') {
+				$file = $args[1];
+
+				$expectedCertainty = $args[2];
+				$actualCertainty = $args[3];
+				$variableName = $args[4];
 
 				if ($expectedCertainty->equals($actualCertainty) !== true) {
-					$failures[] = sprintf("Certainty of %s on line %d:\nExpected: %s\nActual:   %s\n", $variableName, $args[3], $expectedCertainty->describe(), $actualCertainty->describe());
+					$failures[] = sprintf("Certainty of %s on line %d:\nExpected: %s\nActual:   %s\n", $variableName, $args[5], $expectedCertainty->describe(), $actualCertainty->describe());
 				}
 			}
 		}

tests/PHPStan/Analyser/SubstrPhp7Test.php

@@ -8,9 +8,6 @@
 class SubstrPhp7Test extends TypeInferenceTestCase
 {
 
-	/**
-	 * @return iterable<array<string, mixed[]>>
-	 */
 	public static function dataFileAsserts(): iterable
 	{
 		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-13129-php7.php');

tests/PHPStan/Analyser/SubstrPhp8Test.php

@@ -8,9 +8,6 @@
 class SubstrPhp8Test extends TypeInferenceTestCase
 {
 
-	/**
-	 * @return iterable<array<string, mixed[]>>
-	 */
 	public static function dataFileAsserts(): iterable
 	{
 		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-13129-php8.php');