[Bug]: Omit Mandatory Check on field with Default Value when creating…

… a new DataObject (pimcore#15812) * skip check on mandatory fields with default value on Add * add tests and intentionally crash it * try to pass it * clean up * remove unnecesary getMandatory check
limenet · Aug 29, 2023 · c6b1446 · c6b1446
1 parent ae651bd
commit c6b1446
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/models/DataObject/Concrete.php b/models/DataObject/Concrete.php
@@ -140,7 +140,13 @@ protected function update(bool $isUpdate = null, array $params = []): void
 
                 if (method_exists($this, $getter)) {
                     $value = $this->$getter();
+
                     $omitMandatoryCheck = $this->getOmitMandatoryCheck();
+                    // when adding a new object, skip check on mandatory fields with default value
+                    if (empty($value) && !$isUpdate && method_exists($fd, 'getDefaultValue') && !empty($fd->getDefaultValue())
+                    ){
+                        $omitMandatoryCheck = true;
+                    }
 
                     //check throws Exception
                     try {

diff --git a/tests/Model/DataObject/ObjectTest.php b/tests/Model/DataObject/ObjectTest.php
@@ -206,6 +206,21 @@ public function testDefaultValueSavedToVersion(): void
         $this->assertEquals('default', $latestVersion->getData()->getInputWithDefault(), 'Expected default value saved to version');
     }
 
+    /**
+     * Verifies a newly published object gets the default values of mandatory fields
+     */
+    public function testDefaultValueAndMandatorySavedToVersion(): void
+    {
+        $object = TestHelper::createEmptyObject('', false, true);
+        $object->setOmitMandatoryCheck(false);
+        $object->save();
+
+        $versions = $object->getVersions();
+        $latestVersion = end($versions);
+
+        $this->assertEquals('default', $latestVersion->getData()->getMandatoryInputWithDefault(), 'Expected default value saved to version');
+    }
+
     /**
      * Verifies that when an object gets cloned, the fields get copied properly
      */

diff --git a/tests/Support/Helper/Model.php b/tests/Support/Helper/Model.php
@@ -451,6 +451,10 @@ public function setupPimcoreClass_Unittest(string $name = 'unittest', string $fi
             $inputWithDefault = $this->createDataChild('input', 'inputWithDefault');
             $inputWithDefault->setDefaultValue('default');
             $panel->addChild($inputWithDefault);
+            /** @var ClassDefinition\Data\Input $mandatoryInputWithDefault */
+            $mandatoryInputWithDefault = $this->createDataChild('input', 'mandatoryInputWithDefault', true);
+            $mandatoryInputWithDefault->setDefaultValue('default');
+            $panel->addChild($mandatoryInputWithDefault);
 
             $panel->addChild($this->createDataChild('manyToOneRelation', 'lazyHref')
                 ->setDocumentTypes([])->setAssetTypes([])->setClasses([])