Initialize nullable properties with null - Close #32

Author: sandrokeil

src/ValueObjectFactory.php

@@ -307,10 +307,7 @@ public function generateClasses(
                             );
                             $this->addNamespaceImport($classBuilder, $propertyClassNamespace . '\\' . $propertyClassName);
                             $classBuilder->addProperty(
-                                ClassPropertyBuilder::fromScratch(
-                                    $propertyPropertyName,
-                                    $this->determinePropertyType($propertyType, $propertyClassName)
-                                )
+                                $this->determineProperty($propertyPropertyName, $propertyClassName, $propertyType)
                             );
                             break;
                         case $propertyType instanceof ReferenceType:
@@ -333,10 +330,7 @@ public function generateClasses(
                                 $propertyType = $propertyRefType;
                             }
                             $classBuilder->addProperty(
-                                ClassPropertyBuilder::fromScratch(
-                                    $propertyPropertyName,
-                                    $this->determinePropertyType($propertyType, $propertyClassName)
-                                )
+                                $this->determineProperty($propertyPropertyName, $propertyClassName, $propertyType)
                             );
                             $this->addNamespaceImport($classBuilder, $propertyClassNamespace . '\\' . $propertyClassName);
                             break;
@@ -346,10 +340,7 @@ public function generateClasses(
                             );
                             $this->addNamespaceImport($classBuilder, $propertyClassNamespace . '\\' . $propertyClassName);
                             $classBuilder->addProperty(
-                                ClassPropertyBuilder::fromScratch(
-                                    $propertyPropertyName,
-                                    $this->determinePropertyType($propertyType, $propertyClassName)
-                                )
+                                $this->determineProperty($propertyPropertyName, $propertyClassName, $propertyType)
                             );
                             break;
                         default:
@@ -513,4 +504,20 @@ private function determinePropertyType(TypeDefinition $typeDefinition, string $c
             ? ('?' . $className)
             : $className;
     }
+
+    private function determineProperty(
+        $propertyName,
+        $propertyClassName,
+        TypeDefinition $typeDefinition
+    ): ClassPropertyBuilder {
+        $property = ClassPropertyBuilder::fromScratch(
+            $propertyName,
+            $this->determinePropertyType($typeDefinition, $propertyClassName)
+        );
+        if ($typeDefinition->isRequired() === false || $typeDefinition->isNullable() === true) {
+            $property->setDefaultValue(null);
+        }
+
+        return $property;
+    }
 }

tests/ValueObjectFactoryTest.php

@@ -446,7 +446,7 @@ final class Order
     public const BILLING_ADDRESS = 'billing_address';
     public const SHIPPING_ADDRESSES = 'shipping_addresses';
     private Address $billingAddress;
-    private ?ShippingAddresses $shippingAddresses;
+    private ?ShippingAddresses $shippingAddresses = null;
     public function billingAddress() : Address
     {
         return $this->billingAddress;
@@ -600,7 +600,7 @@ final class Address
     public const CITY = 'city';
     public const FEDERAL_STATE = 'federal_state';
     private StreetAddress $streetAddress;
-    private ?City $city;
+    private ?City $city = null;
     private State $federalState;
     public function streetAddress() : StreetAddress
     {