PhpNamespace: improved collision checking between class and alias

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -102,32 +102,31 @@ public function addUse(string $name, string $alias = null): self
 		}
 
 		$name = ltrim($name, '\\');
-		if ($alias === null && $this->name === Helpers::extractNamespace($name)) {
-			$alias = Helpers::extractShortName($name);
-		}
 		if ($alias === null) {
 			$base = Helpers::extractShortName($name);
 			$counter = null;
 			do {
 				$alias = $base . $counter;
 				$counter++;
-			} while (isset($this->aliases[$alias]) && $this->aliases[$alias] !== $name);
+			} while ((isset($this->aliases[$alias]) && $this->aliases[$alias] !== $name) || isset($this->classes[$alias]));
 
 		} elseif (isset($this->aliases[$alias]) && $this->aliases[$alias] !== $name) {
 			throw new InvalidStateException(
 				"Alias '$alias' used already for '{$this->aliases[$alias]}', cannot use for '$name'."
 			);
+		} elseif (isset($this->classes[$alias])) {
+			throw new Nette\InvalidStateException("Name '$alias' used already for '$this->name\\{$this->classes[$alias]->getName()}'.");
 		}
 
 		$this->aliases[$alias] = $name;
-		asort($this->aliases);
 		return $this;
 	}
 
 
 	/** @return string[] */
 	public function getUses(): array
 	{
+		asort($this->aliases);
 		return $this->aliases;
 	}
 
@@ -175,8 +174,9 @@ public function add(ClassType $class): self
 		$name = $class->getName();
 		if ($name === null) {
 			throw new Nette\InvalidArgumentException('Class does not have a name.');
+		} elseif ($orig = $this->aliases[$name] ?? null) {
+			throw new Nette\InvalidStateException("Name '$name' used already as alias for $orig.");
 		}
-		$this->addUse($this->name . '\\' . $name);
 		$this->classes[$name] = $class;
 		return $this;
 	}

src/PhpGenerator/Printer.php

@@ -281,11 +281,9 @@ protected function printUses(PhpNamespace $namespace): string
 		$name = $namespace->getName();
 		$uses = [];
 		foreach ($namespace->getUses() as $alias => $original) {
-			if ($original !== ($name ? $name . '\\' . $alias : $alias)) {
-				$uses[] = $alias === $original || substr($original, -(strlen($alias) + 1)) === '\\' . $alias
-					? "use $original;"
-					: "use $original as $alias;";
-			}
+			$uses[] = Helpers::extractShortName($original) === $alias
+				? "use $original;"
+				: "use $original as $alias;";
 		}
 		return implode("\n", $uses);
 	}

tests/PhpGenerator/PhpFile.phpt

@@ -114,7 +114,7 @@ Assert::same(['Baz\\f2', 'f1'], array_keys($file->getFunctions()));
 
 
 $file = new PhpFile;
-$file->addClass('A');
+$file->addClass('CA');
 $file->addUse('A')
 	->addUse('B', 'C');
 

tests/PhpGenerator/PhpNamespace.aliases.phpt

@@ -44,7 +44,6 @@ $namespace->addUse('Foo');
 Assert::same('B', $namespace->simplifyName('Foo\B'));
 
 $namespace->addUse('Bar\C');
-Assert::same(['C' => 'Bar\C', 'Foo' => 'Foo'], $namespace->getUses());
 Assert::same('C', $namespace->simplifyName('Foo\C'));
 
 Assert::same('\Bar', $namespace->simplifyName('Bar'));
@@ -61,14 +60,14 @@ $namespace->addUse('Bar\C');
 
 Assert::exception(function () use ($namespace) {
 	$namespace->addTrait('C');
-}, Nette\InvalidStateException::class, "Alias 'C' used already for 'Bar\\C', cannot use for 'Foo\\C'.");
+}, Nette\InvalidStateException::class, "Name 'C' used already as alias for Bar\\C.");
 
 $namespace->addClass('B');
 Assert::exception(function () use ($namespace) {
 	$namespace->addUse('Lorem\B', 'B');
-}, Nette\InvalidStateException::class, "Alias 'B' used already for 'Foo\\B', cannot use for 'Lorem\\B'.");
+}, Nette\InvalidStateException::class, "Name 'B' used already for 'Foo\\B'.");
 
-Assert::same(['C' => 'Bar\\C', 'B' => 'Foo\\B'], $namespace->getUses());
+Assert::same(['C' => 'Bar\\C'], $namespace->getUses());
 
 
 // alias generation
@@ -80,9 +79,8 @@ Assert::same('C1', $namespace->simplifyName('Bar\C'));
 
 $namespace = new PhpNamespace('');
 $namespace->addUse('Bar\C');
-Assert::exception(function () use ($namespace) {
-	$namespace->addUse('C');
-}, Nette\InvalidStateException::class, "Alias 'C' used already for 'Bar\\C', cannot use for 'C'.");
+$namespace->addUse('C');
+Assert::same('C1', $namespace->simplifyName('C'));
 
 $namespace = new PhpNamespace('');
 $namespace->addUse('A');
@@ -96,9 +94,8 @@ 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::exception(function () use ($namespace) {
-	$namespace->addUse('Foo\C');
-}, Nette\InvalidStateException::class, "Alias 'C' used already for 'C', cannot use for 'Foo\\C'.");
+$namespace->addUse('Foo\C');
+Assert::same('C', $namespace->simplifyName('Foo\C'));
 
 $namespace = new PhpNamespace('Foo');
 $namespace->addUse('Bar\C');

tests/PhpGenerator/expected/PhpFile.globalNamespace.expect

@@ -1,7 +1,8 @@
 <?php
 
+use A;
 use B as C;
 
-class A
+class CA
 {
 }

tests/PhpGenerator/expected/Printer.namespace.expect

@@ -1,6 +1,7 @@
 namespace Foo;
 
 use Bar\C;
+use Foo\D;
 use Foo\D as E;
 
 /**

tests/PhpGenerator/expected/Printer.namespace.unresolved.expect

@@ -1,6 +1,7 @@
 namespace Foo;
 
 use Bar\C;
+use Foo\D;
 use Foo\D as E;
 
 /**