Merge branch '1.8' into 1.x

pimcore · Mar 12, 2024 · de0557e · de0557e
2 parents fa5849b + 0653eb1
commit de0557e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Mapping/Operator/Factory/Date.php b/src/Mapping/Operator/Factory/Date.php
@@ -48,6 +48,8 @@ public function process($inputData, bool $dryRun = false)
         foreach ($inputData as &$data) {
             if (!empty($data)) {
                 $data = \Carbon\Carbon::createFromFormat($this->format, $data);
+            } else {
+                $data = null;
             }
         }
 

diff --git a/tests/unit/FactoryOperatorTest.php b/tests/unit/FactoryOperatorTest.php
@@ -138,6 +138,8 @@ public function testDate() {
         $preview = $date->generateResultPreview($resultArray);
         $this->assertIsArray($preview);
 
+        $result = $date->process('');
+        $this->assertNull($result);
     }
 
     public function testGallery() {