Helpers: uses Validator::isTypeDeclaration()

nette · Mar 13, 2023 · b9ca0b4 · b9ca0b4
1 parent 43d6101
commit b9ca0b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": ">=8.0 <8.3",
-		"nette/utils": "^3.2.7 || ^4.0"
+		"nette/utils": "^3.2.9 || ^4.0"
 	},
 	"require-dev": {
 		"nette/tester": "^2.4",

diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
@@ -169,16 +169,7 @@ public static function validateType(?string $type, bool &$nullable): ?string
 	{
 		if ($type === '' || $type === null) {
 			return null;
-		}
-
-		if (!preg_match(<<<'XX'
-			~(?n)
-			(
-				\?? (?<type> [\w\\]+)|
-				(?<intersection> (?&type) (& (?&type))+  )|
-				(?<upart> (?&type) | \( (?&intersection) \) )  (\| (?&upart) )+
-			)$~xAD
-			XX, $type)) {
+		} elseif (!Nette\Utils\Validators::isTypeDeclaration($type)) {
 			throw new Nette\InvalidArgumentException("Value '$type' is not valid type.");
 		}