TASK: Adjust naming of $nonNullable to $typeWithoutNull

Author: mhsdesign

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

@@ -54,12 +54,9 @@ public function transpile(TypeReferenceNode $typeReferenceNode): string
 
     private function transpileUnionType(UnionType $unionType, TypeReferenceNode $typeReferenceNode): string
     {
-        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');
-            }
-            return $this->transpileNullableType($nonNullable, $typeReferenceNode);
+        if (count($unionType) === 2 && $unionType->containsNull()) {
+            $typeWithoutNull = $unionType->withoutNull();
+            return $this->transpileNullableType($typeWithoutNull, $typeReferenceNode);
         }
 
         throw new \Exception('@TODO Transpilation of complex union types is not implemented');

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

@@ -133,48 +133,48 @@ public function isReturnsFalseIfGivenTypeIsNotCongruent(): void
     /**
      * @test
      */
-    public function isNullableOnNullableString(): void
+    public function containsNullOnNullableString(): void
     {
         $unionType = UnionType::of(StringType::get(), NullType::get());
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
         $this->assertTrue($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNull();
+        $withoutNull = $unionType->withoutNull();
 
-        $this->assertTrue($nonNullables->is(StringType::get()));
+        $this->assertTrue($withoutNull->is(StringType::get()));
     }
 
     /**
      * @test
      */
-    public function isNullableWithMultipleItems(): void
+    public function containsNullWithMultipleMembers(): void
     {
         $unionType = UnionType::of(StringType::get(), NumberType::get(), NullType::get());
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
         $this->assertTrue($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNull();
+        $withoutNull = $unionType->withoutNull();
 
-        $this->assertTrue($nonNullables->is(UnionType::of(StringType::get(), NumberType::get())));
+        $this->assertTrue($withoutNull->is(UnionType::of(StringType::get(), NumberType::get())));
     }
 
     /**
      * @test
      */
-    public function isNullableOnNonNullableUnion(): void
+    public function withoutNullOnUnionWithoutNull(): void
     {
         $unionType = UnionType::of(StringType::get(), NumberType::get());
 
         $this->assertInstanceOf(UnionType::class, $unionType);
 
         $this->assertFalse($unionType->containsNull());
 
-        $nonNullables = $unionType->withoutNull();
+        $withoutNull = $unionType->withoutNull();
 
-        $this->assertTrue($nonNullables->is($unionType));
+        $this->assertTrue($withoutNull->is($unionType));
     }
 }