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' : (PHP_VERSION_ID >= 50400 && $from->isTrait() ? 'trait' : 'class');
 		$class->final = $from->isFinal() && $class->type === 'class';
 		$class->abstract = $from->isAbstract() && $class->type === 'class';
 		$class->implements = $from->getInterfaceNames();
 		$class->documents = $from->getDocComment() ? array(preg_replace('#^\s*\* ?#m', '', trim($from->getDocComment(), "/* \r\n\t"))) : array();
-		$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/Parameter.php

@@ -44,23 +44,17 @@ public static function from(\ReflectionParameter $from)
 			$param->typeHint = '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 = PHP_VERSION_ID < 50407 ? $from->isOptional() || ($param->typeHint && $from->allowsNull()) : $from->isDefaultValueAvailable();
 		$param->defaultValue = (PHP_VERSION_ID === 50316 ? $from->isOptional() : $from->isDefaultValueAvailable()) ? $from->getDefaultValue() : NULL;
-
-		$namespace = $from->getDeclaringClass() ? $from->getDeclaringClass()->getNamespaceName() : NULL;
-		$namespace = $namespace ? "\\$namespace\\" : '\\';
-		if (Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {
-			$param->typeHint = substr($param->typeHint, strlen($namespace));
-		}
 		return $param;
 	}