Fix and testcase for inline namespace usage

theseer · Feb 26, 2011 · 112339f · 112339f
1 parent 72f8c6e
commit 112339f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/classfinder.php b/src/classfinder.php
@@ -86,7 +86,7 @@ public function parseFile($file) {
          $dependsClass    = '';
 
          $token = token_get_all(file_get_contents($file));
-         foreach($token as $tok) {
+         foreach($token as $pos => $tok) {
             if (!is_array($tok)) {
                switch ($tok) {
                   case '{': {
@@ -159,6 +159,10 @@ public function parseFile($file) {
                   continue;
                }
                case T_NAMESPACE: {
+                  if ($token[$pos + 1][0] == T_NS_SEPARATOR) {
+                     // Ignore inline use of namespace keyword
+                     continue;
+                  }
                   $nsFound     = true;
                   $nsProc      = true;
                   $inNamespace = null;

diff --git a/tests/_data/classfinder/namespaceconstant.php b/tests/_data/classfinder/namespaceconstant.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace demo\level2 {
+
+   var_dump(namespace\foo);
+
+   class demo1 { }
+
+}
+
+
+?>
diff --git a/tests/classfinder.test.php b/tests/classfinder.test.php
@@ -61,7 +61,7 @@ public function testOneClass() {
       }
 
       /**
-       * 
+       *
        * @expectedException  \TheSeer\Tools\ClassFinderException
        * @expectedExceptionCode  \TheSeer\Tools\ClassFinderException::ClassRedeclaration
        */
@@ -70,7 +70,7 @@ public function testRedeclaringThrowsException() {
         $finder->parseFile(__DIR__.'/_data/classfinder/class.php');
         $finder->parseFile(__DIR__.'/_data/classfinder/class.php');
       }
-      
+
       public function testFullPathToClass() {
         $finder = new \TheSeer\Tools\ClassFinder;
         $rc = $finder->parseFile(__DIR__.'/_data/classfinder/class.php');
@@ -176,6 +176,14 @@ public function testNamespaceBracketSyntaxMultiNS() {
         $this->assertArrayHasKey('demo\\\\level2\\\\level3\\\\demo2', $classes);
       }
 
+      public function testNamespaceParsingIgnoresConstantAccessUseOfNamespaceKeyword() {
+        $finder = new \TheSeer\Tools\ClassFinder;
+        $rc = $finder->parseFile(__DIR__.'/_data/classfinder/namespaceconstant.php');
+        $this->assertEquals(1,$rc);
+        $classes = $finder->getClasses();
+        $this->assertArrayHasKey('demo\\\\level2\\\\demo1', $classes);
+      }
+
       public function testBracketParsingBugTest1() {
         $finder = new \TheSeer\Tools\ClassFinder;
         $rc = $finder->parseFile(__DIR__.'/_data/classfinder/brackettest1.php');