Revert "Change cache key implementation"

This reverts commit 4e2384d.

Author: sebastianbergmann

src/StaticAnalysis/Cache.php

@@ -13,9 +13,9 @@
 use function file_get_contents;
 use function file_put_contents;
 use function filemtime;
+use function hash;
 use function is_file;
 use function serialize;
-use function str_replace;
 use function unserialize;
 use SebastianBergmann\CodeCoverage\Directory;
 
@@ -38,7 +38,7 @@ public function __construct(string $directory, bool $validate = true)
     {
         Directory::create($directory);
 
-        $this->directory = $directory . DIRECTORY_SEPARATOR;
+        $this->directory = $directory;
         $this->validate  = $validate;
     }
 
@@ -95,6 +95,6 @@ protected function write(string $filename, string $method, $data): void
 
     private function cacheFile(string $filename, string $method): string
     {
-        return $this->directory . str_replace([DIRECTORY_SEPARATOR, '.'], '_', $filename) . '_' . $method;
+        return $this->directory . DIRECTORY_SEPARATOR . hash('sha256', $filename . $method);
     }
 }

src/StaticAnalysis/CachingCoveredFileAnalyser.php

@@ -35,52 +35,52 @@ public function __construct(string $directory, CoveredFileAnalyser $coveredFileA
 
     public function classesIn(string $filename): array
     {
-        if ($this->has($filename, 'classes')) {
-            return $this->read($filename, 'classes');
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__);
         }
 
         $data = $this->coveredFileAnalyser->classesIn($filename);
 
-        $this->write($filename, 'classes', $data);
+        $this->write($filename, __METHOD__, $data);
 
         return $data;
     }
 
     public function traitsIn(string $filename): array
     {
-        if ($this->has($filename, 'traits')) {
-            return $this->read($filename, 'traits');
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__);
         }
 
         $data = $this->coveredFileAnalyser->traitsIn($filename);
 
-        $this->write($filename, 'traits', $data);
+        $this->write($filename, __METHOD__, $data);
 
         return $data;
     }
 
     public function functionsIn(string $filename): array
     {
-        if ($this->has($filename, 'functions')) {
-            return $this->read($filename, 'functions');
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__);
         }
 
         $data = $this->coveredFileAnalyser->functionsIn($filename);
 
-        $this->write($filename, 'functions', $data);
+        $this->write($filename, __METHOD__, $data);
 
         return $data;
     }
 
     public function linesOfCodeFor(string $filename): LinesOfCode
     {
-        if ($this->has($filename, 'linesOfCode')) {
-            return $this->read($filename, 'linesOfCode', [LinesOfCode::class]);
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__, [LinesOfCode::class]);
         }
 
         $data = $this->coveredFileAnalyser->linesOfCodeFor($filename);
 
-        $this->write($filename, 'linesOfCode', $data);
+        $this->write($filename, __METHOD__, $data);
 
         return $data;
     }
@@ -91,13 +91,13 @@ public function ignoredLinesFor(string $filename): array
             return $this->inMemoryCacheForIgnoredLines[$filename];
         }
 
-        if ($this->has($filename, 'ignoredLines')) {
-            return $this->read($filename, 'ignoredLines');
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__);
         }
 
         $this->inMemoryCacheForIgnoredLines[$filename] = $this->coveredFileAnalyser->ignoredLinesFor($filename);
 
-        $this->write($filename, 'ignoredLines', $this->inMemoryCacheForIgnoredLines[$filename]);
+        $this->write($filename, __METHOD__, $this->inMemoryCacheForIgnoredLines[$filename]);
 
         return $this->inMemoryCacheForIgnoredLines[$filename];
     }

src/StaticAnalysis/CachingUncoveredFileAnalyser.php

@@ -28,13 +28,13 @@ public function __construct(string $directory, UncoveredFileAnalyser $uncoveredF
 
     public function executableLinesIn(string $filename): array
     {
-        if ($this->has($filename, 'executableLines')) {
-            return $this->read($filename, 'executableLines');
+        if ($this->has($filename, __METHOD__)) {
+            return $this->read($filename, __METHOD__);
         }
 
         $data = $this->uncoveredFileAnalyser->executableLinesIn($filename);
 
-        $this->write($filename, 'executableLines', $data);
+        $this->write($filename, __METHOD__, $data);
 
         return $data;
     }