Add getNamespaceSeparator() to NameInflector

lib/Adapter/Composer/ClassmapNameInflector.php

@@ -7,6 +7,8 @@
 
 final class ClassmapNameInflector implements NameInflector
 {
+    public const NAMESPACE_SEPARATOR = ClassName::DEFAULT_NAMESPACE_SEPARATOR;
+
     public function inflectToRelativePath(string $prefix, ClassName $className, string $mappedPath): FilePath
     {
         return FilePath::fromString($mappedPath);
@@ -16,4 +18,9 @@ public function inflectToClassName(FilePath $filePath, string $pathPrefix, strin
     {
         return ClassName::fromString($classPrefix);
     }
+
+    public function getNamespaceSeparator(): string
+    {
+        return self::NAMESPACE_SEPARATOR;
+    }
 }

lib/Adapter/Composer/ComposerClassToFile.php

@@ -25,8 +25,8 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates
     {
         $candidates = [];
         foreach ($this->getStrategies() as $strategy) {
-            list($prefixes, $inflector, $separator) = $strategy;
-            $this->resolveFile($candidates, $prefixes, $inflector, $className, $separator);
+            [$prefixes, $inflector] = $strategy;
+            $this->resolveFile($candidates, $prefixes, $inflector, $className);
         }
 
         // order with the longest prefixes first
@@ -48,28 +48,23 @@ private function getStrategies(): array
             [
                 $this->classLoader->getPrefixesPsr4(),
                 new Psr4NameInflector(),
-                Psr4NameInflector::NAMESPACE_SEPARATOR,
             ],
             [
                 $this->classLoader->getPrefixes(),
                 new Psr0NameInflector(),
-                Psr0NameInflector::NAMESPACE_SEPARATOR,
             ],
             [
                 $this->classLoader->getClassMap(),
                 new ClassmapNameInflector(),
-                Psr4NameInflector::NAMESPACE_SEPARATOR,
             ],
             [
                 $this->classLoader->getFallbackDirs(),
                 new Psr0NameInflector(),
-                Psr0NameInflector::NAMESPACE_SEPARATOR,
             ],
             [
                 $this->classLoader->getFallbackDirsPsr4(),
                 // PSR0 name inflector works here as there is no prefix
                 new Psr0NameInflector(),
-                Psr0NameInflector::NAMESPACE_SEPARATOR,
             ],
         ];
     }
@@ -78,10 +73,9 @@ private function resolveFile(
         &$candidates,
         array $prefixes,
         NameInflector $inflector,
-        ClassName $className,
-        string $separator
+        ClassName $className
     ): void {
-        $fileCandidates = $this->getFileCandidates($className, $prefixes, $separator);
+        $fileCandidates = $this->getFileCandidates($className, $prefixes, $inflector->getNamespaceSeparator());
 
         foreach ($fileCandidates as $prefix => $files) {
             $prefixCandidates = [];

lib/Adapter/Composer/NameInflector.php

@@ -10,4 +10,6 @@ interface NameInflector
     public function inflectToRelativePath(string $prefix, ClassName $className, string $mappedPath): FilePath;
 
     public function inflectToClassName(FilePath $filePath, string $pathPrefix, string $classPrefix): ClassName;
+
+    public function getNamespaceSeparator(): string;
 }

lib/Adapter/Composer/Psr0NameInflector.php

@@ -31,4 +31,9 @@ public function inflectToClassName(FilePath $filePath, string $pathPrefix, strin
 
         return ClassName::fromString($className);
     }
+
+    public function getNamespaceSeparator(): string
+    {
+        return self::NAMESPACE_SEPARATOR;
+    }
 }

lib/Adapter/Composer/Psr4NameInflector.php

@@ -30,4 +30,9 @@ public function inflectToClassName(FilePath $filePath, string $pathPrefix, strin
 
         return ClassName::fromString($className);
     }
+
+    public function getNamespaceSeparator(): string
+    {
+        return self::NAMESPACE_SEPARATOR;
+    }
 }