Added support for "(new|extends|implements) namespace\MyClass"

Signed-off-by: Jan Pecha <[email protected]>

Author: janpecha

src/PhpDepend.php

@@ -269,7 +269,7 @@ private function prev()
 		 */
 		private function readName()
 		{
-			return $this->expandName($this->readIdentifier());
+			return $this->expandName($this->readIdentifier(TRUE));
 		}
 
 
@@ -299,9 +299,10 @@ private function readImplements()
 
 
 		/**
+		 * @param	bool
 		 * @return	string
 		 */
-		private function readIdentifier()
+		private function readIdentifier($readNamespaceKeyword = FALSE)
 		{
 			$name = FALSE;
 			while($token = $this->next())
@@ -311,11 +312,18 @@ private function readIdentifier()
 					$this->prev();
 					break;
 				}
+
+				if($readNamespaceKeyword && $token[0] === T_NAMESPACE)
+				{
+					$name = '\\' . $this->namespace;
+					continue;
+				}
 
 				switch($token[0])
 				{
 					case T_STRING:
 					case self::$T_NS_SEPARATOR:
+						$readNamespaceKeyword = FALSE;
 						$name .= $token[1];
 
 					case T_WHITESPACE:

tests/PhpDepend/PhpDepend.basic-dependencies.phpt

@@ -21,12 +21,14 @@ $phpdepend->parse("<?php
 namespace Foo\\Bar;
 \$foo = new Foo;
 \$bar = new Bar;
+\$barfoo = new namespace\BarFoo;
 ");
 
 Assert::same(array(), $phpdepend->getClasses());
 Assert::same(array(
 	'Foo\\Bar\\Foo',
 	'Foo\\Bar\\Bar',
+	'Foo\\Bar\\BarFoo',
 ), $phpdepend->getDependencies());
 
 

tests/PhpDepend/PhpDepend.basic.phpt

@@ -32,4 +32,16 @@ Assert::same(array('Foo\\Bar\\MyClass'), $phpdepend->getClasses());
 Assert::same(array(), $phpdepend->getDependencies());
 
 
+// Class definition
+$phpdepend->parse("<?php
+namespace Foo\\Bar;
+class MyClass extends namespace\MyParent implements namespace\MyInterface {
+
+}
+");
 
+Assert::same(array('Foo\\Bar\\MyClass'), $phpdepend->getClasses());
+Assert::same(array(
+	'Foo\Bar\MyParent',
+	'Foo\Bar\MyInterface',
+), $phpdepend->getDependencies());