Fixed Unit tests

Author: slavvka

src/Filter/SourceWithJsonFilter.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SemanticVersionChecker\Filter;
+
+/**
+ * Filter Implementation to remove not changed files from the file list.
+ */
+class SourceWithJsonFilter
+{
+    /**
+     * Filters unchanged files
+     *
+     * @param array $filesBefore
+     * @param array $filesAfter
+     *
+     * @return int
+     */
+    public function filter(array &$filesBefore, array &$filesAfter): int
+    {
+        $hashedBefore = [];
+        $jsonHashedBefore = [];
+        foreach ($filesBefore as $fileBefore) {
+            if ($this->isJson($fileBefore)) {
+                $jsonHashedBefore[] = $fileBefore;
+            } else {
+                $hashedBefore[$this->getHash($fileBefore)] = $fileBefore;
+            }
+        }
+
+        $hashedAfter = [];
+        $jsonHashedAfter = [];
+        foreach ($filesAfter as $fileAfter) {
+            if ($this->isJson($fileAfter)) {
+                $jsonHashedAfter[] = $fileAfter;
+            } else {
+                $hashedAfter[$this->getHash($fileAfter)] = $fileAfter;
+            }
+        }
+
+        $intersection = array_intersect_key($hashedBefore, $hashedAfter);
+        $filesBefore = array_merge(array_values(array_diff_key($hashedBefore, $intersection)), $jsonHashedBefore);
+        $filesAfter = array_merge(array_values(array_diff_key($hashedAfter, $intersection)), $jsonHashedAfter);
+
+        return count($intersection);
+    }
+
+    /**
+     * Checks if file has JSON extension
+     *
+     * @param string $file
+     *
+     * @return bool
+     */
+    private function isJson(string $file): bool
+    {
+        return (bool)preg_match('/^.*.json/', $file);
+    }
+
+    /**
+     * Returns the an sha1 file hash to filter not changed files.
+     *
+     * @param string $fileName
+     * @return string
+     */
+    private function getHash(string $fileName): string
+    {
+        // for xml we need to cache also the parts of dirname if move a xml than it should be also marked as change.
+        if (preg_match('/^.*.xml$/', $fileName)) {
+            $path = basename(pathinfo($fileName, PATHINFO_DIRNAME));
+            return sha1(file_get_contents($fileName).$path);
+        }
+
+        return sha1_file($fileName);
+    }
+}

src/Helper/ClassParser.php

@@ -333,7 +333,7 @@ public function getFullyQualifiedName(string $alias): string
     private function retrieveFilePath($namespace)
     {
         // Concession to SVC unit testing; test classes do not exist in the normal source paths
-        $testDirPath = 'SemanticVersionChecker' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR;
+        $testDirPath = 'tests' . DIRECTORY_SEPARATOR . 'Unit' . DIRECTORY_SEPARATOR;
         if (strpos($this->filePath, $testDirPath) !== false) {
             $testSourceDir = substr($this->filePath, 0, strrpos($this->filePath, DIRECTORY_SEPARATOR));
             $fileName = substr($namespace, strrpos($namespace, '\\') ?: 0) . '.php';

src/ReportBuilder.php

@@ -20,7 +20,7 @@
 use Magento\SemanticVersionChecker\ClassHierarchy\StaticAnalyzerFactory;
 use Magento\SemanticVersionChecker\Analyzer\Factory\LessAnalyzerFactory;
 use Magento\SemanticVersionChecker\Filter\FilePatternFilter;
-use Magento\SemanticVersionChecker\Filter\SourceFilter;
+use Magento\SemanticVersionChecker\Filter\SourceWithJsonFilter;
 use Magento\SemanticVersionChecker\Finder\FinderDecoratorFactory;
 use Magento\SemanticVersionChecker\Scanner\ScannerRegistryFactory;
 use PHPSemVerChecker\Configuration\LevelMapping;
@@ -131,11 +131,6 @@ protected function buildReport()
         $sourceBeforeFiles      = $fileIterator->findFromString($this->sourceBeforeDir, '', '');
         $sourceAfterFiles       = $fileIterator->findFromString($this->sourceAfterDir, '', '');
 
-        foreach ($this->getFilters($this->sourceBeforeDir, $this->sourceAfterDir) as $filter) {
-            // filters modify arrays by reference
-            $filter->filter($sourceBeforeFiles, $sourceAfterFiles);
-        }
-
         //let static analyzer build a complete dependency graph
         $staticAnalyzer = (new StaticAnalyzerFactory())->create();
         $staticAnalyzer->analyse($sourceBeforeFiles);
@@ -146,6 +141,11 @@ protected function buildReport()
         $scannerBefore          = new ScannerRegistry($scannerRegistryFactory->create($dependencyMap));
         $scannerAfter           = new ScannerRegistry($scannerRegistryFactory->create($dependencyMap));
 
+        foreach ($this->getFilters($this->sourceBeforeDir, $this->sourceAfterDir) as $filter) {
+            // filters modify arrays by reference
+            $filter->filter($sourceBeforeFiles, $sourceAfterFiles);
+        }
+
         foreach ($sourceBeforeFiles as $file) {
             $scannerBefore->scanFile($file);
         }
@@ -190,8 +190,8 @@ protected function buildReport()
     protected function getFilters($sourceBeforeDir, $sourceAfterDir): array
     {
         $filters = [
-            // always filter out files that are identical before and after
-            new SourceFilter(),
+            // always filter out files that are identical before and after except for JSON :facepalm:
+            new SourceWithJsonFilter(),
             // process the include and exclude patterns
             new FilePatternFilter(
                 $this->includePatternsPath,