Merge branch 'ACP2E-3486' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-12-17-CE

Author: vkolesny

app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\Eav\Model\Entity\Attribute\Backend;
 
 /**
@@ -57,6 +56,14 @@ public function beforeSave($object)
             $object->setData($attributeName . '_is_formated', true);
         }
 
+        $defaultValue = $this->getDefaultValue();
+        if ($object->getData($attributeName) === null
+            && $defaultValue !== null
+            && !$object->hasData($attributeName)) {
+            $object->setData($attributeName, $defaultValue);
+            $object->setData($attributeName . '_is_formated', true);
+        }
+
         return $this;
     }
 

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/DatetimeTest.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Backend;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\Datetime;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\DataObject;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class DatetimeTest extends TestCase
+{
+    /**
+     * @var TimezoneInterface|MockObject
+     */
+    private $timezone;
+
+    /**
+     * @var AbstractAttribute|MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var Datetime
+     */
+    private $model;
+
+    protected function setUp(): void
+    {
+        $this->attribute = $this->getMockBuilder(AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->timezone = $this->createMock(TimezoneInterface::class);
+        $this->model = new Datetime($this->timezone);
+        $this->model->setAttribute($this->attribute);
+    }
+
+    /**
+     * @throws LocalizedException
+     */
+    public function testGetDefaultValue()
+    {
+        $attributeName = 'attribute';
+        $defaultValue = '2024-01-01 00:00:00';
+        $this->attribute->expects($this->once())->method('getName')->willReturn($attributeName);
+        $this->attribute->expects($this->exactly(2))->method('getDefaultValue')->willReturn($defaultValue);
+        $object = new DataObject();
+        $this->model->beforeSave($object);
+        $this->assertEquals($defaultValue, $object->getData($attributeName));
+    }
+}