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

Author: phpstan-bot

.github/workflows/e2e-tests.yml

@@ -152,6 +152,14 @@ jobs:
           - script: |
               cd e2e/env-int-key
               env 1=1 ../../bin/phpstan analyse test.php
+          - script: |
+              cd e2e/result-cache-scanned
+              ../../bin/phpstan
+              patch -b src/Generated/Foo.php < patch.patch
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Result cache not used because the metadata do not match: projectConfig, scannedFiles' "$OUTPUT"
+              ../bashunit -a contains 'Instantiated class ResultCacheE2EGenerated\Foo not found.' "$OUTPUT"
           - script: |
               cd e2e/trait-caching
               ../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/

conf/config.neon

@@ -523,6 +523,7 @@ services:
 			scanFileFinder: @fileFinderScan
 			cacheFilePath: %resultCachePath%
 			analysedPaths: %analysedPaths%
+			analysedPathsFromConfig: %analysedPathsFromConfig%
 			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
 			usedLevel: %usedLevel%
 			cliAutoloadFile: %cliAutoloadFile%

e2e/result-cache-scanned/patch.patch

@@ -0,0 +1,8 @@
+--- src/Generated/Foo.php	2025-05-18 14:26:01
++++ src/Generated/Foo.php	2025-05-18 14:27:01
+@@ -1,4 +1,4 @@
+ <?php
+ namespace ResultCacheE2EGenerated;
+
+-final class Foo {}
++final class Bar {}

e2e/result-cache-scanned/phpstan.neon

@@ -0,0 +1,8 @@
+# phpstan.neon
+parameters:
+    level: 8
+    paths:
+        - src
+    excludePaths:
+        analyse:
+          - src/Generated

e2e/result-cache-scanned/src/Generated/Foo.php

@@ -0,0 +1,4 @@
+<?php
+namespace ResultCacheE2EGenerated;
+
+final class Foo {}

e2e/result-cache-scanned/src/testcase.php

@@ -0,0 +1,3 @@
+<?php
+
+$foo = new \ResultCacheE2EGenerated\Foo();

src/Analyser/ResultCache/ResultCacheManager.php

@@ -27,13 +27,15 @@
 use function array_filter;
 use function array_key_exists;
 use function array_keys;
+use function array_merge;
 use function array_unique;
 use function array_values;
 use function count;
 use function explode;
 use function get_loaded_extensions;
 use function implode;
 use function is_array;
+use function is_dir;
 use function is_file;
 use function ksort;
 use function microtime;
@@ -63,6 +65,7 @@ final class ResultCacheManager
 
 	/**
 	 * @param string[] $analysedPaths
+	 * @param string[] $analysedPathsFromConfig
 	 * @param string[] $composerAutoloaderProjectPaths
 	 * @param string[] $bootstrapFiles
 	 * @param string[] $scanFiles
@@ -78,6 +81,7 @@ public function __construct(
 		private FileHelper $fileHelper,
 		private string $cacheFilePath,
 		private array $analysedPaths,
+		private array $analysedPathsFromConfig,
 		private array $composerAutoloaderProjectPaths,
 		private string $usedLevel,
 		private ?string $cliAutoloadFile,
@@ -940,11 +944,23 @@ private function getFileHash(string $path): string
 	private function getScannedFiles(array $allAnalysedFiles): array
 	{
 		$scannedFiles = $this->scanFiles;
-		foreach ($this->scanFileFinder->findFiles($this->scanDirectories)->getFiles() as $file) {
-			$scannedFiles[] = $file;
+		$analysedDirectories = [];
+		foreach (array_merge($this->analysedPaths, $this->analysedPathsFromConfig) as $analysedPath) {
+			if (is_file($analysedPath)) {
+				continue;
+			}
+
+			if (!is_dir($analysedPath)) {
+				continue;
+			}
+
+			$analysedDirectories[] = $analysedPath;
 		}
 
-		$scannedFiles = array_unique($scannedFiles);
+		$directories = array_unique(array_merge($analysedDirectories, $this->scanDirectories));
+		foreach ($this->scanFileFinder->findFiles($directories)->getFiles() as $file) {
+			$scannedFiles[] = $file;
+		}
 
 		$hashes = [];
 		foreach (array_diff($scannedFiles, $allAnalysedFiles) as $file) {