PhpNamespace::simplifyName() fixed collision when alias already exists

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -185,20 +185,28 @@ public function simplifyName(string $name, string $of = self::NAME_NORMAL): stri
 			return $this->simplifyName(Helpers::extractNamespace($name) . '\\') . Helpers::extractShortName($name);
 		}
 
-		$res = self::startsWith($name, $this->name . '\\')
+		$shortest = null;
+		$relative = self::startsWith($name, $this->name . '\\')
 			? substr($name, strlen($this->name) + 1)
 			: null;
 
 		foreach ($this->aliases[$of] as $alias => $original) {
+			if ($relative && self::startsWith($relative . '\\', $alias . '\\')) {
+				$relative = null;
+			}
 			if (self::startsWith($name . '\\', $original . '\\')) {
 				$short = $alias . substr($name, strlen($original));
-				if (!isset($res) || strlen($res) > strlen($short)) {
-					$res = $short;
+				if (!isset($shortest) || strlen($shortest) > strlen($short)) {
+					$shortest = $short;
 				}
 			}
 		}
 
-		return $res ?? ($this->name ? '\\' : '') . $name;
+		if (isset($shortest, $relative) && strlen($shortest) < strlen($relative)) {
+			return $relative;
+		}
+
+		return $relative ?? $shortest ?? ($this->name ? '\\' : '') . $name;
 	}
 
 

tests/PhpGenerator/PhpNamespace.aliases.phpt

@@ -67,7 +67,7 @@ $namespace->addUse('Foo');
 Assert::same('B', $namespace->simplifyName('Foo\B'));
 
 $namespace->addUse('Bar\C');
-Assert::same('C', $namespace->simplifyName('Foo\C'));
+Assert::same('Foo\C', $namespace->simplifyName('Foo\C'));
 
 Assert::same('\Bar', $namespace->simplifyName('Bar'));
 Assert::same('C', $namespace->simplifyName('\bar\C'));
@@ -80,7 +80,7 @@ $namespace->addUseFunction('Foo\a');
 
 Assert::same('\bar\c', $namespace->simplifyName('bar\c', $namespace::NAME_FUNCTION));
 Assert::same('a', $namespace->simplifyName('foo\A', $namespace::NAME_FUNCTION));
-Assert::same('C\b', $namespace->simplifyName('foo\C\b', $namespace::NAME_FUNCTION));
+Assert::same('Foo\C\b', $namespace->simplifyName('foo\C\b', $namespace::NAME_FUNCTION));
 Assert::same('a\b', $namespace->simplifyName('foo\a\b', $namespace::NAME_FUNCTION));
 
 $namespace->addUseFunction('Bar\c');
@@ -156,9 +156,9 @@ $namespace->addUse('C');
 Assert::same('C', $namespace->simplifyName('C'));
 $namespace->addUse('Bar\C');
 Assert::same('C1', $namespace->simplifyName('Bar\C'));
-Assert::same('C', $namespace->simplifyName('Foo\C'));
+Assert::same('\Foo\C', $namespace->simplifyName('Foo\C'));
 $namespace->addUse('Foo\C');
-Assert::same('C', $namespace->simplifyName('Foo\C'));
+Assert::same('C2', $namespace->simplifyName('Foo\C'));
 
 $namespace = new PhpNamespace('Foo');
 $namespace->addUse('Bar\C');