Merge branch '9.2'

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -54,7 +54,9 @@
                 'yield',
             ],
         ],
-        'braces' => true,
+        'braces' => [
+            'position_after_anonymous_constructs' => 'next',
+        ],
         'cast_spaces' => true,
         'class_attributes_separation' => [
             'elements' => [

ChangeLog.md

@@ -16,6 +16,10 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 ## [9.2.12] - 2022-MM-DD
 
+### Changed
+
+* [#898](https://github.com/sebastianbergmann/php-code-coverage/pull/898): Use content hash instead of `filemtime()` to determine cache hit/miss
+
 ### Fixed
 
 * [#736](https://github.com/sebastianbergmann/php-code-coverage/issues/736): HTML report generator allows invalid values for low upper bound and high lower bound

src/Node/File.php

@@ -502,7 +502,8 @@ private function processFunctions(array $functions): void
                 $this->functions[$functionName]['executedBranches'] = count(
                     array_filter(
                         $this->functionCoverageData[$functionName]['branches'],
-                        static function (array $branch) {
+                        static function (array $branch)
+                        {
                             return (bool) $branch['hit'];
                         }
                     )
@@ -517,7 +518,8 @@ static function (array $branch) {
                 $this->functions[$functionName]['executedPaths'] = count(
                     array_filter(
                         $this->functionCoverageData[$functionName]['paths'],
-                        static function (array $path) {
+                        static function (array $path)
+                        {
                             return (bool) $path['hit'];
                         }
                     )
@@ -561,7 +563,8 @@ private function newMethod(string $className, string $methodName, array $method,
             $methodData['executedBranches'] = count(
                 array_filter(
                     $this->functionCoverageData[$key]['branches'],
-                    static function (array $branch) {
+                    static function (array $branch)
+                    {
                         return (bool) $branch['hit'];
                     }
                 )
@@ -576,7 +579,8 @@ static function (array $branch) {
             $methodData['executedPaths'] = count(
                 array_filter(
                     $this->functionCoverageData[$key]['paths'],
-                    static function (array $path) {
+                    static function (array $path)
+                    {
                         return (bool) $path['hit'];
                     }
                 )

src/StaticAnalysis/CachingFileAnalyser.php

@@ -9,6 +9,11 @@
  */
 namespace SebastianBergmann\CodeCoverage\StaticAnalysis;
 
+use function crc32;
+use function file_get_contents;
+use function file_put_contents;
+use function is_file;
+use function serialize;
 use SebastianBergmann\CodeCoverage\Directory;
 
 /**
@@ -91,8 +96,10 @@ public function ignoredLinesFor(string $filename): array
 
     public function process(string $filename): void
     {
-        if ($this->has($filename)) {
-            $this->cache[$filename] = $this->read($filename);
+        $cache = $this->read($filename);
+
+        if ($cache !== false) {
+            $this->cache[$filename] = $cache;
 
             return;
         }
@@ -109,26 +116,20 @@ public function process(string $filename): void
         $this->write($filename, $this->cache[$filename]);
     }
 
-    private function has(string $filename): bool
+    /**
+     * @return mixed
+     */
+    private function read(string $filename): array|false
     {
         $cacheFile = $this->cacheFile($filename);
 
         if (!is_file($cacheFile)) {
             return false;
         }
 
-        if (filemtime($cacheFile) < filemtime($filename)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private function read(string $filename): array
-    {
         return unserialize(
             file_get_contents(
-                $this->cacheFile($filename)
+                $cacheFile
             ),
             ['allowed_classes' => false]
         );
@@ -144,6 +145,6 @@ private function write(string $filename, array $data): void
 
     private function cacheFile(string $filename): string
     {
-        return $this->directory . DIRECTORY_SEPARATOR . hash('sha256', $filename . self::CACHE_FORMAT_VERSION);
+        return $this->directory . DIRECTORY_SEPARATOR . hash('sha256', $filename . crc32(file_get_contents($filename)) . self::CACHE_FORMAT_VERSION);
     }
 }