PhpNamespace::unresolveName() supports for build-in types

Author: dg

src/PhpGenerator/Method.php

@@ -96,13 +96,12 @@ public static function from($from)
 	 */
 	public function __toString()
 	{
-		static $builtinTypes = ['array', 'self', 'parent', 'callable', 'string', 'bool', 'float', 'int', NULL];
 		$parameters = [];
 		foreach ($this->parameters as $param) {
 			$variadic = $this->variadic && $param === end($this->parameters);
-			$hint = !$this->namespace || in_array($param->getTypeHint(), $builtinTypes, TRUE)
-				? $param->getTypeHint()
-				: $this->namespace->unresolveName($param->getTypeHint());
+			$hint = $this->namespace
+				? $this->namespace->unresolveName((string) $param->getTypeHint())
+				: $param->getTypeHint();
 
 			$parameters[] = ($hint ? $hint . ' ' : '')
 				. ($param->isReference() ? '&' : '')
@@ -114,9 +113,9 @@ public function __toString()
 		foreach ($this->uses as $param) {
 			$uses[] = ($param->isReference() ? '&' : '') . '$' . $param->getName();
 		}
-		$returnType = !$this->namespace || in_array($this->returnType, $builtinTypes, TRUE)
-			? $this->returnType
-			: $this->namespace->unresolveName($this->returnType);
+		$returnType = $this->namespace
+			? $this->namespace->unresolveName((string) $this->returnType)
+			: $this->returnType;
 
 		return ($this->comment ? str_replace("\n", "\n * ", "/**\n" . $this->comment) . "\n */\n" : '')
 			. ($this->abstract ? 'abstract ' : '')

src/PhpGenerator/PhpNamespace.php

@@ -134,6 +134,9 @@ public function addUse($name, $alias = NULL, &$aliasOut = NULL)
 	 */
 	public function unresolveName($name)
 	{
+		if (in_array(strtolower($name), ['self', 'parent', 'array', 'callable', 'string', 'bool', 'float', 'int', ''], TRUE)) {
+			return $name;
+		}
 		$name = ltrim($name, '\\');
 		$res = NULL;
 		$lower = strtolower($name);

tests/PhpGenerator/PhpNamespace.phpt

@@ -21,6 +21,10 @@ Assert::same('\Bar', $namespace->unresolveName('Bar'));
 Assert::same('C', $namespace->unresolveName('bar\C'));
 Assert::same('C\D', $namespace->unresolveName('Bar\C\D'));
 
+foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
+	Assert::same($type, $namespace->unresolveName($type));
+}
+
 
 $classA = $namespace->addClass('A');
 Assert::same($namespace, $classA->getNamespace());