Merge pull request magento#21 from slavvka/fixes

Various fixes

Author: magterskine

src/ClassHierarchy/DependencyInspectionVisitor.php

@@ -164,7 +164,9 @@ private function fetchStmtsNodes(ClassLike $node): array
             if ($stmt instanceof ClassMethod) {
                 $methodList[$stmt->name] = $stmt;
             } elseif ($stmt instanceof Property) {
-                $propertyList[$stmt->name] = $stmt;
+                foreach ($stmt->props as $prop) {
+                    $propertyList[$prop->name] = $prop;
+                }
             }
         }
 

src/Console/Command/CompareSourceCommand.php

@@ -118,6 +118,15 @@ protected function execute(InputInterface $input, OutputInterface $cliOutput)
         $versionReport = $semanticVersionChecker->loadVersionReport();
         $changedFiles = $semanticVersionChecker->loadChangedFiles();
 
+        foreach ($changedFiles as &$file) {
+            if (substr($file, 0, strlen($sourceBeforeDir)) == $sourceBeforeDir) {
+                $file = substr($file, strlen($sourceBeforeDir));
+            } elseif (substr($file, 0, strlen($sourceAfterDir)) == $sourceAfterDir) {
+                $file = substr($file, strlen($sourceAfterDir));
+            }
+        }
+        $changedFiles = array_unique($changedFiles);
+
         // Log report output
         $logOutputStream = new StreamOutput(fopen($logOutputPath, 'w+'));
 
@@ -142,11 +151,6 @@ protected function execute(InputInterface $input, OutputInterface $cliOutput)
                     '<td><button class="btn-danger collapsible">Details</button><div class="content"><ul>'
                 );
                 foreach ($changedFiles as $file) {
-                    if (substr($file, 0, strlen($sourceBeforeDir)) == $sourceBeforeDir) {
-                        $file = substr($file, strlen($sourceBeforeDir));
-                    } elseif (substr($file, 0, strlen($sourceAfterDir)) == $sourceAfterDir) {
-                        $file = substr($file, strlen($sourceAfterDir));
-                    }
                     $logOutputStream->writeln('<li>' . $file . '</li>');
                 }
                 $logOutputStream->writeln('</ul></div></td></tr>');

src/DbSchemaReporter.php

@@ -25,6 +25,7 @@ public function output(OutputInterface $output)
 
         // custom report types
         $this->outputReport($output, $this->report, 'database');
+        $this->outputReport($output, $this->report, 'layout');
         $this->outputReport($output, $this->report, 'di');
         $this->outputReport($output, $this->report, 'system');
         $this->outputReport($output, $this->report, 'xsd');

src/Filter/SourceFilter.php

@@ -23,44 +23,22 @@ class SourceFilter
     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;
-            }
+            $hashedBefore[$this->getHash($fileBefore)] = $fileBefore;
         }
 
         $hashedAfter = [];
-        $jsonHashedAfter = [];
         foreach ($filesAfter as $fileAfter) {
-            if ($this->isJson($fileAfter)) {
-                $jsonHashedAfter[] = $fileAfter;
-            } else {
-                $hashedAfter[$this->getHash($fileAfter)] = $fileAfter;
-            }
+            $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);
+        $filesBefore = array_values(array_diff_key($hashedBefore, $intersection));
+        $filesAfter = array_values(array_diff_key($hashedAfter, $intersection));
 
         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.
      *

src/ReportBuilder.php

@@ -131,6 +131,11 @@ 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);
@@ -141,11 +146,6 @@ 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);
         }

src/Reporter/HtmlDbSchemaReporter.php

@@ -54,6 +54,7 @@ public function output(OutputInterface $output)
             'interface',
             'trait',
             'database',
+            'layout',
             'di',
             'system',
             'xsd',