ClassType: namespace is passed to methods immediately

nette · Sep 1, 2015 · ed06e30 · ed06e30
1 parent 42e818c
commit ed06e30
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -83,7 +83,7 @@ public static function from($from)
 		}
 		foreach ($from->getMethods() as $method) {
 			if ($method->getDeclaringClass() == $from) { // intentionally ==
-				$class->methods[$method->getName()] = Method::from($method);
+				$class->methods[$method->getName()] = Method::from($method)->setNamespace($class->namespace);
 			}
 		}
 		return $class;
@@ -120,10 +120,6 @@ public function __toString()
 			return array_map([$this->namespace ?: new PhpNamespace, 'unresolveName'], $arr);
 		};
 
-		foreach ($this->methods as $method) {
-			$method->setNamespace($this->namespace);
-		}
-
 		return Strings::normalize(
 			($this->comment ? str_replace("\n", "\n * ", "/**\n" . $this->comment) . "\n */\n" : '')
 			. ($this->abstract ? 'abstract ' : '')
@@ -472,7 +468,7 @@ public function setMethods(array $methods)
 			if (!$v instanceof Method) {
 				throw new Nette\InvalidArgumentException('Argument must be Nette\PhpGenerator\Method[].');
 			}
-			$this->methods[$v->getName()] = $v;
+			$this->methods[$v->getName()] = $v->setNamespace($this->namespace);
 		}
 		return $this;
 	}
@@ -505,7 +501,7 @@ public function getMethod($name)
 	 */
 	public function addMethod($name)
 	{
-		$method = new Method($name);
+		$method = (new Method($name))->setNamespace($this->namespace);
 		if ($this->type === 'interface') {
 			$method->setVisibility(NULL)->setBody(FALSE);
 		} else {