PhpNamespace: global namespace represents '' instead of NULL (BC break)

Author: dg

src/PhpGenerator/PhpFile.php

@@ -67,7 +67,7 @@ public function addTrait($name)
 
 
 	/**
-	 * @param  string NULL means global namespace
+	 * @param  string
 	 * @return PhpNamespace
 	 */
 	public function addNamespace($name)
@@ -85,7 +85,7 @@ public function addNamespace($name)
 	public function __toString()
 	{
 		foreach ($this->namespaces as $namespace) {
-			$namespace->setBracketedSyntax(count($this->namespaces) > 1 && isset($this->namespaces[NULL]));
+			$namespace->setBracketedSyntax(count($this->namespaces) > 1 && isset($this->namespaces['']));
 		}
 
 		return Strings::normalize(

src/PhpGenerator/PhpNamespace.php

@@ -45,11 +45,11 @@ class PhpNamespace
 
 
 	/**
-	 * @param  string|NULL
+	 * @param  string
 	 */
 	public function __construct($name)
 	{
-		if ($name && !Helpers::isNamespace($name)) {
+		if ($name !== '' && !Helpers::isNamespace($name)) {
 			throw new Nette\InvalidArgumentException("Value '$name' is not valid name.");
 		}
 		$this->name = (string) $name;
@@ -66,11 +66,11 @@ public function setName($name)
 
 
 	/**
-	 * @return string|NULL
+	 * @return string
 	 */
 	public function getName()
 	{
-		return $this->name ?: NULL;
+		return $this->name;
 	}
 
 

tests/PhpGenerator/PhpNamespace.phpt

@@ -14,6 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $namespace = new PhpNamespace('');
 
+Assert::same('', $namespace->getName());
 Assert::same('A', $namespace->unresolveName('A'));
 Assert::same('foo\A', $namespace->unresolveName('foo\A'));
 
@@ -30,6 +31,7 @@ foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self
 
 $namespace = new PhpNamespace('Foo');
 
+Assert::same('Foo', $namespace->getName());
 Assert::same('\A', $namespace->unresolveName('\A'));
 Assert::same('\A', $namespace->unresolveName('A'));
 Assert::same('A', $namespace->unresolveName('foo\A'));

tests/PhpGenerator/invalidNames.phpt

@@ -13,10 +13,13 @@ require __DIR__ . '/../bootstrap.php';
 
 Assert::noError(function () {
 	new Nette\PhpGenerator\PhpNamespace(''); // global namespace
-	new Nette\PhpGenerator\PhpNamespace(NULL); // global namespace for back compatibility
 	new Nette\PhpGenerator\PhpNamespace('Iñtërnâti\ônàlizætiøn');
 });
 
+Assert::exception(function () {
+	new Nette\PhpGenerator\PhpNamespace(NULL);
+}, Nette\InvalidArgumentException::class);
+
 Assert::exception(function () {
 	new Nette\PhpGenerator\PhpNamespace('*');
 }, Nette\InvalidArgumentException::class);