Merge pull request #77 from piku235/issue76

Fix invalid namespace aliases

Author: jaapio

src/Types/ContextFactory.php

@@ -248,7 +248,7 @@ private function extractUseStatements(ArrayIterator $tokens) : array
         $extractedUseStatements = [];
         $groupedNs              = '';
         $currentNs              = '';
-        $currentAlias           = null;
+        $currentAlias           = '';
         $state                  = 'start';
 
         while ($tokens->valid()) {
@@ -261,6 +261,7 @@ private function extractUseStatements(ArrayIterator $tokens) : array
                         case T_STRING:
                         case T_NS_SEPARATOR:
                             $currentNs .= $tokenValue;
+                            $currentAlias = $tokenValue;
                             break;
                         case T_CURLY_OPEN:
                         case '{':
@@ -281,7 +282,7 @@ private function extractUseStatements(ArrayIterator $tokens) : array
                 case 'start-alias':
                     switch ($tokenId) {
                         case T_STRING:
-                            $currentAlias .= $tokenValue;
+                            $currentAlias = $tokenValue;
                             break;
                         case self::T_LITERAL_USE_SEPARATOR:
                         case self::T_LITERAL_END_OF_USE:
@@ -296,15 +297,16 @@ private function extractUseStatements(ArrayIterator $tokens) : array
                         case T_STRING:
                         case T_NS_SEPARATOR:
                             $currentNs .= $tokenValue;
+                            $currentAlias = $tokenValue;
                             break;
                         case T_AS:
                             $state = 'grouped-alias';
                             break;
                         case self::T_LITERAL_USE_SEPARATOR:
-                            $state                                               = 'grouped';
-                            $extractedUseStatements[$currentAlias ?: $currentNs] = $currentNs;
-                            $currentNs                                           = $groupedNs;
-                            $currentAlias                                        = null;
+                            $state                                 = 'grouped';
+                            $extractedUseStatements[$currentAlias] = $currentNs;
+                            $currentNs                             = $groupedNs;
+                            $currentAlias                          = '';
                             break;
                         case self::T_LITERAL_END_OF_USE:
                             $state = 'end';
@@ -316,13 +318,13 @@ private function extractUseStatements(ArrayIterator $tokens) : array
                 case 'grouped-alias':
                     switch ($tokenId) {
                         case T_STRING:
-                            $currentAlias .= $tokenValue;
+                            $currentAlias = $tokenValue;
                             break;
                         case self::T_LITERAL_USE_SEPARATOR:
-                            $state                                               = 'grouped';
-                            $extractedUseStatements[$currentAlias ?: $currentNs] = $currentNs;
-                            $currentNs                                           = $groupedNs;
-                            $currentAlias                                        = null;
+                            $state                                 = 'grouped';
+                            $extractedUseStatements[$currentAlias] = $currentNs;
+                            $currentNs                             = $groupedNs;
+                            $currentAlias                          = '';
                             break;
                         case self::T_LITERAL_END_OF_USE:
                             $state = 'end';
@@ -340,7 +342,7 @@ private function extractUseStatements(ArrayIterator $tokens) : array
         }
 
         if ($groupedNs !== $currentNs) {
-            $extractedUseStatements[$currentAlias ?: $currentNs] = $currentNs;
+            $extractedUseStatements[$currentAlias] = $currentNs;
         }
 
         return $extractedUseStatements;

tests/unit/Types/ContextFactoryTest.php

@@ -49,25 +49,9 @@ public function testReadsNamespaceFromClassReflection() : void
         public function testReadsAliasesFromClassReflection() : void
         {
             $fixture = new ContextFactory();
-            $expected = [
-                'm' => m::class,
-                'DocBlock' => DocBlock::class,
-                'Tag' => Tag::class,
-                'phpDocumentor' => 'phpDocumentor',
-                'TestCase' => TestCase::class,
-                'Assert' => Assert::class,
-                'e' => e::class,
-                ReflectionClass::class => ReflectionClass::class,
-                'stdClass',
-            ];
             $context = $fixture->createFromReflector(new ReflectionClass($this));
 
-            $actual = $context->getNamespaceAliases();
-
-            // sort so that order differences don't break it
-            sort($expected);
-            sort($actual);
-            $this->assertSame($expected, $actual);
+            $this->assertNamespaceAliasesFrom($context);
         }
 
         /**
@@ -89,20 +73,9 @@ public function testReadsNamespaceFromProvidedNamespaceAndContent() : void
         public function testReadsAliasesFromProvidedNamespaceAndContent() : void
         {
             $fixture = new ContextFactory();
-            $expected = [
-                'm' => m::class,
-                'DocBlock' => DocBlock::class,
-                'Tag' => Tag::class,
-                'phpDocumentor' => 'phpDocumentor',
-                'TestCase' => TestCase::class,
-                ReflectionClass::class => ReflectionClass::class,
-            ];
             $context = $fixture->createForNamespace(__NAMESPACE__, file_get_contents(__FILE__));
 
-            $actual = $context->getNamespaceAliases();
-
-            // sort so that order differences don't break it
-            $this->assertSame(sort($expected), sort($actual));
+            $this->assertNamespaceAliasesFrom($context);
         }
 
         /**
@@ -196,6 +169,29 @@ class Bar
             $this->assertSame([], $context->getNamespaceAliases());
         }
 
+        public function assertNamespaceAliasesFrom(Context $context)
+        {
+            $expected = [
+                'm' => m::class,
+                'DocBlock' => DocBlock::class,
+                'Tag' => Tag::class,
+                'phpDocumentor' => 'phpDocumentor',
+                'TestCase' => TestCase::class,
+                'Assert' => Assert::class,
+                'e' => e::class,
+                ReflectionClass::class => ReflectionClass::class,
+                'stdClass' => 'stdClass',
+            ];
+
+            $actual = $context->getNamespaceAliases();
+
+            // sort so that order differences don't break it
+            asort($expected);
+            asort($actual);
+
+            $this->assertSame($expected, $actual);
+        }
+
         public function tearDown()
         {
             m::close();