[Refactor] Re-use namespace wrapper (#717)

humbug · Nov 7, 2022 · a547797 · a547797
1 parent cabec44
commit a547797
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/src/Autoload/ScoperAutoloadGenerator.php b/src/Autoload/ScoperAutoloadGenerator.php
@@ -142,7 +142,7 @@ private static function createClassAliasStatementsSection(
         }
 
         if ($hasNamespacedFunctions) {
-            $statements = self::wrapStatementsInNamespaceBlock($statements);
+            $statements = self::wrapStatementsInNamespaceBlock('', $statements);
         }
 
         array_unshift($statements, self::CLASS_ALIASES_DOC);
@@ -183,7 +183,7 @@ private static function createClassAliasStatement(
      *
      * @return list<string>
      */
-    private static function wrapStatementsInNamespaceBlock(array $statements): array
+    private static function wrapStatementsInNamespaceBlock(string $namespace, array $statements): array
     {
         $indent = str_repeat(' ', 4);
         $indentLine = static fn (string $line) => $indent.$line;
@@ -200,7 +200,13 @@ static function (string $statement) use ($indentLine): string {
             $statements,
         );
 
-        array_unshift($statements, 'namespace {');
+        array_unshift(
+            $statements,
+            sprintf(
+                'namespace %s{',
+                '' === $namespace ? '' : $namespace.' ',
+            ),
+        );
         $statements[] = '}'.self::$eol;
 
         return $statements;
@@ -258,17 +264,22 @@ private static function createFunctionAliasStatement(
         $namespace = $originalFQ->slice(0, -1);
         $functionName = null === $namespace ? $original : (string) $originalFQ->slice(1);
 
-        return sprintf(
-            <<<'PHP'
-                namespace %s{
-                    if (!function_exists('%s')) { function %s(%s) { return \%s(...func_get_args()); } }
-                }
-                PHP,
-            null === $namespace ? '' : $namespace->toString().' ',
-            $original,
-            $functionName,
-            '__autoload' === $functionName ? '$className' : '',
-            $alias,
+        return implode(
+            self::$eol,
+            self::wrapStatementsInNamespaceBlock(
+                (string) $namespace,
+                [
+                    sprintf(
+                        <<<'PHP'
+                            if (!function_exists('%s')) { function %s(%s) { return \%s(...func_get_args()); } }
+                            PHP,
+                        $original,
+                        $functionName,
+                        '__autoload' === $functionName ? '$className' : '',
+                        $alias,
+                    ),
+                ],
+            ),
         );
     }
 

diff --git a/tests/Autoload/ScoperAutoloadGeneratorTest.php b/tests/Autoload/ScoperAutoloadGeneratorTest.php
@@ -128,9 +128,11 @@ public static function provideRegistry(): iterable
                 namespace Acme {
                     if (!function_exists('Acme\bar')) { function bar() { return \Humbug\Acme\bar(...func_get_args()); } }
                 }
+
                 namespace Acme {
                     if (!function_exists('Acme\foo')) { function foo() { return \Humbug\Acme\foo(...func_get_args()); } }
                 }
+
                 namespace Emca {
                     if (!function_exists('Emca\baz')) { function baz() { return \Humbug\Emca\baz(...func_get_args()); } }
                 }
@@ -166,9 +168,11 @@ public static function provideRegistry(): iterable
                 namespace Acme {
                     if (!function_exists('Acme\bar')) { function bar() { return \Humbug\Acme\bar(...func_get_args()); } }
                 }
+
                 namespace Acme {
                     if (!function_exists('Acme\foo')) { function foo() { return \Humbug\Acme\foo(...func_get_args()); } }
                 }
+
                 namespace Emca {
                     if (!function_exists('Emca\baz')) { function baz() { return \Humbug\Emca\baz(...func_get_args()); } }
                 }
@@ -272,15 +276,19 @@ public static function provideRegistry(): iterable
                 namespace Acme {
                     if (!function_exists('Acme\bar')) { function bar() { return \Humbug\Acme\bar(...func_get_args()); } }
                 }
+
                 namespace Acme {
                     if (!function_exists('Acme\foo')) { function foo() { return \Humbug\Acme\foo(...func_get_args()); } }
                 }
+
                 namespace Emca {
                     if (!function_exists('Emca\baz')) { function baz() { return \Humbug\Emca\baz(...func_get_args()); } }
                 }
+
                 namespace {
                     if (!function_exists('bar')) { function bar() { return \Humbug\bar(...func_get_args()); } }
                 }
+
                 namespace {
                     if (!function_exists('foo')) { function foo() { return \Humbug\foo(...func_get_args()); } }
                 }
@@ -341,6 +349,7 @@ public static function provideRegistry(): iterable
                 namespace Acme {
                     if (!function_exists('Acme\foo')) { function foo() { return \Humbug\Acme\foo(...func_get_args()); } }
                 }
+
                 namespace {
                     if (!function_exists('__autoload')) { function __autoload($className) { return \Humbug\__autoload(...func_get_args()); } }
                 }