Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

composer.json

@@ -25,7 +25,7 @@
 		"nikic/php-parser": "^5.2.0",
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "6.42.0.8",
-		"phpstan/php-8-stubs": "0.3.104",
+		"phpstan/php-8-stubs": "0.3.105",
 		"phpstan/phpdoc-parser": "^2.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",

composer.lock

@@ -279,25 +279,38 @@ public static function gatherAssertTypes(string $file): array
 	 * @return array<string, mixed[]>
 	 */
 	public static function gatherAssertTypesFromDirectory(string $directory): array
+	{
+		$asserts = [];
+		foreach (self::findTestDataFilesFromDirectory($directory) as $path) {
+			foreach (self::gatherAssertTypes($path) as $key => $assert) {
+				$asserts[$key] = $assert;
+			}
+		}
+
+		return $asserts;
+	}
+
+	/**
+	 * @return list<string>
+	 */
+	public static function findTestDataFilesFromDirectory(string $directory): array
 	{
 		if (!is_dir($directory)) {
 			self::fail(sprintf('Directory %s does not exist.', $directory));
 		}
 
 		$finder = new Finder();
 		$finder->followLinks();
-		$asserts = [];
+		$files = [];
 		foreach ($finder->files()->name('*.php')->in($directory) as $fileInfo) {
 			$path = $fileInfo->getPathname();
 			if (self::isFileLintSkipped($path)) {
 				continue;
 			}
-			foreach (self::gatherAssertTypes($path) as $key => $assert) {
-				$asserts[$key] = $assert;
-			}
+			$files[] = $path;
 		}
 
-		return $asserts;
+		return $files;
 	}
 
 	/**