PhpNamespace::unresolveName() renamed to simplifyName()

Author: dg

readme.md

@@ -600,7 +600,7 @@ $class->addImplement('Foo\A') // it will resolve to A
 	->addTrait('Bar\AliasedClass'); // it will resolve to AliasedClass
 
 $method = $class->addMethod('method');
-$method->addComment('@return ' . $namespace->unresolveName('Foo\D')); // in comments resolve manually
+$method->addComment('@return ' . $namespace->simplifyType('Foo\D')); // in comments resolve manually
 $method->addParameter('arg')
 	->setType('Bar\OtherClass'); // it will resolve to \Bar\OtherClass
 

src/PhpGenerator/PhpNamespace.php

@@ -132,13 +132,20 @@ public function getUses(): array
 	}
 
 
-	public function unresolveType(string $type): string
+	/** @deprecated  use simplifyName() */
+	public function unresolveName(string $name): string
 	{
-		return preg_replace_callback('~[^|&?]+~', function ($m) { return $this->unresolveName($m[0]); }, $type);
+		return $this->simplifyName($name);
 	}
 
 
-	public function unresolveName(string $name): string
+	public function simplifyType(string $type): string
+	{
+		return preg_replace_callback('~[^|&?]+~', function ($m) { return $this->simplifyName($m[0]); }, $type);
+	}
+
+
+	public function simplifyName(string $name): string
 	{
 		if (isset(Helpers::KEYWORDS[strtolower($name)]) || $name === '') {
 			return $name;

src/PhpGenerator/Printer.php

@@ -136,7 +136,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 		$this->namespace = $this->resolveTypes ? $namespace : null;
 		$class->validate();
 		$resolver = $this->namespace
-			? [$namespace, 'unresolveType']
+			? [$namespace, 'simplifyType']
 			: function ($s) { return $s; };
 
 		$traits = [];
@@ -343,7 +343,7 @@ public function printType(?string $type, bool $nullable): string
 			return '';
 		}
 		if ($this->namespace) {
-			$type = $this->namespace->unresolveType($type);
+			$type = $this->namespace->simplifyType($type);
 		}
 		if ($nullable && strcasecmp($type, 'mixed')) {
 			$type = strpos($type, '|') === false

tests/PhpGenerator/PhpNamespace.phpt

@@ -15,46 +15,46 @@ require __DIR__ . '/../bootstrap.php';
 $namespace = new PhpNamespace('');
 
 Assert::same('', $namespace->getName());
-Assert::same('A', $namespace->unresolveName('A'));
-Assert::same('foo\A', $namespace->unresolveName('foo\A'));
+Assert::same('A', $namespace->simplifyName('A'));
+Assert::same('foo\A', $namespace->simplifyName('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'));
+Assert::same('Bar', $namespace->simplifyName('Bar'));
+Assert::same('C', $namespace->simplifyName('bar\C'));
+Assert::same('C\D', $namespace->simplifyName('Bar\C\D'));
 
 foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
-	Assert::same($type, $namespace->unresolveName($type));
+	Assert::same($type, $namespace->simplifyName($type));
 }
 
 
 $namespace = new PhpNamespace('Foo');
 
 Assert::same('Foo', $namespace->getName());
-Assert::same('\A', $namespace->unresolveName('\A'));
-Assert::same('\A', $namespace->unresolveName('A'));
-Assert::same('A', $namespace->unresolveName('foo\A'));
+Assert::same('\A', $namespace->simplifyName('\A'));
+Assert::same('\A', $namespace->simplifyName('A'));
+Assert::same('A', $namespace->simplifyName('foo\A'));
 
-Assert::same('A', $namespace->unresolveType('foo\A'));
-Assert::same('null|A', $namespace->unresolveType('null|foo\A'));
-Assert::same('?A', $namespace->unresolveType('?foo\A'));
-Assert::same('A&\Countable', $namespace->unresolveType('foo\A&Countable'));
-Assert::same('', $namespace->unresolveType(''));
+Assert::same('A', $namespace->simplifyType('foo\A'));
+Assert::same('null|A', $namespace->simplifyType('null|foo\A'));
+Assert::same('?A', $namespace->simplifyType('?foo\A'));
+Assert::same('A&\Countable', $namespace->simplifyType('foo\A&Countable'));
+Assert::same('', $namespace->simplifyType(''));
 
 $namespace->addUse('Foo');
-Assert::same('B', $namespace->unresolveName('Foo\B'));
+Assert::same('B', $namespace->simplifyName('Foo\B'));
 
 $namespace->addUse('Bar\C');
 Assert::same(['C' => 'Bar\C', 'Foo' => 'Foo'], $namespace->getUses());
 
-Assert::same('\Bar', $namespace->unresolveName('Bar'));
-Assert::same('C', $namespace->unresolveName('\bar\C'));
-Assert::same('C', $namespace->unresolveName('bar\C'));
-Assert::same('C\D', $namespace->unresolveName('Bar\C\D'));
+Assert::same('\Bar', $namespace->simplifyName('Bar'));
+Assert::same('C', $namespace->simplifyName('\bar\C'));
+Assert::same('C', $namespace->simplifyName('bar\C'));
+Assert::same('C\D', $namespace->simplifyName('Bar\C\D'));
 
 foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
-	Assert::same($type, $namespace->unresolveName($type));
+	Assert::same($type, $namespace->simplifyName($type));
 }