added Type::with()

Author: dg

src/Utils/Type.php

@@ -155,6 +155,23 @@ public function __toString(): string
 	}
 
 
+	/**
+	 * Returns a new type that accepts both the current type and the given type.
+	 */
+	public function with(string|self $type): self
+	{
+		$type = is_string($type) ? self::fromString($type) : $type;
+		return match (true) {
+			$this->allows($type) => $this,
+			$type->allows($this) => $type,
+			default => new self(array_unique(
+				array_merge($this->isIntersection() ? [$this] : $this->types, $type->isIntersection() ? [$type] : $type->types),
+				SORT_REGULAR,
+			), '|'),
+		};
+	}
+
+
 	/**
 	 * Returns the array of subtypes that make up the compound type as strings.
 	 * @return array<int, string|string[]>

tests/Utils/Type.with.phpt

@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Test: Nette\Utils\Type::with()
+ */
+
+declare(strict_types=1);
+
+use Nette\Utils\Type;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Foo
+{
+}
+
+class Bar
+{
+}
+
+class FooChild extends Foo
+{
+}
+
+
+function testTypeHint(string $expected, Type $type): void
+{
+	Assert::same($expected, (string) $type);
+	eval("function($expected \$_) {};");
+}
+
+
+testTypeHint('string|int', Type::fromString('string')->with('int'));
+testTypeHint('string|int|null', Type::fromString('string')->with('?int'));
+testTypeHint('string|int|null', Type::fromString('?string')->with('int'));
+testTypeHint('string|int|null', Type::fromString('?string')->with('?int'));
+testTypeHint('string|int|bool', Type::fromString('string|int')->with('bool'));
+testTypeHint('string|int|bool', Type::fromString('string|int')->with('bool|int'));
+testTypeHint('(Foo&Bar)|string', Type::fromString('Foo&Bar')->with('string'));
+testTypeHint('Foo', Type::fromString('Foo&Bar')->with('Foo'));
+testTypeHint('string|(Foo&Bar)', Type::fromString('string')->with('Foo&Bar'));
+testTypeHint('(Foo&Bar)|(Foo&FooChild)', Type::fromString('Foo&Bar')->with('Foo&FooChild'));
+testTypeHint('(Foo&Bar)|string|int', Type::fromString('(Foo&Bar)|string')->with('int'));
+
+// mixed
+testTypeHint('mixed', Type::fromString('string')->with('mixed'));
+testTypeHint('mixed', Type::fromString('mixed')->with('null'));
+
+// Already allows - returns same instance
+$type = Type::fromString('string');
+Assert::same($type, $type->with('string'));
+
+$type = Type::fromString('string|int');
+Assert::same($type, $type->with('string'));
+
+$type = Type::fromString('?string');
+Assert::same($type, $type->with('string'));
+Assert::same($type, $type->with('null'));
+
+$type = Type::fromString('mixed');
+Assert::same($type, $type->with('string'));
+Assert::same($type, $type->with('Foo'));
+
+$type = Type::fromString('Foo');
+Assert::same($type, $type->with('FooChild'));
+
+$type = Type::fromString('Foo|Bar');
+Assert::same($type, $type->with('FooChild'));
+
+$type = Type::fromString('string|int|bool');
+Assert::same($type, $type->with('int'));
+
+
+// with Type object
+testTypeHint('string|int', Type::fromString('string')->with(Type::fromString('int')));