ClassType, Method: class types are not resolved when namespace is not…

… specified [#21] Fixed BC break introduced in v2.3.3
nette · Nov 29, 2015 · 224730a · 224730a
1 parent c0b2934
commit 224730a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -120,9 +120,9 @@ public function __toString()
  . ";\n";
  }
 
- $namespace = $this->namespace ?: new PhpNamespace;
+ $namespace = $this->namespace;
  $mapper = function (array $arr) use ($namespace) {
- return array_map(array($namespace, 'unresolveName'), $arr);
+ return $namespace ? array_map(array($namespace, 'unresolveName'), $arr) : $arr;
  };
 
  return Strings::normalize(

diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -103,12 +103,11 @@ public function __construct($name = NULL)
  */
  public function __toString()
  {
- $namespace = $this->namespace ?: new PhpNamespace;
  $parameters = array();
  foreach ($this->parameters as $param) {
  $variadic = $this->variadic && $param === end($this->parameters);
-
- $parameters[] = ($param->getTypeHint() ? $namespace->unresolveName($param->getTypeHint()) . ' ' : '')
+ $hint = $param->getTypeHint();
+ $parameters[] = ($hint ? ($this->namespace ? $this->namespace->unresolveName($hint) : $hint) . ' ' : '')
  . ($param->isReference() ? '&' : '')
  . ($variadic ? '...' : '')
  . '$' . $param->getName()
@@ -129,7 +128,7 @@ public function __toString()
  . ' ' . $this->name
  . '(' . implode(', ', $parameters) . ')'
  . ($this->uses ? ' use (' . implode(', ', $uses) . ')' : '')
- . ($this->returnType ? ': ' . $namespace->unresolveName($this->returnType) : '')
+ . ($this->returnType ? ': ' . ($this->namespace ? $this->namespace->unresolveName($this->returnType) : $this->returnType) : '')
  . ($this->abstract || $this->body === FALSE ? ';'
  : ($this->name ? "\n" : ' ') . "{\n" . Nette\Utils\Strings::indent(ltrim(rtrim($this->body) . "\n"), 1) . '}');
  }

diff --git a/tests/PhpGenerator/PhpNamespace.fqn1.expect b/tests/PhpGenerator/PhpNamespace.fqn1.expect
@@ -1,15 +1,15 @@
-class Example extends ParentClass implements One, Two
+class Example extends \ParentClass implements One, \Two
 {
  use Three;
- use Four;
+ use \Four;
 
 
  public function one(): One
  {
  }
 
 
- public function two(One $one, Two $two): Two
+ public function two(One $one, \Two $two): \Two
  {
  }