Remove FileAnalyser::hash() as it is specific to the CachingFileAnalyser

Author: sebastianbergmann

src/StaticAnalysis/CachingFileAnalyser.php

@@ -41,15 +41,6 @@ public function __construct(string $directory, FileAnalyser $analyser)
         $this->directory = $directory;
     }
 
-    public function hash(string $filename): int
-    {
-        if (!isset($this->cache[$filename])) {
-            $this->process($filename);
-        }
-
-        return $this->cache[$filename]['hash'];
-    }
-
     public function classesIn(string $filename): array
     {
         if (!isset($this->cache[$filename])) {
@@ -109,18 +100,18 @@ public function ignoredLinesFor(string $filename): array
 
     public function process(string $filename): void
     {
-        if (false !== ($cache = $this->read($filename))) {
-            $hash = ParsingFileAnalyser::computeHashForSource(file_get_contents($filename));
+        $cache = $this->read($filename);
+        $hash  = crc32(file_get_contents($filename));
 
-            if ($hash === $cache['hash']) {
-                $this->cache[$filename] = $cache;
+        if ($cache !== false &&
+            $hash === $cache['hash']) {
+            $this->cache[$filename] = $cache;
 
-                return;
-            }
+            return;
         }
 
         $this->cache[$filename] = [
-            'hash'              => $this->analyser->hash($filename),
+            'hash'              => $hash,
             'classesIn'         => $this->analyser->classesIn($filename),
             'traitsIn'          => $this->analyser->traitsIn($filename),
             'functionsIn'       => $this->analyser->functionsIn($filename),

src/StaticAnalysis/FileAnalyser.php

@@ -14,8 +14,6 @@
  */
 interface FileAnalyser
 {
-    public function hash(string $filename): int;
-
     public function classesIn(string $filename): array;
 
     public function traitsIn(string $filename): array;

src/StaticAnalysis/ParsingFileAnalyser.php

@@ -31,11 +31,6 @@
  */
 final class ParsingFileAnalyser implements FileAnalyser
 {
-    /**
-     * @var array
-     */
-    private $hash = [];
-
     /**
      * @var array
      */
@@ -76,24 +71,12 @@ final class ParsingFileAnalyser implements FileAnalyser
      */
     private $ignoreDeprecatedCode;
 
-    public static function computeHashForSource(string $source): int
-    {
-        return crc32($source);
-    }
-
     public function __construct(bool $useAnnotationsForIgnoringCode, bool $ignoreDeprecatedCode)
     {
         $this->useAnnotationsForIgnoringCode = $useAnnotationsForIgnoringCode;
         $this->ignoreDeprecatedCode          = $ignoreDeprecatedCode;
     }
 
-    public function hash(string $filename): int
-    {
-        $this->analyse($filename);
-
-        return $this->hash[$filename];
-    }
-
     public function classesIn(string $filename): array
     {
         $this->analyse($filename);
@@ -194,7 +177,6 @@ private function analyse(string $filename): void
         }
         // @codeCoverageIgnoreEnd
 
-        $this->hash[$filename]            = self::computeHashForSource($source);
         $this->classes[$filename]         = $codeUnitFindingVisitor->classes();
         $this->traits[$filename]          = $codeUnitFindingVisitor->traits();
         $this->functions[$filename]       = $codeUnitFindingVisitor->functions();