added PhpNamespace::unresolveName()

Author: dg

src/PhpGenerator/ClassType.php

@@ -195,20 +195,17 @@ public function __toString()
 		}
 
 		$extends = $implements = $traits = array();
-
 		if ($this->namespace) {
-			$fqnToAlias = array_flip($this->namespace->getUses());
-
-			foreach ((array) $this->extends as $fqn) {
-				$extends[] = isset($fqnToAlias[$fqn]) ? $fqnToAlias[$fqn] : '\\' . $fqn;
+			foreach ((array) $this->extends as $name) {
+				$extends[] = $this->namespace->unresolveName($name);
 			}
 
-			foreach ((array) $this->implements as $fqn) {
-				$implements[] = isset($fqnToAlias[$fqn]) ? $fqnToAlias[$fqn] : '\\' . $fqn;
+			foreach ((array) $this->implements as $name) {
+				$implements[] = $this->namespace->unresolveName($name);
 			}
 
-			foreach ((array) $this->traits as $fqn) {
-				$traits[] = isset($fqnToAlias[$fqn]) ? $fqnToAlias[$fqn] : '\\' . $fqn;
+			foreach ((array) $this->traits as $name) {
+				$traits[] = $this->namespace->unresolveName($name);
 			}
 
 		} else {

src/PhpGenerator/PhpNamespace.php

@@ -37,7 +37,7 @@ class PhpNamespace extends Object
 	private $classes = array();
 
 
-	public function __construct($name)
+	public function __construct($name = NULL)
 	{
 		$this->name = $name;
 	}
@@ -102,7 +102,7 @@ public function getUses()
 	 */
 	public function addUse($fqn, $alias = NULL, &$aliasOut = NULL)
 	{
-		$fqn = trim($fqn, '\\');
+		$fqn = ltrim($fqn, '\\');
 		if ($alias === NULL) {
 			$path = explode('\\', $fqn);
 			$counter = NULL;
@@ -127,6 +127,32 @@ public function addUse($fqn, $alias = NULL, &$aliasOut = NULL)
 	}
 
 
+	/**
+	 * @param  string
+	 * @return string
+	 */
+	public function unresolveName($name)
+	{
+		$name = ltrim($name, '\\');
+		$res = NULL;
+		$lower = strtolower($name);
+		foreach ($this->uses as $alias => $for) {
+			if (Strings::startsWith($lower . '\\', strtolower($for) . '\\')) {
+				$short = $alias . substr($name, strlen($for));
+				if (!isset($res) || strlen($res) > strlen($short)) {
+					$res = $short;
+				}
+			}
+		}
+
+		if (!$res && Strings::startsWith($lower, strtolower($this->name) . '\\')) {
+			return substr($name, strlen($this->name) + 1);
+		} else {
+			return $res ?: '\\' . $name;
+		}
+	}
+
+
 	/**
 	 * @return ClassType[]
 	 */

tests/PhpGenerator/PhpNamespace.expect

@@ -0,0 +1,19 @@
+namespace Foo;
+
+use Bar\C;
+
+class A implements A, C
+{
+
+	use \Bar\D;
+
+
+
+}
+
+interface B
+{
+
+
+
+}

tests/PhpGenerator/PhpNamespace.phpt

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator for files.
+ */
+
+use Nette\PhpGenerator\PhpNamespace;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$namespace = new PhpNamespace('Foo');
+
+Assert::same('\A', $namespace->unresolveName('A'));
+Assert::same('A', $namespace->unresolveName('foo\A'));
+
+$namespace->addUse('Bar\C');
+
+Assert::same('\Bar', $namespace->unresolveName('Bar'));
+Assert::same('C', $namespace->unresolveName('bar\C'));
+Assert::same('C\D', $namespace->unresolveName('Bar\C\D'));
+
+
+$classA = $namespace->addClass('A');
+Assert::same($namespace, $classA->getNamespace());
+
+$interfaceB = $namespace->addInterface('B');
+Assert::same($namespace, $interfaceB->getNamespace());
+
+$classA
+	->addImplement('Foo\\A')
+	->addImplement('Bar\\C')
+	->addTrait('Bar\\D');
+
+
+Assert::matchFile(__DIR__ . '/PhpNamespace.expect', (string) $namespace);