added validator for types

Author: dg

src/PhpGenerator/Helpers.php

@@ -117,4 +117,23 @@ public static function createObject(string $class, array $props)
 	{
 		return Dumper::createObject($class, $props);
 	}
+
+
+	public static function validateType(?string $type, bool &$nullable): ?string
+	{
+		if ($type === '' || $type === null) {
+			return  null;
+		}
+		if (!preg_match('#(?:
+			\?[\w\\\\]+|
+			[\w\\\\]+ (?: (&[\w\\\\]+)* | (\|[\w\\\\]+)* )
+		)()$#xAD', $type)) {
+			throw new Nette\InvalidArgumentException("Value '$type' is not valid type.");
+		}
+		if ($type[0] === '?') {
+			$nullable = true;
+			return substr($type, 1);
+		}
+		return $type;
+	}
 }

src/PhpGenerator/Parameter.php

@@ -56,11 +56,7 @@ public function isReference(): bool
 	/** @return static */
 	public function setType(?string $type): self
 	{
-		if ($type && $type[0] === '?') {
-			$type = substr($type, 1);
-			$this->nullable = true;
-		}
-		$this->type = $type;
+		$this->type = Helpers::validateType($type, $this->nullable);
 		return $this;
 	}
 
@@ -74,15 +70,14 @@ public function getType(): ?string
 	/** @deprecated  use setType() */
 	public function setTypeHint(?string $type): self
 	{
-		$this->type = $type;
-		return $this;
+		return $this->setType($type);
 	}
 
 
 	/** @deprecated  use getType() */
 	public function getTypeHint(): ?string
 	{
-		return $this->type;
+		return $this->getType();
 	}
 
 

src/PhpGenerator/Property.php

@@ -76,11 +76,7 @@ public function isStatic(): bool
 	/** @return static */
 	public function setType(?string $type): self
 	{
-		if ($type && $type[0] === '?') {
-			$type = substr($type, 1);
-			$this->nullable = true;
-		}
-		$this->type = $type;
+		$this->type = Helpers::validateType($type, $this->nullable);
 		return $this;
 	}
 

src/PhpGenerator/Traits/FunctionLike.php

@@ -127,11 +127,7 @@ public function isVariadic(): bool
 	/** @return static */
 	public function setReturnType(?string $type): self
 	{
-		if ($type && $type[0] === '?') {
-			$type = substr($type, 1);
-			$this->returnNullable = true;
-		}
-		$this->returnType = $type;
+		$this->returnType = Nette\PhpGenerator\Helpers::validateType($type, $this->returnNullable);
 		return $this;
 	}
 

tests/PhpGenerator/invalidNames.phpt

@@ -109,6 +109,10 @@ Assert::exception(function () {
 	new Nette\PhpGenerator\Property('*');
 }, Nette\InvalidArgumentException::class);
 
+Assert::exception(function () {
+	(new Nette\PhpGenerator\Property('foo'))->setType('a b');
+}, Nette\InvalidArgumentException::class);
+
 
 Assert::noError(function () {
 	new Nette\PhpGenerator\Parameter('Iñtërnâtiônàlizætiøn');
@@ -130,6 +134,10 @@ Assert::exception(function () {
 	new Nette\PhpGenerator\Parameter('$test');
 }, Nette\InvalidArgumentException::class);
 
+Assert::exception(function () {
+	(new Nette\PhpGenerator\Parameter('foo'))->setType('a b');
+}, Nette\InvalidArgumentException::class);
+
 
 Assert::noError(function () {
 	new Nette\PhpGenerator\Method('Iñtërnâtiônàlizætiøn');
@@ -147,6 +155,10 @@ Assert::exception(function () {
 	new Nette\PhpGenerator\Method('*');
 }, Nette\InvalidArgumentException::class);
 
+Assert::exception(function () {
+	(new Nette\PhpGenerator\Method('foo'))->setReturnType('a b');
+}, Nette\InvalidArgumentException::class);
+
 
 Assert::noError(function () {
 	new Nette\PhpGenerator\GlobalFunction('Iñtërnâtiônàlizætiøn');