TASK: UnionType rename to containsNull, withoutNull

Author: mhsdesign

src/Target/Php/Transpiler/TypeReference/TypeReferenceTranspiler.php

@@ -51,11 +51,11 @@ public function transpile(TypeReferenceNode $typeReferenceNode): string
             default => $this->transpileNonUnionType($type, $typeReferenceNode)
         };
     }
-    
+
     private function transpileUnionType(UnionType $unionType, TypeReferenceNode $typeReferenceNode): string
     {
-        if ($unionType->isNullable()) {
-            $nonNullable = $unionType->withoutNullable();
+        if ($unionType->containsNull()) {
+            $nonNullable = $unionType->withoutNull();
             if ($nonNullable instanceof UnionType) {
                 throw new \Exception('@TODO Transpilation of nullable union types with more non null members is not implemented');
             }
@@ -64,7 +64,7 @@ private function transpileUnionType(UnionType $unionType, TypeReferenceNode $typ
 
         throw new \Exception('@TODO Transpilation of complex union types is not implemented');
     }
-    
+
     private function transpileNonUnionType(TypeInterface $type, TypeReferenceNode $typeReferenceNode): string
     {
         return match ($type::class) {

src/TypeSystem/Resolver/TernaryOperation/TernaryOperationTypeResolver.php

@@ -46,19 +46,19 @@ public function resolveTypeOf(TernaryOperationNode $ternaryOperationNode): TypeI
         );
         $conditionNode = $ternaryOperationNode->condition;
 
-        $rootType = $expressionTypeResolver->resolveTypeOf($conditionNode);
+        $conditionType = $expressionTypeResolver->resolveTypeOf($conditionNode);
 
         if ($conditionNode->root instanceof BooleanLiteralNode) {
             return $conditionNode->root->value
                 ? $expressionTypeResolver->resolveTypeOf($ternaryOperationNode->true)
                 : $expressionTypeResolver->resolveTypeOf($ternaryOperationNode->false);
         }
 
-        if ($conditionNode->root instanceof IdentifierNode && $rootType instanceof UnionType && $rootType->isNullable()) {
+        if ($conditionNode->root instanceof IdentifierNode && $conditionType instanceof UnionType && $conditionType->containsNull()) {
             $trueExpressionTypeResolver = new ExpressionTypeResolver(
                 scope: new ShallowScope(
                     $conditionNode->root->value,
-                    $rootType->withoutNullable(),
+                    $conditionType->withoutNull(),
                     $this->scope
                 )
             );

src/TypeSystem/Type/UnionType/UnionType.php

@@ -63,7 +63,7 @@ public static function of(TypeInterface ...$members): TypeInterface
         return new self(...$uniqueMembers);
     }
 
-    public function isNullable(): bool
+    public function containsNull(): bool
     {
         foreach ($this->members as $member) {
             if ($member->is(NullType::get())) {
@@ -73,7 +73,7 @@ public function isNullable(): bool
         return false;
     }
 
-    public function withoutNullable(): TypeInterface
+    public function withoutNull(): TypeInterface
     {
         $nonNullMembers = [];
         foreach ($this->members as $member) {

test/Unit/TypeSystem/Type/UnionType/UnionTypeTest.php

@@ -129,9 +129,9 @@ public function isNullableOnNullableString(): void
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
-        $this->assertTrue($unionType->isNullable());
+        $this->assertTrue($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNullable();
+        $nonNullables = $unionType->withoutNull();
 
         $this->assertTrue($nonNullables->is(StringType::get()));
     }
@@ -145,9 +145,9 @@ public function isNullableWithMultipleItems(): void
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
-        $this->assertTrue($unionType->isNullable());
+        $this->assertTrue($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNullable();
+        $nonNullables = $unionType->withoutNull();
 
         $this->assertTrue($nonNullables->is(UnionType::of(StringType::get(), NumberType::get())));
     }
@@ -161,9 +161,9 @@ public function isNullableOnNonNullableUnion(): void
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
-        $this->assertFalse($unionType->isNullable());
+        $this->assertFalse($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNullable();
+        $nonNullables = $unionType->withoutNull();
 
         $this->assertTrue($nonNullables->is($unionType));
     }