ClassType: checks whether names are valid

Author: dg

src/PhpGenerator/ClassType.php

@@ -231,9 +231,10 @@ public function isAbstract()
 	 */
 	public function setExtends($names)
 	{
-		if (!is_string($names) && !(is_array($names) && Nette\Utils\Arrays::every($names, 'is_string'))) {
+		if (!is_string($names) && !is_array($names)) {
 			throw new Nette\InvalidArgumentException('Argument must be string or string[].');
 		}
+		$this->validate((array) $names);
 		$this->extends = $names;
 		return $this;
 	}
@@ -254,8 +255,9 @@ public function getExtends()
 	 */
 	public function addExtend($name)
 	{
+		$this->validate([$name]);
 		$this->extends = (array) $this->extends;
-		$this->extends[] = (string) $name;
+		$this->extends[] = $name;
 		return $this;
 	}
 
@@ -266,6 +268,7 @@ public function addExtend($name)
 	 */
 	public function setImplements(array $names)
 	{
+		$this->validate($names);
 		$this->implements = $names;
 		return $this;
 	}
@@ -286,7 +289,8 @@ public function getImplements()
 	 */
 	public function addImplement($name)
 	{
-		$this->implements[] = (string) $name;
+		$this->validate([$name]);
+		$this->implements[] = $name;
 		return $this;
 	}
 
@@ -297,6 +301,7 @@ public function addImplement($name)
 	 */
 	public function setTraits(array $names)
 	{
+		$this->validate($names);
 		$this->traits = array_fill_keys($names, []);
 		return $this;
 	}
@@ -317,6 +322,7 @@ public function getTraits()
 	 */
 	public function addTrait($name, array $resolutions = [])
 	{
+		$this->validate([$name]);
 		$this->traits[$name] = $resolutions;
 		return $this;
 	}
@@ -492,4 +498,14 @@ public function addMethod($name)
 		return $this->methods[$name] = $method;
 	}
 
+
+	private function validate(array $names)
+	{
+		foreach ($names as $name) {
+			if (!Helpers::isNamespaceIdentifier($name, TRUE)) {
+				throw new Nette\InvalidArgumentException("Value '$name' is not valid class name.");
+			}
+		}
+	}
+
 }

tests/PhpGenerator/invalidNames.phpt

@@ -58,6 +58,36 @@ Assert::exception(function () {
 }, Nette\InvalidArgumentException::class);
 
 
+$class = new Nette\PhpGenerator\ClassType('Abc');
+Assert::exception(function () use ($class) {
+	$class->setExtends('*');
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->setExtends(['A', '*']);
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->addExtend('*');
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->setImplements(['A', '*']);
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->addImplement('*');
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->setTraits(['A', '*']);
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+Assert::exception(function () use ($class) {
+	$class->addTrait('*');
+}, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
+
+
 Assert::noError(function () {
 	new Nette\PhpGenerator\Property('Iñtërnâtiônàlizætiøn');
 });