Merge pull request #5 from sumocoders/master

DBAL Types always need to know how to handle null
pageon · Nov 21, 2019 · 32a4e3a · 32a4e3a
2 parents ecc03be + be54586
commit 32a4e3a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.../resources/php71/Backend/Modules/TestModule/Domain/MyTestEntity/MyValueObjectDBALType.php b/.../resources/php71/Backend/Modules/TestModule/Domain/MyTestEntity/MyValueObjectDBALType.php
@@ -12,8 +12,12 @@ public function getName(): string
         return 'testmodule_mytestentity_myvalueobject';
     }
 
-    public function convertToPHPValue($myValueObjectDBALType, AbstractPlatform $platform): MyValueObject
+    public function convertToPHPValue($myValueObjectDBALType, AbstractPlatform $platform): ?MyValueObject
     {
+        if ($myValueObjectDBALType === null) {
+            return null;
+        }
+
         return new MyValueObject($myValueObjectDBALType);
     }
 

diff --git a/features/generate/domain/resources/php71/Standalone/MyValueObjectDBALType.php b/features/generate/domain/resources/php71/Standalone/MyValueObjectDBALType.php
@@ -12,8 +12,12 @@ public function getName(): string
         return 'myvalueobject';
     }
 
-    public function convertToPHPValue($myValueObjectDBALType, AbstractPlatform $platform): MyValueObject
+    public function convertToPHPValue($myValueObjectDBALType, AbstractPlatform $platform): ?MyValueObject
     {
+        if ($myValueObjectDBALType === null) {
+            return null;
+        }
+
         return new MyValueObject($myValueObjectDBALType);
     }
 

diff --git a/src/Domain/ValueObject/ValueObjectDBALType.php71.php.twig b/src/Domain/ValueObject/ValueObjectDBALType.php71.php.twig
@@ -12,8 +12,12 @@ final class {{ class.className.name }} extends StringType
         return '{{ class.name }}';
     }
 
-    public function convertToPHPValue(${{ class.className.forParameter }}, AbstractPlatform $platform): {{ class.valueObjectClassName.name }}
+    public function convertToPHPValue(${{ class.className.forParameter }}, AbstractPlatform $platform): ?{{ class.valueObjectClassName.name }}
     {
+        if (${{ class.className.forParameter }} === null) {
+            return null;
+        }
+
         return new {{ class.valueObjectClassName.name }}(${{ class.className.forParameter }});
     }