added support for DNF types

Author: dg

composer.json

@@ -20,7 +20,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "^2.4",
-		"nikic/php-parser": "^4.14",
+		"nikic/php-parser": "^4.15",
 		"tracy/tracy": "^2.8",
 		"phpstan/phpstan": "^1.0"
 	},

src/PhpGenerator/Helpers.php

@@ -170,14 +170,19 @@ public static function createObject(string $class, array $props): object
 
 	public static function validateType(?string $type, bool &$nullable): ?string
 	{
+		$nullable = false;
 		if ($type === '' || $type === null) {
 			return null;
 		}
 
-		if (!preg_match('#(?:
-			\?[\w\\\\]+|
-			[\w\\\\]+ (?: (&[\w\\\\]+)* | (\|[\w\\\\]+)* )
-		)()$#xAD', $type)) {
+		if (!preg_match(<<<'XX'
+			~(?n)
+			(
+				\?? (?<type> [\w\\]+)|
+				(?<intersection> (?&type) (& (?&type))+  )|
+				(?<upart> (?&type) | \( (?&intersection) \) )  (\| (?&upart) )+
+			)$~xAD
+			XX, $type)) {
 			throw new Nette\InvalidArgumentException("Value '$type' is not valid type.");
 		}
 

tests/PhpGenerator/Helpers.validateType.phpt

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\Helpers;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$foo = false;
+Assert::null(Helpers::validateType('', $foo));
+Assert::null(Helpers::validateType(null, $foo));
+Assert::same('Foo', Helpers::validateType('Foo', $foo));
+Assert::same('Foo\Bar', Helpers::validateType('Foo\Bar', $foo));
+Assert::same('\Foo\Bar', Helpers::validateType('\Foo\Bar', $foo));
+Assert::same('Foo', Helpers::validateType('?Foo', $foo));
+Assert::true($foo);
+Assert::same('Foo|Bar', Helpers::validateType('Foo|Bar', $foo));
+Assert::same('Foo&Bar\X', Helpers::validateType('Foo&Bar\X', $foo));
+Assert::same('(Foo&Bar\X)|Baz', Helpers::validateType('(Foo&Bar\X)|Baz', $foo));
+Assert::same('Abc\C|(Abc\X&Abc\D)|null', Helpers::validateType('Abc\C|(Abc\X&Abc\D)|null', $foo));
+
+Assert::exception(
+	fn() => Helpers::validateType('-', $foo),
+	Nette\InvalidArgumentException::class,
+);
+
+Assert::exception(
+	fn() => Helpers::validateType('?Foo|Bar', $foo),
+	Nette\InvalidArgumentException::class,
+);
+
+Assert::exception(
+	fn() => Helpers::validateType('(Foo)', $foo),
+	Nette\InvalidArgumentException::class,
+);
+
+Assert::exception(
+	fn() => Helpers::validateType('(Foo&Bar)', $foo),
+	Nette\InvalidArgumentException::class,
+);

tests/PhpGenerator/expected/ClassType.from.82.expect

@@ -1,5 +1,8 @@
 readonly class Class13
 {
+	public function func(C|(X&D)|null $foo): (A&B)|null
+	{
+	}
 }
 
 trait Trait13

tests/PhpGenerator/expected/Extractor.classes.82.expect

@@ -6,6 +6,9 @@ namespace Abc;
 
 readonly class Class13
 {
+	public function func(C|(X&D)|null $foo): (A&B)|null
+	{
+	}
 }
 
 trait Trait13

tests/PhpGenerator/fixtures/classes.82.php

@@ -6,6 +6,9 @@
 
 readonly class Class13
 {
+	public function func(C|(X&D)|null $foo): (A&B)|null
+	{
+	}
 }