Checks whether names are valid [Closes #24]

Author: dg

src/PhpGenerator/ClassType.php

@@ -141,6 +141,9 @@ public function getNamespace()
 	 */
 	public function setName($name)
 	{
+		if ($name !== NULL && !Helpers::isIdentifier($name)) {
+			throw new Nette\InvalidArgumentException("Value '$name' is not valid class name.");
+		}
 		$this->name = $name;
 		return $this;
 	}

src/PhpGenerator/Method.php

@@ -55,8 +55,10 @@ public function __construct($name)
 	{
 		if ($name === NULL) {
 			throw new Nette\DeprecatedException('For closures use Nette\PhpGenerator\Closure instead of Nette\PhpGenerator\Method.');
+		} elseif (!Helpers::isIdentifier($name)) {
+			throw new Nette\InvalidArgumentException("Value '$name' is not valid name.");
 		}
-		$this->name = (string) $name;
+		$this->name = $name;
 	}
 
 

src/PhpGenerator/PhpNamespace.php

@@ -42,6 +42,9 @@ class PhpNamespace
 	 */
 	public function __construct($name = NULL)
 	{
+		if ($name && !Helpers::isNamespace($name)) {
+			throw new Nette\InvalidArgumentException("Value '$name' is not valid name.");
+		}
 		$this->name = (string) $name;
 	}
 

src/PhpGenerator/Traits/NameAware.php

@@ -7,6 +7,8 @@
 
 namespace Nette\PhpGenerator\Traits;
 
+use Nette;
+
 
 /**
  * @internal
@@ -22,7 +24,10 @@ trait NameAware
 	 */
 	public function __construct($name)
 	{
-		$this->name = (string) $name;
+		if (!Nette\PhpGenerator\Helpers::isIdentifier($name)) {
+			throw new Nette\InvalidArgumentException("Value '$name' is not valid name.");
+		}
+		$this->name = $name;
 	}
 
 

tests/PhpGenerator/invalidNames.phpt

@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Test: Nette\PhpGenerator for files.
+ */
+
+use Tester\Assert;
+
+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('*');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\PhpNamespace('abc abc');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\PhpNamespace('abc\\');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\PhpNamespace('\\abc');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\ClassType(NULL); // anonymous class
+	new Nette\PhpGenerator\ClassType('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\ClassType('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\ClassType('*');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\ClassType('abc abc');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\ClassType('abc\\abc');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\ClassType('\\abc');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\Property('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Property(NULL);
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Property('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Property('*');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\Parameter('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Parameter('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Parameter(NULL);
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Parameter('*');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Parameter('$test');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\Method('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Method('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Method(NULL);
+}, Nette\DeprecatedException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Method('*');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\GlobalFunction('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\GlobalFunction('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\GlobalFunction(NULL);
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\GlobalFunction('*');
+}, Nette\InvalidArgumentException::class);
+
+
+Assert::noError(function () {
+	new Nette\PhpGenerator\Constant('Iñtërnâtiônàlizætiøn');
+});
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Constant(NULL);
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Constant('');
+}, Nette\InvalidArgumentException::class);
+
+Assert::exception(function () {
+	new Nette\PhpGenerator\Constant('*');
+}, Nette\InvalidArgumentException::class);