Merge pull request #9 from asgrim/ignore-class-trait-usage

Ignore any tokens within classes when looking for namespaces
phpDocumentor · Jul 18, 2015 · 83e3125 · 83e3125
2 parents 14bb2da + 0c11dd9
commit 83e3125
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/Types/ContextFactory.php b/src/Types/ContextFactory.php
@@ -70,6 +70,26 @@ public function createForNamespace($namespace, $fileContents)
                 case T_NAMESPACE:
                     $currentNamespace = $this->parseNamespace($tokens);
                     break;
+                case T_CLASS:
+                    // Fast-forward the iterator through the class so that any
+                    // T_USE tokens found within are skipped - these are not
+                    // valid namespace use statements so should be ignored.
+                    $braceLevel = 0;
+                    $firstBraceFound = false;
+                    while ($tokens->valid() && ($braceLevel > 0 || !$firstBraceFound)) {
+                        if ($tokens->current() === '{') {
+                            if (!$firstBraceFound) {
+                                $firstBraceFound = true;
+                            }
+                            $braceLevel++;
+                        }
+
+                        if ($tokens->current() === '}') {
+                            $braceLevel--;
+                        }
+                        $tokens->next();
+                    }
+                    break;
                 case T_USE:
                     if ($currentNamespace === $namespace) {
                         $useStatements = array_merge($useStatements, $this->parseUseStatement($tokens));

diff --git a/tests/unit/Types/ContextFactoryTest.php b/tests/unit/Types/ContextFactoryTest.php
@@ -88,6 +88,26 @@ public function testReadsAliasesFromProvidedNamespaceAndContent()
 
             $this->assertSame($expected, $context->getNamespaceAliases());
         }
+
+        public function testTraitUseIsNotDetectedAsNamespaceUse()
+        {
+            $fixture = new ContextFactory();
+
+            $php = "<?php
+                namespace Foo;
+
+                trait FooTrait {}
+
+                class FooClass {
+                    use FooTrait;
+                }
+            ";
+
+            $fixture = new ContextFactory();
+            $context = $fixture->createForNamespace('Foo', $php);
+
+            $this->assertSame([], $context->getNamespaceAliases());
+        }
     }
 }