PhpNamespace::unresolveName() prefers shorter names

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -141,8 +141,11 @@ public function unresolveName(string $name): string
 			return $name;
 		}
 		$name = ltrim($name, '\\');
-		$res = null;
 		$lower = strtolower($name);
+		$res = Strings::startsWith($lower, strtolower($this->name) . '\\')
+			? substr($name, strlen($this->name) + 1)
+			: null;
+
 		foreach ($this->uses as $alias => $original) {
 			if (Strings::startsWith($lower . '\\', strtolower($original) . '\\')) {
 				$short = $alias . substr($name, strlen($original));
@@ -152,11 +155,7 @@ public function unresolveName(string $name): string
 			}
 		}
 
-		if (!$res && Strings::startsWith($lower, strtolower($this->name) . '\\')) {
-			return substr($name, strlen($this->name) + 1);
-		} else {
-			return $res ?: ($this->name ? '\\' : '') . $name;
-		}
+		return $res ?: ($this->name ? '\\' : '') . $name;
 	}
 
 

tests/PhpGenerator/PhpNamespace.phpt

@@ -42,8 +42,11 @@ Assert::same('?A', $namespace->unresolveType('?foo\A'));
 Assert::same('A&\Countable', $namespace->unresolveType('foo\A&Countable'));
 Assert::same('', $namespace->unresolveType(''));
 
+$namespace->addUse('Foo');
+Assert::same('B', $namespace->unresolveName('Foo\B'));
+
 $namespace->addUse('Bar\C');
-Assert::same(['C' => 'Bar\C'], $namespace->getUses());
+Assert::same(['C' => 'Bar\C', 'Foo' => 'Foo'], $namespace->getUses());
 
 Assert::same('\Bar', $namespace->unresolveName('Bar'));
 Assert::same('C', $namespace->unresolveName('\bar\C'));

tests/PhpGenerator/expected/PhpNamespace.expect

@@ -1,6 +1,7 @@
 namespace Foo;
 
 use Bar\C;
+use Foo;
 
 #[A]
 class A implements A, C