Analyser: more specific path has dev/prod mark priority (#142)

Author: janedbal

src/Analyser.php

@@ -13,6 +13,7 @@
 use ReflectionFunction;
 use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
 use ShipMonk\ComposerDependencyAnalyser\Config\ErrorType;
+use ShipMonk\ComposerDependencyAnalyser\Config\PathToScan;
 use ShipMonk\ComposerDependencyAnalyser\Exception\InvalidPathException;
 use ShipMonk\ComposerDependencyAnalyser\Result\AnalysisResult;
 use ShipMonk\ComposerDependencyAnalyser\Result\SymbolUsage;
@@ -37,6 +38,7 @@
 use function strtolower;
 use function substr;
 use function trim;
+use function usort;
 use const DIRECTORY_SEPARATOR;
 
 class Analyser
@@ -279,7 +281,12 @@ private function getUniqueFilePathsToScan(): array
     {
         $allFilePaths = [];
 
-        foreach ($this->config->getPathsToScan() as $scanPath) {
+        $scanPaths = $this->config->getPathsToScan();
+        usort($scanPaths, static function (PathToScan $a, PathToScan $b): int {
+            return strlen($a->getPath()) <=> strlen($b->getPath());
+        });
+
+        foreach ($scanPaths as $scanPath) {
             foreach ($this->listPhpFilesIn($scanPath->getPath()) as $filePath) {
                 if ($this->config->isExcludedFilepath($filePath)) {
                     continue;

tests/AnalyserTest.php

@@ -534,6 +534,33 @@ public function testDevPathInsideProdPath(): void
         $this->assertResultsWithoutUsages($this->createAnalysisResult(2, []), $result);
     }
 
+    public function testProdPathInsideDevPath(): void
+    {
+        $vendorDir = realpath(__DIR__ . '/data/autoloaded/vendor');
+        $devPath = realpath(__DIR__ . '/data/not-autoloaded/prod-in-subdirectory');
+        $prodPath = realpath(__DIR__ . '/data/not-autoloaded/prod-in-subdirectory/prod');
+        self::assertNotFalse($vendorDir);
+        self::assertNotFalse($devPath);
+        self::assertNotFalse($prodPath);
+
+        $config = new Configuration();
+        $config->addPathToScan($prodPath, false);
+        $config->addPathToScan($devPath, true);
+
+        $detector = new Analyser(
+            $this->getStopwatchMock(),
+            [$vendorDir => $this->getClassLoaderMock()],
+            $config,
+            [
+                'regular/package' => false,
+                'dev/package' => true,
+            ]
+        );
+        $result = $detector->run();
+
+        $this->assertResultsWithoutUsages($this->createAnalysisResult(2, []), $result);
+    }
+
     public function testOtherSymbols(): void
     {
         require_once __DIR__ . '/data/not-autoloaded/other-symbols/symbol-declaration.php';
@@ -703,13 +730,13 @@ private function getClassLoaderMock(): ClassLoader
 
     private function assertResultsWithoutUsages(AnalysisResult $expectedResult, AnalysisResult $result): void
     {
-        self::assertSame($expectedResult->getScannedFilesCount(), $result->getScannedFilesCount());
-        self::assertEquals($expectedResult->getUnusedIgnores(), $result->getUnusedIgnores());
-        self::assertEquals($expectedResult->getUnknownClassErrors(), $result->getUnknownClassErrors());
-        self::assertEquals($expectedResult->getShadowDependencyErrors(), $result->getShadowDependencyErrors());
-        self::assertEquals($expectedResult->getDevDependencyInProductionErrors(), $result->getDevDependencyInProductionErrors());
-        self::assertEquals($expectedResult->getProdDependencyOnlyInDevErrors(), $result->getProdDependencyOnlyInDevErrors());
-        self::assertEquals($expectedResult->getUnusedDependencyErrors(), $result->getUnusedDependencyErrors());
+        self::assertSame($expectedResult->getScannedFilesCount(), $result->getScannedFilesCount(), 'Scanned files count mismatch');
+        self::assertEquals($expectedResult->getUnusedIgnores(), $result->getUnusedIgnores(), 'Unused ignores mismatch');
+        self::assertEquals($expectedResult->getUnknownClassErrors(), $result->getUnknownClassErrors(), 'Unknown class mismatch');
+        self::assertEquals($expectedResult->getShadowDependencyErrors(), $result->getShadowDependencyErrors(), 'Shadow dependency mismatch');
+        self::assertEquals($expectedResult->getDevDependencyInProductionErrors(), $result->getDevDependencyInProductionErrors(), 'Dev dependency in production mismatch');
+        self::assertEquals($expectedResult->getProdDependencyOnlyInDevErrors(), $result->getProdDependencyOnlyInDevErrors(), 'Prod dependency only in dev mismatch');
+        self::assertEquals($expectedResult->getUnusedDependencyErrors(), $result->getUnusedDependencyErrors(), 'Unused dependency mismatch');
     }
 
 }

tests/data/not-autoloaded/prod-in-subdirectory/dev-file.php

@@ -0,0 +1,3 @@
+<?php
+
+\Dev\Package\Clazz::class;

tests/data/not-autoloaded/prod-in-subdirectory/prod/prod-file.php

@@ -0,0 +1,3 @@
+<?php
+
+\Regular\Package\Clazz::class;