More precise return type for gatherAssertTypes

staabm · staabm · commit 28694e86d567 · 2025-12-04T16:26:40.000+01:00
diff --git a/src/Testing/TypeInferenceTestCase.php b/src/Testing/TypeInferenceTestCase.php
@@ -220,8 +220,13 @@ public function assertFileAsserts(
 	}
 
 	/**
+	 * @return array<string, (
+	 *      array{0: 'type', 1: string, 2: string, 3: string, 4: int, 5?: string}|
+	 *      array{0: 'superType', 1: string, 2: string, 3: string, 4: bool, 5: int, 6?: string}|
+	 *      array{0: 'variableCertainty', 1: string, 2: TrinaryLogic, 3: TrinaryLogic, 4: string, 5: int, 6?: string}
+	 *  )>
+	 *
 	 * @api
-	 * @return array<string, mixed[]>
 	 */
 	public static function gatherAssertTypes(string $file): array
 	{
diff --git a/tests/PHPStan/Analyser/LooseConstComparisonPhp7Test.php b/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,
diff --git a/tests/PHPStan/Analyser/LooseConstComparisonPhp8Test.php b/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,
diff --git a/tests/PHPStan/Analyser/SubstrPhp7Test.php b/tests/PHPStan/Analyser/SubstrPhp7Test.php
@@ -7,10 +7,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');
diff --git a/tests/PHPStan/Analyser/SubstrPhp8Test.php b/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');

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,13 @@ public function assertFileAsserts(`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
	`223`	`+ * @return array<string, (`
	`224`	`+ * array{0: 'type', 1: string, 2: string, 3: string, 4: int, 5?: string}\|`
	`225`	`+ * array{0: 'superType', 1: string, 2: string, 3: string, 4: bool, 5: int, 6?: string}\|`
	`226`	`+ * array{0: 'variableCertainty', 1: string, 2: TrinaryLogic, 3: TrinaryLogic, 4: string, 5: int, 6?: string}`
	`227`	`+ * )>`
	`228`	`+ *`
`223`	`229`	`* @api`
`224`		`- * @return array<string, mixed[]>`
`225`	`230`	`*/`
`226`	`231`	`public static function gatherAssertTypes(string $file): array`
`227`	`232`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`	`class LooseConstComparisonPhp7Test extends TypeInferenceTestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- /**`
`12`		`- * @return iterable<array<string, mixed[]>>`
`13`		`- */`
`14`	`11`	`public static function dataFileAsserts(): iterable`
`15`	`12`	`{`
`16`	`13`	`// compares constants according to the php-version phpstan configuration,`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`	`class LooseConstComparisonPhp8Test extends TypeInferenceTestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- /**`
`12`		`- * @return iterable<array<string, mixed[]>>`
`13`		`- */`
`14`	`11`	`public static function dataFileAsserts(): iterable`
`15`	`12`	`{`
`16`	`13`	`// compares constants according to the php-version phpstan configuration,`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,6 @@`
`7`	`7`
`8`	`8`	`class SubstrPhp7Test extends TypeInferenceTestCase`
`9`	`9`	`{`
`10`		`-`
`11`		`- /**`
`12`		`- * @return iterable<array<string, mixed[]>>`
`13`		`- */`
`14`	`10`	`public static function dataFileAsserts(): iterable`
`15`	`11`	`{`
`16`	`12`	`yield from self::gatherAssertTypes(__DIR__ . '/data/bug-13129-php7.php');`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`	`class SubstrPhp8Test extends TypeInferenceTestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- /**`
`12`		`- * @return iterable<array<string, mixed[]>>`
`13`		`- */`
`14`	`11`	`public static function dataFileAsserts(): iterable`
`15`	`12`	`{`
`16`	`13`	`yield from self::gatherAssertTypes(__DIR__ . '/data/bug-13129-php8.php');`