Merge pull request #8 from greg0ire/nested-directories

Sort candidates by file path length

Author: dantleech

lib/Adapter/Composer/ComposerFileToClass.php

@@ -103,6 +103,10 @@ private function populateCandidates(FilePath $filePath, array $prefixes)
             }
         }
 
+        usort($candidates, function (array $leftCandidate, array $rightCandidate): int {
+            return strlen($rightCandidate[0]) <=> strlen($leftCandidate[0]);
+        });
+
         return $candidates;
     }
 }

tests/Integration/Composer/ComposerFileToClassTest.php

@@ -107,6 +107,16 @@ public function testPsr4Fallback()
         ]);
     }
 
+    public function testNestedPsr4Directories()
+    {
+        $this->loadExample('psr4-nested.json');
+        $this->assertFilePathToClassName('/psr4/AppBundle/Foo.php', [
+            'AppBundle\\Foo',
+            'App\\AppBundle\\Foo'
+        ]);
+    }
+
+
     /**
      * @testdox Loads from classmap
      */

tests/Integration/Composer/composers/psr4-nested.json

@@ -0,0 +1,16 @@
+{
+    "name": "dantleech/basic",
+    "authors": [
+        {
+            "name": "dantleech",
+            "email": "dan.t.leech@gmail.com"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "App\\": "psr4/",
+            "AppBundle\\": "psr4/AppBundle/"
+        }
+    }
+}