Factory methods from() are using PhpNamespace

Author: dg

src/PhpGenerator/ClassType.php

@@ -66,25 +66,16 @@ class ClassType extends Nette\Object
 	public static function from($from)
 	{
 		$from = $from instanceof \ReflectionClass ? $from : new \ReflectionClass($from);
-		$class = new static($from->getShortName());
+		$class = new static($from->getShortName(), new PhpNamespace($from->getNamespaceName()));
 		$class->type = $from->isInterface() ? 'interface' : ($from->isTrait() ? 'trait' : 'class');
 		$class->final = $from->isFinal() && $class->type === 'class';
 		$class->abstract = $from->isAbstract() && $class->type === 'class';
 		$class->implements = $from->getInterfaceNames();
 		$class->comment = $from->getDocComment() ? preg_replace('#^\s*\* ?#m', '', trim($from->getDocComment(), "/* \r\n\t")) : NULL;
-		$namespace = $from->getNamespaceName();
 		if ($from->getParentClass()) {
 			$class->extends = $from->getParentClass()->getName();
-			if ($namespace) {
-				$class->extends = Strings::startsWith($class->extends, "$namespace\\") ? substr($class->extends, strlen($namespace) + 1) : '\\' . $class->extends;
-			}
 			$class->implements = array_diff($class->implements, $from->getParentClass()->getInterfaceNames());
 		}
-		if ($namespace) {
-			foreach ($class->implements as & $interface) {
-				$interface = Strings::startsWith($interface, "$namespace\\") ? substr($interface, strlen($namespace) + 1) : '\\' . $interface;
-			}
-		}
 		foreach ($from->getProperties() as $prop) {
 			if ($prop->getDeclaringClass() == $from) { // intentionally ==
 				$class->properties[$prop->getName()] = Property::from($prop);

src/PhpGenerator/Method.php

@@ -83,8 +83,7 @@ public static function from($from)
 		$method->variadic = PHP_VERSION_ID >= 50600 && $from->isVariadic();
 		$method->comment = $from->getDocComment() ? preg_replace('#^\s*\* ?#m', '', trim($from->getDocComment(), "/* \r\n\t")) : NULL;
 		if (PHP_VERSION_ID >= 70000 && $from->hasReturnType()) {
-			$returnType = $from->getReturnType();
-			$method->returnType = $returnType->isBuiltin() ? (string) $returnType : '\\' . $returnType;
+			$method->returnType = (string) $from->getReturnType();
 		}
 		return $method;
 	}

src/PhpGenerator/Parameter.php

@@ -39,29 +39,22 @@ public static function from(\ReflectionParameter $from)
 		$param = new static($from->getName());
 		$param->reference = $from->isPassedByReference();
 		if (PHP_VERSION_ID >= 70000) {
-			$type = $from->getType();
-			$param->typeHint = $type ? ($type->isBuiltin() ? '' : '\\') . $type : NULL;
+			$param->typeHint = $from->hasType() ? (string) $from->getType() : NULL;
 		} elseif ($from->isArray() || $from->isCallable()) {
 			$param->typeHint = $from->isArray() ? 'array' : 'callable';
 		} else {
 			try {
-				$param->typeHint = $from->getClass() ? '\\' . $from->getClass()->getName() : NULL;
+				$param->typeHint = $from->getClass() ? $from->getClass()->getName() : NULL;
 			} catch (\ReflectionException $e) {
 				if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
-					$param->typeHint = '\\' . $m[1];
+					$param->typeHint = $m[1];
 				} else {
 					throw $e;
 				}
 			}
 		}
 		$param->optional = $from->isDefaultValueAvailable();
 		$param->defaultValue = $from->isDefaultValueAvailable() ? $from->getDefaultValue() : NULL;
-
-		$namespace = $from->getDeclaringClass() ? $from->getDeclaringClass()->getNamespaceName() : NULL;
-		$namespace = $namespace ? "\\$namespace\\" : '\\';
-		if ($param->typeHint !== NULL && Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {
-			$param->typeHint = substr($param->typeHint, strlen($namespace));
-		}
 		return $param;
 	}
 

tests/PhpGenerator/Method.returnTypes.phpt

@@ -22,12 +22,12 @@ namespace
 
 	interface A
 	{
-		function testClass() : \A\Foo;
-		function testScalar() : string;
+		function testClass(): \A\Foo;
+		function testScalar(): string;
 	}
 
 	$method = Method::from(A::class .'::testClass');
-	Assert::same('\A\Foo', $method->getReturnType());
+	Assert::same('A\Foo', $method->getReturnType());
 
 	$method = Method::from(A::class .'::testScalar');
 	Assert::same('string', $method->getReturnType());