Merge branch '9.2'

Author: sebastianbergmann

ChangeLog-10.1.md

@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [10.1.3] - 2023-MM-DD
+
+### Fixed
+
+* Static analysis cache keys do not include configuration settings that affect source code parsing
+
 ## [10.1.2] - 2023-05-22
 
 ### Fixed
@@ -24,6 +30,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * The `SebastianBergmann\CodeCoverage\Filter::includeDirectory()`, `SebastianBergmann\CodeCoverage\Filter::excludeDirectory()`, and `SebastianBergmann\CodeCoverage\Filter::excludeFile()` methods are now deprecated
 
+[10.1.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.2...10.1
 [10.1.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.1...10.1.2
 [10.1.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.0...10.1.1
 [10.1.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/10.0.2...10.1.0

src/CodeCoverage.php

@@ -599,7 +599,9 @@ private function analyser(): FileAnalyser
         if ($this->cachesStaticAnalysis()) {
             $this->analyser = new CachingFileAnalyser(
                 $this->cacheDirectory,
-                $this->analyser
+                $this->analyser,
+                $this->useAnnotationsForIgnoringCode,
+                $this->ignoreDeprecatedCode
             );
         }
 

src/StaticAnalysis/CacheWarmer.php

@@ -20,7 +20,9 @@ public function warmCache(string $cacheDirectory, bool $useAnnotationsForIgnorin
             new ParsingFileAnalyser(
                 $useAnnotationsForIgnoringCode,
                 $ignoreDeprecatedCode
-            )
+            ),
+            $useAnnotationsForIgnoringCode,
+            $ignoreDeprecatedCode,
         );
 
         foreach ($filter->files() as $file) {

src/StaticAnalysis/CachingFileAnalyser.php

@@ -27,16 +27,20 @@
 final class CachingFileAnalyser implements FileAnalyser
 {
     private static ?string $cacheVersion = null;
+    private readonly string $directory;
     private readonly FileAnalyser $analyser;
+    private readonly bool $useAnnotationsForIgnoringCode;
+    private readonly bool $ignoreDeprecatedCode;
     private array $cache = [];
-    private readonly string $directory;
 
-    public function __construct(string $directory, FileAnalyser $analyser)
+    public function __construct(string $directory, FileAnalyser $analyser, bool $useAnnotationsForIgnoringCode, bool $ignoreDeprecatedCode)
     {
         Filesystem::createDirectory($directory);
 
-        $this->analyser  = $analyser;
-        $this->directory = $directory;
+        $this->analyser                      = $analyser;
+        $this->directory                     = $directory;
+        $this->useAnnotationsForIgnoringCode = $useAnnotationsForIgnoringCode;
+        $this->ignoreDeprecatedCode          = $ignoreDeprecatedCode;
     }
 
     public function classesIn(string $filename): array
@@ -142,7 +146,20 @@ private function write(string $filename, array $data): void
 
     private function cacheFile(string $filename): string
     {
-        return $this->directory . DIRECTORY_SEPARATOR . md5($filename . "\0" . file_get_contents($filename) . "\0" . self::cacheVersion());
+        $cacheKey = md5(
+            implode(
+                "\0",
+                [
+                    $filename,
+                    file_get_contents($filename),
+                    self::cacheVersion(),
+                    $this->useAnnotationsForIgnoringCode,
+                    $this->ignoreDeprecatedCode,
+                ]
+            )
+        );
+
+        return $this->directory . DIRECTORY_SEPARATOR . $cacheKey;
     }
 
     private static function cacheVersion(): string