PhpFile::addNamespace() accepts PhpNamespace object (#68)

Author: Nathan Esayeas

readme.md

@@ -505,6 +505,9 @@ $namespace = $file->addNamespace('Foo');
 $class = $namespace->addClass('A');
 $class->addMethod('hello');
 
+// or insert an existing namespace into the file
+// $file->addNamespace(new Nette\PhpGenerator\PhpNamespace('Foo'));
+
 echo $file;
 
 // or use PsrPrinter for output compatible with PSR-2 / PSR-12

src/PhpGenerator/PhpFile.php

@@ -56,15 +56,23 @@ public function addTrait(string $name): ClassType
 	}
 
 
-	public function addNamespace(string $name): PhpNamespace
+	/** @param  string|PhpNamespace  $namespace */
+	public function addNamespace($namespace): PhpNamespace
 	{
-		if (!isset($this->namespaces[$name])) {
-			$this->namespaces[$name] = new PhpNamespace($name);
-			foreach ($this->namespaces as $namespace) {
-				$namespace->setBracketedSyntax(count($this->namespaces) > 1 && isset($this->namespaces['']));
-			}
+		if ($namespace instanceof PhpNamespace) {
+			$res = $this->namespaces[$namespace->getName()] = $namespace;
+
+		} elseif (is_string($namespace)) {
+			$res = $this->namespaces[$namespace] = $this->namespaces[$namespace] ?? new PhpNamespace($namespace);
+
+		} else {
+			throw new Nette\InvalidArgumentException('Argument must be string|PhpNamespace.');
+		}
+
+		foreach ($this->namespaces as $namespace) {
+			$namespace->setBracketedSyntax(count($this->namespaces) > 1 && isset($this->namespaces['']));
 		}
-		return $this->namespaces[$name];
+		return $res;
 	}
 
 

tests/PhpGenerator/PhpFile.addNamespace.phpt

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\PhpFile;
+use Nette\PhpGenerator\PhpNamespace;
+
+require __DIR__ . '/../bootstrap.php';
+
+$namespace = new PhpNamespace('Foo');
+$namespace->addClass('Bar');
+
+$phpFile = new PhpFile;
+$phpFile->addNamespace('Foo');
+$phpFile->addNamespace($namespace); // overwrite
+
+
+same('<?php
+
+namespace Foo;
+
+class Bar
+{
+}
+', (string) $phpFile);