PhpNamespace::addUse() fixed generating of alias for classes in current namespace

Author: dg

src/PhpGenerator/Helpers.php

@@ -214,7 +214,7 @@ public static function extractNamespace($fqn)
 	 */
 	public static function extractShortName($fqn)
 	{
-		return ($pos = strrpos($fqn, '\\')) ? substr($fqn, $pos + 1) : $fqn;
+		return ($pos = strrpos($fqn, '\\')) === FALSE ? $fqn : substr($fqn, $pos + 1);
 	}
 
 }

src/PhpGenerator/PhpNamespace.php

@@ -103,6 +103,9 @@ public function getUses()
 	public function addUse($fqn, $alias = NULL, &$aliasOut = NULL)
 	{
 		$fqn = ltrim($fqn, '\\');
+		if ($alias === NULL && $this->name === Helpers::extractNamespace($fqn)) {
+			$alias = Helpers::extractShortName($fqn);
+		}
 		if ($alias === NULL) {
 			$path = explode('\\', $fqn);
 			$counter = NULL;

tests/PhpGenerator/PhpNamespace.phpt

@@ -28,6 +28,11 @@ Assert::same($namespace, $classA->getNamespace());
 $interfaceB = $namespace->addInterface('B');
 Assert::same($namespace, $interfaceB->getNamespace());
 
+Assert::exception(function() use ($namespace) {
+	$traitC = $namespace->addTrait('C');
+	Assert::same($namespace, $traitC->getNamespace());
+}, 'Nette\InvalidStateException', "Alias 'C' used already for 'Bar\C', cannot use for 'Foo\C'.");
+
 $classA
 	->addImplement('Foo\\A')
 	->addImplement('Bar\\C')