Add unit tests and restore alias usage

code-lts · Jan 6, 2021 · c25eeae · c25eeae
1 parent c8834c9
commit c25eeae
Show file tree

Hide file tree

Showing 5 changed files with 367 additions and 106 deletions.
diff --git a/src/Parser/DocBlockParser.php b/src/Parser/DocBlockParser.php
@@ -41,7 +41,7 @@ public function parse(?string $comment, ParserContext $context): DocBlockNode
             $factory  = DocBlockFactory::createInstance();
             $docBlockContext = new Context(
                 $context->getNamespace() ?? '',
-                $context->getImports() ?: []
+                $context->getAliases() ?: []
             );
             $docBlock = $factory->create($comment, $docBlockContext);
         } catch (\Exception $e) {

diff --git a/src/Parser/NodeVisitor.php b/src/Parser/NodeVisitor.php
@@ -85,11 +85,9 @@ public function leaveNode(AbstractNode $node)
     protected function addAliases(UseNode $node)
     {
         foreach ($node->uses as $use) {
-            $alias = $use->alias !== null ? $use->alias->__toString() : null;
+            $alias = $use->getAlias()->toString();
             $fullName = $use->name->__toString();
             $this->context->addAlias($alias, $fullName);
-            $alias = $alias ?? $use->getAlias()->toString();
-            $this->context->addImport($alias, $fullName);
         }
     }
 

diff --git a/src/Parser/ParserContext.php b/src/Parser/ParserContext.php
@@ -26,7 +26,6 @@ class ParserContext
     /** @var string|null */
     protected $namespace;
     protected $aliases;
-    protected $imports = [];
     protected $class;
     /** @var string|null */
     protected $file;
@@ -76,16 +75,6 @@ public function getAliases()
         return $this->aliases;
     }
 
-    public function addImport(string $alias, string $name): void
-    {
-        $this->imports[$alias] = $name;
-    }
-
-    public function getImports()
-    {
-        return $this->imports;
-    }
-
     public function enterFile($file, $hash): void
     {
         $this->file = $file;