added ClassLike::setNamespace(), replaces parameter $namespace in constructor

Author: dg

src/PhpGenerator/ClassLike.php

@@ -8,7 +8,7 @@
 namespace Nette\PhpGenerator;
 
 use Nette;
-use function array_map, is_object, str_contains, strtolower;
+use function array_map, func_num_args, is_object, str_contains, strtolower;
 
 
 /**
@@ -62,13 +62,13 @@ public static function fromCode(string $code): static
 	}
 
 
-	public function __construct(string $name, ?PhpNamespace $namespace = null)
+	public function __construct(string $name)
 	{
 		if (str_contains($name, '\\')) {
 			$this->namespace = new PhpNamespace(Helpers::extractNamespace($name));
 			$this->setName(Helpers::extractShortName($name));
 		} else {
-			$this->namespace = $namespace;
+			$this->namespace = func_num_args() > 1 ? func_get_arg(1) : null; // backward compatibility
 			$this->setName($name);
 		}
 	}
@@ -80,7 +80,14 @@ public function __toString(): string
 	}
 
 
-	/** @deprecated  an object can be in multiple namespaces */
+	/** @internal */
+	public function setNamespace(?PhpNamespace $namespace): static
+	{
+		$this->namespace = $namespace;
+		return $this;
+	}
+
+
 	public function getNamespace(): ?PhpNamespace
 	{
 		return $this->namespace;

src/PhpGenerator/ClassType.php

@@ -8,7 +8,7 @@
 namespace Nette\PhpGenerator;
 
 use Nette;
-use function array_diff, array_map, strtolower;
+use function array_diff, array_map, func_num_args, strtolower;
 
 
 /**
@@ -37,13 +37,11 @@ final class ClassType extends ClassLike
 	private array $implements = [];
 
 
-	public function __construct(?string $name = null, ?PhpNamespace $namespace = null)
+	public function __construct(?string $name = null)
 	{
+		parent::__construct($name ?? 'foo', func_num_args() > 1 ? func_get_arg(1) : null); // backward compatibility
 		if ($name === null) {
-			parent::__construct('foo', $namespace);
 			$this->setName(null);
-		} else {
-			parent::__construct($name, $namespace);
 		}
 	}
 

src/PhpGenerator/PhpNamespace.php

@@ -278,7 +278,7 @@ public function add(ClassType|InterfaceType|TraitType|EnumType $class): static
 	 */
 	public function addClass(string $name): ClassType
 	{
-		$this->add($class = new ClassType($name, $this));
+		$this->add($class = (new ClassType($name))->setNamespace($this));
 		return $class;
 	}
 
@@ -288,7 +288,7 @@ public function addClass(string $name): ClassType
 	 */
 	public function addInterface(string $name): InterfaceType
 	{
-		$this->add($iface = new InterfaceType($name, $this));
+		$this->add($iface = (new InterfaceType($name))->setNamespace($this));
 		return $iface;
 	}
 
@@ -298,7 +298,7 @@ public function addInterface(string $name): InterfaceType
 	 */
 	public function addTrait(string $name): TraitType
 	{
-		$this->add($trait = new TraitType($name, $this));
+		$this->add($trait = (new TraitType($name))->setNamespace($this));
 		return $trait;
 	}
 
@@ -308,7 +308,7 @@ public function addTrait(string $name): TraitType
 	 */
 	public function addEnum(string $name): EnumType
 	{
-		$this->add($enum = new EnumType($name, $this));
+		$this->add($enum = (new EnumType($name))->setNamespace($this));
 		return $enum;
 	}