PhpNamespace::add*() throws exception when class/function already exists (BC break)

Author: dg

readme.md

@@ -574,7 +574,7 @@ $class = new Nette\PhpGenerator\ClassType('Task');
 $namespace->add($class);
 ```
 
-If the class already exists, it will be overwritten.
+If the class already exists, it throws exception.
 
 You can define use-statements:
 

src/PhpGenerator/PhpNamespace.php

@@ -242,7 +242,9 @@ public function add(ClassType $class): static
 		}
 
 		$lower = strtolower($name);
-		if ($orig = array_change_key_case($this->aliases[self::NAME_NORMAL])[$lower] ?? null) {
+		if (isset($this->classes[$lower]) && $this->classes[$lower] !== $class) {
+			throw new Nette\InvalidStateException("Cannot add '$name', because it already exists.");
+		} elseif ($orig = array_change_key_case($this->aliases[self::NAME_NORMAL])[$lower] ?? null) {
 			throw new Nette\InvalidStateException("Name '$name' used already as alias for $orig.");
 		}
 
@@ -286,7 +288,9 @@ public function removeClass(string $name): static
 	public function addFunction(string $name): GlobalFunction
 	{
 		$lower = strtolower($name);
-		if ($orig = array_change_key_case($this->aliases[self::NAME_FUNCTION])[$lower] ?? null) {
+		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::NAME_FUNCTION])[$lower] ?? null) {
 			throw new Nette\InvalidStateException("Name '$name' used already as alias for $orig.");
 		}
 

tests/PhpGenerator/PhpNamespace.add.phpt

@@ -33,3 +33,13 @@ class B
 // namespaces are not changed
 Assert::null($classA->getNamespace());
 Assert::same('X', $classB->getNamespace()->getName());
+
+
+// duplicity
+Assert::noError(function () use ($namespace, $classA) {
+	$namespace->add($classA);
+});
+
+Assert::exception(function () use ($namespace) {
+	$namespace->add(new ClassType('a'));
+}, Nette\InvalidStateException::class, "Cannot add 'a', because it already exists.");

tests/PhpGenerator/PhpNamespace.phpt

@@ -17,6 +17,10 @@ Assert::same('Foo', $namespace->getName());
 $classA = $namespace->addClass('A');
 Assert::same($namespace, $classA->getNamespace());
 
+Assert::exception(function () use ($namespace) {
+	$namespace->addClass('a');
+}, Nette\InvalidStateException::class, "Cannot add 'a', because it already exists.");
+
 $interfaceB = $namespace->addInterface('B');
 Assert::same($namespace, $interfaceB->getNamespace());
 
@@ -25,7 +29,13 @@ Assert::type(Nette\PhpGenerator\ClassType::class, $namespace->getClasses()['A'])
 $namespace->removeClass('a');
 Assert::count(1, $namespace->getClasses());
 
+
 $function = $namespace->addFunction('foo');
+
+Assert::exception(function () use ($namespace) {
+	$namespace->addFunction('Foo');
+}, Nette\InvalidStateException::class, "Cannot add 'Foo', because it already exists.");
+
 Assert::count(1, $namespace->getFunctions());
 Assert::same($function, $namespace->getFunctions()['foo']);
 $namespace->removeFunction('FOO');