does not discard inferior prefix lengths and orders candidates by prefix

length

Author: dantleech

lib/Adapter/Composer/ComposerClassToFile.php

@@ -36,6 +36,16 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates
             $this->resolveFile($candidates, $prefixes, $inflector, $className);
         }
 
+        // order with the longest prefixes first
+        uksort($candidates, function ($prefix1, $prefix2) {
+            return strlen($prefix2) <=> strlen($prefix1);
+        });
+
+        // flatten to a single array
+        $candidates = array_reduce($candidates, function ($candidates, $paths) {
+            return array_merge($candidates, $paths);
+        }, []);
+
         return FilePathCandidates::fromFilePaths($candidates);
     }
 
@@ -68,49 +78,55 @@ private function getStrategies(): array
 
     private function resolveFile(&$candidates, array $prefixes, NameInflector $inflector, ClassName $className)
     {
-        list($prefix, $files) = $this->getFileCandidates($className, $prefixes);
+        $fileCandidates = $this->getFileCandidates($className, $prefixes);
+
+        foreach ($fileCandidates as $prefix => $files) {
+            $prefixCandidates = [];
+            foreach ($files as $file) {
+                $prefixCandidates[] = $inflector->inflectToRelativePath($prefix, $className, $file);
+            }
+
+            if (!isset($candidates[$prefix])) {
+                $candidates[$prefix] = [];
+            }
 
-        foreach ($files as $file) {
-            $candidates[] = $inflector->inflectToRelativePath($prefix, $className, $file);
+            $candidates[$prefix] = array_merge($candidates[$prefix], $prefixCandidates);
         }
     }
 
     private function getFileCandidates(ClassName $className, array $prefixes)
     {
-        $bestFiles = [null, []];
-        $bestLength = 0;
+        $candidates = [];
 
-        foreach ($prefixes as $prefix => $files) {
-            $files = (array) $files;
-            $files = array_map(function ($file) {
-                if (!file_exists($file)) {
+        foreach ($prefixes as $prefix => $paths) {
+            $paths = (array) $paths;
+            $paths = array_map(function ($path) {
+                if (!file_exists($path)) {
                     $this->logger->warning(sprintf(
-                        'Composer mapped directory "%s" does not exist', $file
+                        'Composer mapped path "%s" does not exist', $path
                     ));
 
-                    return $file;
+                    return $path;
                 }
 
-                return realpath($file);
-            }, $files);
+                return realpath($path);
+            }, $paths);
 
-            if (empty($prefix) || $className->beginsWith($prefix)) {
-                $length = strlen($prefix);
+            if (is_int($prefix)) {
+                $prefix = '';
+            }
 
-                if ($length > $bestLength) {
-                    $bestFiles = array($prefix, $files);
-                    $bestLength = $length;
-                }
+            if ($prefix && false === $className->beginsWith($prefix)) {
+                continue;
+            }
+
+            if (!isset($candidates[$prefix])) {
+                $candidates[$prefix] = [];
             }
-        }
 
-        if (empty($bestFiles)) {
-            throw new \RuntimeException(sprintf(
-                'Could not find matching prefix for class name "%s", is it correctly defined in your composer file?',
-                (string) $className
-            ));
+            $candidates[$prefix] = array_merge($candidates[$prefix], $paths);
         }
 
-        return $bestFiles;
+        return $candidates;
     }
 }

tests/Integration/Composer/ComposerClassToFileTest.php

@@ -51,10 +51,14 @@ public function testPsr4Dev()
     /**
      * @testdox PSR-4 multiple matching prefixes
      */
-    public function testPsr4MultipleMatches()
+    public function testPsr4MultipleMatchesLongestPrefixesFirst()
     {
         $this->loadExample('psr4-multiple-matching-prefixes.json');
-        $this->assertClassNameToFilePath('Acme\\Test\\Foo\\Bar\\Class', ['psr4/tests/Class.php']);
+        $this->assertClassNameToFilePath('Acme\\Test\\Foo\\Bar\\Class', [
+            'psr4/tests/Class.php',
+            'psr4/tests/foo/Bar/Class.php',
+            'psr4/Foo/Bar/Class.php'
+        ]);
     }
 
     /**
@@ -81,7 +85,10 @@ public function testPsr0()
     public function testPsr0AndPsr4()
     {
         $this->loadExample('psr0-psr4.json');
-        $this->assertClassNameToFilePath('Acme\\Test\\Class', ['psr4/Class.php', 'psr0/Acme/Test/Class.php']);
+        $this->assertClassNameToFilePath('Acme\\Test\\Class', [
+            'psr4/Class.php',
+            'psr0/Acme/Test/Class.php'
+        ]);
     }
 
     /**
@@ -136,7 +143,7 @@ public function testClassmap()
     public function testIgnoresInvalidDirs()
     {
         $this->loadExample('invalid-dir.json');
-        $this->logger->warning(Argument::containingString('Composer mapped directory'))->shouldBeCalledTimes(1);
+        $this->logger->warning(Argument::containingString('Composer mapped path'))->shouldBeCalledTimes(1);
 
         $this->assertClassNameToFilePath(
             'Acme\\Foo\\Generator',