PhpNamespace::addUse() simplified aliases generation

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -106,16 +106,12 @@ public function addUse(string $name, string $alias = null, string &$aliasOut = n
 			$alias = Helpers::extractShortName($name);
 		}
 		if ($alias === null) {
-			$path = explode('\\', $name);
+			$base = Helpers::extractShortName($name);
 			$counter = null;
 			do {
-				if (empty($path)) {
-					$counter++;
-				} else {
-					$alias = array_pop($path) . $alias;
-				}
-			} while (isset($this->aliases[$alias . $counter]) && $this->aliases[$alias . $counter] !== $name);
-			$alias .= $counter;
+				$alias = $base . $counter;
+				$counter++;
+			} while (isset($this->aliases[$alias]) && $this->aliases[$alias] !== $name);
 
 		} elseif (isset($this->aliases[$alias]) && $this->aliases[$alias] !== $name) {
 			throw new InvalidStateException(

tests/PhpGenerator/PhpNamespace.aliases.phpt

@@ -76,7 +76,7 @@ $namespace = new PhpNamespace('');
 $namespace->addUse('C');
 Assert::same('C', $namespace->simplifyName('C'));
 $namespace->addUse('Bar\C');
-Assert::same('BarC', $namespace->simplifyName('Bar\C'));
+Assert::same('C1', $namespace->simplifyName('Bar\C'));
 
 $namespace = new PhpNamespace('');
 $namespace->addUse('Bar\C');
@@ -88,13 +88,13 @@ $namespace = new PhpNamespace('');
 $namespace->addUse('A');
 Assert::same('A', $namespace->simplifyName('A'));
 $namespace->addUse('Bar\A');
-Assert::same('BarA', $namespace->simplifyName('Bar\A'));
+Assert::same('A1', $namespace->simplifyName('Bar\A'));
 
 $namespace = new PhpNamespace('Foo');
 $namespace->addUse('C');
 Assert::same('C', $namespace->simplifyName('C'));
 $namespace->addUse('Bar\C');
-Assert::same('BarC', $namespace->simplifyName('Bar\C'));
+Assert::same('C1', $namespace->simplifyName('Bar\C'));
 Assert::same('C', $namespace->simplifyName('Foo\C'));
 Assert::exception(function () use ($namespace) {
 	$namespace->addUse('Foo\C');