PhpNamespace: added resolveName()

Author: dg

readme.md

@@ -586,6 +586,20 @@ $namespace->addUse(Http\Request::class, 'HttpReq');
 $namespace->addUseFunction('iter\range');
 ```
 
+To simplify a fully qualified class, function or constant name according to the defined aliases, use the `simplifyName` method:
+
+```php
+echo $namespace->simplifyName('Foo\Bar'); // 'Bar', because 'Foo' is current namespace
+echo $namespace->simplifyName('iter\range', $namespace::NAME_FUNCTION); // 'range', because of the defined use-statement
+```
+
+Conversely, you can convert a simplified class, function or constant name to a fully qualified one using the `resolveName` method:
+
+```php
+echo $namespace->resolveName('Bar'); // 'Foo\Bar'
+echo $namespace->resolveName('range', $namespace::NAME_FUNCTION); // 'iter\range'
+```
+
 Class Names Resolving
 ---------------------
 
@@ -599,11 +613,11 @@ $namespace = new Nette\PhpGenerator\PhpNamespace('Foo');
 $namespace->addUse('Bar\AliasedClass');
 
 $class = $namespace->addClass('Demo');
-$class->addImplement('Foo\A') // it will resolve to A
-	->addTrait('Bar\AliasedClass'); // it will resolve to AliasedClass
+$class->addImplement('Foo\A') // it will simplify to A
+	->addTrait('Bar\AliasedClass'); // it will simplify to AliasedClass
 
 $method = $class->addMethod('method');
-$method->addComment('@return ' . $namespace->simplifyType('Foo\D')); // in comments resolve manually
+$method->addComment('@return ' . $namespace->simplifyType('Foo\D')); // in comments simplify manually
 $method->addParameter('arg')
 	->setType('Bar\OtherClass'); // it will resolve to \Bar\OtherClass
 

src/PhpGenerator/PhpNamespace.php

@@ -167,6 +167,27 @@ public function unresolveName(string $name): string
 	}
 
 
+	public function resolveName(string $name, string $of = self::NAME_NORMAL): string
+	{
+		if (isset(Helpers::KEYWORDS[strtolower($name)]) || $name === '') {
+			return $name;
+		} elseif ($name[0] === '\\') {
+			return substr($name, 1);
+		}
+
+		$aliases = array_change_key_case($this->aliases[$of]);
+		if ($of !== self::NAME_NORMAL) {
+			return $aliases[strtolower($name)]
+				?? $this->resolveName(Helpers::extractNamespace($name) . '\\') . Helpers::extractShortName($name);
+		}
+
+		$parts = explode('\\', $name, 2);
+		return ($res = $aliases[strtolower($parts[0])] ?? null)
+			? $res . (isset($parts[1]) ? '\\' . $parts[1] : '')
+			: $this->name . ($this->name ? '\\' : '') . $name;
+	}
+
+
 	public function simplifyType(string $type, string $of = self::NAME_NORMAL): string
 	{
 		return preg_replace_callback('~[\w\x7f-\xff\\\\]+~', function ($m) use ($of) { return $this->simplifyName($m[0], $of); }, $type);

tests/PhpGenerator/PhpNamespace.resolve.phpt

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\PhpNamespace;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+// global namespace
+$namespace = new PhpNamespace('');
+
+Assert::same('', $namespace->getName());
+Assert::same('', $namespace->resolveName(''));
+Assert::same('', $namespace->resolveName('\\'));
+Assert::same('A', $namespace->resolveName('A'));
+Assert::same('A', $namespace->resolveName('\A'));
+Assert::same('foo\A', $namespace->resolveName('foo\A'));
+
+$namespace->addUse('Bar\C');
+
+Assert::same('Bar', $namespace->resolveName('Bar'));
+Assert::same('Bar\C', $namespace->resolveName('c'));
+Assert::same('Bar\C\D', $namespace->resolveName('C\D'));
+
+$namespace->addUseFunction('Foo\a');
+
+Assert::same('bar\c', $namespace->resolveName('bar\c', $namespace::NAME_FUNCTION));
+Assert::same('Foo\a', $namespace->resolveName('A', $namespace::NAME_FUNCTION));
+Assert::same('foo\a\b', $namespace->resolveName('foo\a\b', $namespace::NAME_FUNCTION));
+
+$namespace->addUseFunction('Bar\c');
+
+Assert::same('Bar', $namespace->resolveName('Bar', $namespace::NAME_FUNCTION));
+Assert::same('Bar\c', $namespace->resolveName('C', $namespace::NAME_FUNCTION));
+Assert::same('Bar\C\d', $namespace->resolveName('c\d', $namespace::NAME_FUNCTION));
+
+$namespace->addUseConstant('Bar\c');
+
+Assert::same('Bar', $namespace->resolveName('Bar', $namespace::NAME_CONSTANT));
+Assert::same('Bar\c', $namespace->resolveName('C', $namespace::NAME_CONSTANT));
+Assert::same('Bar\C\d', $namespace->resolveName('c\d', $namespace::NAME_CONSTANT));
+
+
+
+// namespace
+$namespace = new PhpNamespace('Foo');
+
+foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
+	Assert::same($type, $namespace->resolveName($type));
+}
+
+Assert::same('Foo', $namespace->getName());
+Assert::same('', $namespace->resolveName(''));
+Assert::same('', $namespace->resolveName('\\'));
+Assert::same('A', $namespace->resolveName('\A'));
+Assert::same('Foo\A', $namespace->resolveName('A'));
+
+$namespace->addUse('Foo');
+Assert::same('Foo\B', $namespace->resolveName('B'));
+
+$namespace->addUse('Bar\C');
+Assert::same('Foo\C', $namespace->resolveName('Foo\C'));
+
+Assert::same('Bar', $namespace->resolveName('\Bar'));
+Assert::same('Bar\C', $namespace->resolveName('C'));
+Assert::same('Bar\C', $namespace->resolveName('c'));
+Assert::same('Bar\C\D', $namespace->resolveName('c\D'));
+
+$namespace->addUseFunction('Foo\a');
+
+foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
+	Assert::same($type, $namespace->resolveName($type, $namespace::NAME_FUNCTION));
+}
+
+Assert::same('bar\c', $namespace->resolveName('\bar\c', $namespace::NAME_FUNCTION));
+Assert::same('Foo\a', $namespace->resolveName('A', $namespace::NAME_FUNCTION));
+Assert::same('Foo\C\b', $namespace->resolveName('foo\C\b', $namespace::NAME_FUNCTION));
+Assert::same('Foo\A\b', $namespace->resolveName('A\b', $namespace::NAME_FUNCTION));
+
+$namespace->addUseFunction('Bar\c');
+
+Assert::same('Bar', $namespace->resolveName('\Bar', $namespace::NAME_FUNCTION));
+Assert::same('Bar\c', $namespace->resolveName('C', $namespace::NAME_FUNCTION));
+Assert::same('Bar\C\d', $namespace->resolveName('c\d', $namespace::NAME_FUNCTION));