PhpNamespace::add() accepts GlobalFunction

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -252,23 +252,25 @@ public function simplifyName(string $name, string $of = self::NameNormal): strin
 
 
 	/**
-	 * Adds a class-like type to the namespace. If it already exists, throws an exception.
+	 * Adds a class-like type or function to the namespace. If it already exists, throws an exception.
 	 */
-	public function add(ClassType|InterfaceType|TraitType|EnumType $class): static
+	public function add(ClassType|InterfaceType|TraitType|EnumType|GlobalFunction $item): static
 	{
-		$name = $class->getName();
-		if ($name === null) {
-			throw new Nette\InvalidArgumentException('Class does not have a name.');
-		}
-
+		$name = $item->getName() ?? throw new Nette\InvalidArgumentException('Class does not have a name.');
 		$lower = strtolower($name);
-		if (isset($this->classes[$lower]) && $this->classes[$lower] !== $class) {
+		[$list, $type] = $item instanceof GlobalFunction ? [$this->functions, self::NameFunction] : [$this->classes, self::NameNormal];
+		if (isset($list[$lower]) && $list[$lower] !== $item) {
 			throw new Nette\InvalidStateException("Cannot add '$name', because it already exists.");
-		} elseif ($orig = array_change_key_case($this->aliases[self::NameNormal])[$lower] ?? null) {
+		} elseif ($orig = array_change_key_case($this->aliases[$type])[$lower] ?? null) {
 			throw new Nette\InvalidStateException("Name '$name' used already as alias for $orig.");
 		}
 
-		$this->classes[$lower] = $class;
+		if ($item instanceof GlobalFunction) {
+			$this->functions[$lower] = $item;
+		} else {
+			$this->classes[$lower] = $item;
+		}
+
 		return $this;
 	}
 
@@ -352,14 +354,8 @@ public function removeClass(string $name): static
 	 */
 	public function addFunction(string $name): GlobalFunction
 	{
-		$lower = strtolower($name);
-		if (isset($this->functions[$lower])) {
-			throw new Nette\InvalidStateException("Cannot add '$name', because it already exists.");
-		} elseif ($orig = array_change_key_case($this->aliases[self::NameFunction])[$lower] ?? null) {
-			throw new Nette\InvalidStateException("Name '$name' used already as alias for $orig.");
-		}
-
-		return $this->functions[$lower] = new GlobalFunction($name);
+		$this->add($function = new GlobalFunction($name));
+		return $function;
 	}
 
 

tests/PhpGenerator/PhpNamespace.add.phpt

@@ -1,6 +1,7 @@
 <?php declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\GlobalFunction;
 use Nette\PhpGenerator\PhpNamespace;
 use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
@@ -14,7 +15,8 @@ testException('adding class without name throws exception', function () {
 test('adding classes preserves their original namespaces', function () {
 	$namespace = (new PhpNamespace('Foo'))
 		->add($classA = new ClassType('A'))
-		->add($classB = new ClassType('B', new PhpNamespace('X')));
+		->add($classB = new ClassType('B', new PhpNamespace('X')))
+		->add(new GlobalFunction('myFunc'));
 
 	same(
 		<<<'XX'
@@ -28,6 +30,10 @@ test('adding classes preserves their original namespaces', function () {
 			{
 			}
 
+			function myFunc()
+			{
+			}
+
 			XX,
 		(string) $namespace,
 	);