Printer: fixed use statements generation

nette · Nov 27, 2018 · 7c5e08e · 7c5e08e
1 parent 9ecd301
commit 7c5e08e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -139,9 +139,7 @@ public function printNamespace(PhpNamespace $namespace): string
 
 		$uses = [];
 		foreach ($namespace->getUses() as $alias => $original) {
-			$useNamespace = Helpers::extractNamespace($original);
-
-			if ($name !== $useNamespace) {
+			if ($original !== ($name ? $name . '\\' . $alias : $alias)) {
 				if ($alias === $original || substr($original, -(strlen($alias) + 1)) === '\\' . $alias) {
 					$uses[] = "use $original;";
 				} else {

diff --git a/tests/PhpGenerator/Printer.namespace.phpt b/tests/PhpGenerator/Printer.namespace.phpt
@@ -13,6 +13,8 @@ $printer = new Printer;
 
 $namespace = new PhpNamespace('Foo');
 $namespace->addUse('Bar\C');
+$namespace->addUse('Foo\D');
+$namespace->addUse('Foo\D', 'E');
 
 $class = $namespace->addClass('A')
 	->setFinal(true)

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