PhpNamespace::addUse() ignores names in current namespace [Closes #96]

nette · Nov 22, 2021 · 8aa6d4c · 8aa6d4c
1 parent 666b591
commit 8aa6d4c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/PhpGenerator/PhpNamespace.php b/src/PhpGenerator/PhpNamespace.php
@@ -152,7 +152,11 @@ public function addUseConstant(string $name, string $alias = null): self
 	public function getUses(string $of = self::NAME_NORMAL): array
 	{
 		asort($this->aliases[$of]);
-		return $this->aliases[$of];
+		return array_filter(
+			$this->aliases[$of],
+			function ($name, $alias) { return strcasecmp(($this->name ? $this->name . '\\' : '') . $alias, $name); },
+			ARRAY_FILTER_USE_BOTH,
+		);
 	}
 
 

diff --git a/tests/PhpGenerator/expected/PhpFile.globalNamespace.expect b/tests/PhpGenerator/expected/PhpFile.globalNamespace.expect
@@ -1,6 +1,5 @@
 <?php
 
-use A;
 use B as C;
 
 class CA

diff --git a/tests/PhpGenerator/expected/Printer.namespace.expect b/tests/PhpGenerator/expected/Printer.namespace.expect
@@ -1,7 +1,6 @@
 namespace Foo;
 
 use Bar\C;
-use Foo\D;
 use Foo\D as E;
 
 /**

diff --git a/tests/PhpGenerator/expected/Printer.namespace.unresolved.expect b/tests/PhpGenerator/expected/Printer.namespace.unresolved.expect
@@ -1,7 +1,6 @@
 namespace Foo;
 
 use Bar\C;
-use Foo\D;
 use Foo\D as E;
 
 /**