x

Author: dg

tests/Utils/Type.with.phpt

@@ -16,10 +16,6 @@ class Foo
 {
 }
 
-class Bar
-{
-}
-
 class FooChild extends Foo
 {
 }
@@ -28,7 +24,6 @@ class FooChild extends Foo
 function testTypeHint(string $expected, Type $type): void
 {
 	Assert::same($expected, (string) $type);
-	eval("function($expected \$_) {};");
 }
 
 
@@ -44,6 +39,9 @@ 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'));
 
+// with Type object
+testTypeHint('string|int', Type::fromString('string')->with(Type::fromString('int')));
+
 // mixed
 testTypeHint('mixed', Type::fromString('string')->with('mixed'));
 testTypeHint('mixed', Type::fromString('mixed')->with('null'));
@@ -52,26 +50,18 @@ testTypeHint('mixed', Type::fromString('mixed')->with('null'));
 $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|int|bool');
+Assert::same($type, $type->with('int'));
 
 $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'));
+$with = Type::fromString('mixed');
+Assert::same($with, Type::fromString('string')->with($with));
 
 $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')));
+$with = Type::fromString('Foo');
+Assert::same($with, Type::fromString('Foo&Bar')->with($with));