Check if single level use statement is an aliased namespace, not simply a global namespace class (#50)

* Add failing test for aliased one-level NS

* Add new visitor

* CS fix

* Add new visitor to Scoper after move

Author: padraic

src/NodeVisitor/SingleLevelUseAliasVisitor.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <[email protected]>,
+ *                    Pádraic Brady <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Humbug\PhpScoper\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt\GroupUse;
+use PhpParser\Node\Stmt\UseUse;
+use PhpParser\NodeVisitorAbstract;
+
+final class SingleLevelUseAliasVisitor extends NodeVisitorAbstract
+{
+    /**
+     * @var string
+     */
+    private $prefix;
+
+    /**
+     * @var array
+     */
+    private $aliases;
+
+    public function __construct(string $prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function beforeTraverse(array $nodes)
+    {
+        $this->aliases = [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enterNode(Node $node)
+    {
+        /* Collate all single level aliases */
+        if ($node instanceof UseUse
+            && (!$node->hasAttribute('parent')
+            || false === ($node->getAttribute('parent') instanceof GroupUse))
+            && $this->prefix !== $node->name->getFirst()
+            && 1 === count($node->name->parts)
+            && $node->alias !== $node->name->getFirst()
+        ) {
+            $this->aliases[$node->alias] = $node;
+
+            return;
+        }
+
+        $this->scopeUseStmtIfUsedInAnyNameAsAliasedNamespace($node);
+    }
+
+    /**
+     * @param Node $node
+     */
+    private function scopeUseStmtIfUsedInAnyNameAsAliasedNamespace(Node $node)
+    {
+        if ($node instanceof Name
+            && 1 < count($node->parts)
+            && in_array($node->getFirst(), array_keys($this->aliases))
+        ) {
+            $nodeToPrefix = $this->aliases[$node->getFirst()];
+            $nodeToPrefix->name = Name::concat($this->prefix, $nodeToPrefix->name);
+            unset($this->aliases[$node->getFirst()]);
+        }
+    }
+}

src/Scoper/PhpScoper.php

@@ -19,6 +19,7 @@
 use Humbug\PhpScoper\NodeVisitor\IgnoreNamespaceScoperNodeVisitor;
 use Humbug\PhpScoper\NodeVisitor\NamespaceScoperNodeVisitor;
 use Humbug\PhpScoper\NodeVisitor\ParentNodeVisitor;
+use Humbug\PhpScoper\NodeVisitor\SingleLevelUseAliasVisitor;
 use Humbug\PhpScoper\NodeVisitor\UseNamespaceScoperNodeVisitor;
 use Humbug\PhpScoper\Scoper;
 use PhpParser\Error as PhpParserError;
@@ -71,6 +72,7 @@ private function createTraverser(string $prefix): NodeTraverserInterface
         $traverser = new NodeTraverser();
 
         $traverser->addVisitor(new ParentNodeVisitor());
+        $traverser->addVisitor(new SingleLevelUseAliasVisitor($prefix));
         $traverser->addVisitor(new IgnoreNamespaceScoperNodeVisitor());
         $traverser->addVisitor(new GroupUseNamespaceScoperNodeVisitor($prefix));
         $traverser->addVisitor(new NamespaceScoperNodeVisitor($prefix));

tests/Scoper/PhpScoperTest.php

@@ -781,6 +781,25 @@ function foo($bar) : Closure
 {
 }
 
+PHP
+        ];
+
+        yield '[Single part global namespace reference] an aliased root namespace' => [
+            <<<'PHP'
+<?php
+
+use Foo as Bar;
+new Bar\Baz();
+
+PHP
+            ,
+            'Humbug',
+            <<<'PHP'
+<?php
+
+use Humbug\Foo as Bar;
+new Bar\Baz();
+
 PHP
         ];
     }