Improve classify namespaces

AlexMasterov · Jul 18, 2017 · d728581 · d728581
1 parent 5ed46de
commit d728581
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/DependencyInjection/Compiler/SetVariablePass.php b/src/DependencyInjection/Compiler/SetVariablePass.php
@@ -61,9 +61,11 @@ private function mergeScopeVariables(array $calls, array $variables): array
 
     private function scopeVariables(array $services): array
     {
-        // NameSpace\SomeName -> nameSpaceSomename
+        // NameSpace\SomeName -> nameSpaceSomeName
         $classify = static function (string $spec): string {
-            return \str_replace('\\', '', \lcfirst(\ucwords(\strtolower($spec), '\\')));
+            $parts = \explode('\\', $spec);
+            empty($parts[1]) ?: $parts[0] = \strtolower($parts[0]);
+            return \implode($parts);
         };
 
         $scopeVariables = [];

diff --git a/tests/DependencyInjection/Compiler/SetVariablePassTest.php b/tests/DependencyInjection/Compiler/SetVariablePassTest.php
@@ -15,8 +15,8 @@ public function scopeVariables(): array
     {
         return [
             ['test',          stdClass::class, 'test'],
-            [stdClass::class, stdClass::class, 'stdclass'],
-            [TestCase::class, stdClass::class, 'phpunitFrameworkTestcase'],
+            [stdClass::class, stdClass::class, 'stdClass'],
+            [TestCase::class, stdClass::class, 'phpunitFrameworkTestCase'],
         ];
     }