Merge branch '2.4-develop' into baudeval-patch-1

Author: baudeval

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php

@@ -6,17 +6,23 @@
 
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
 
-class Index extends \Magento\Backend\App\Action
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+
+class Index extends Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
+    public const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
 
     /**
-     * @var \Magento\Framework\View\Result\PageFactory
+     * @var PageFactory
      */
     private $resultPageFactory;
 
@@ -26,33 +32,24 @@ class Index extends \Magento\Backend\App\Action
     private $menuId;
 
     /**
-     * Details constructor.
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param Context $context
+     * @param PageFactory $resultPageFactory
      * @param string $menuId
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        Context $context,
+        PageFactory $resultPageFactory,
         $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
     ) {
         $this->resultPageFactory = $resultPageFactory;
         $this->menuId = $menuId;
         parent::__construct($context);
     }
 
-    /**
-     * @inheritDoc
-     */
-    protected function _isAllowed()
-    {
-        return parent::_isAllowed();
-    }
-
     /**
      * Bulk list action
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return Page
      */
     public function execute()
     {

app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php

@@ -39,7 +39,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         /** @var  $product \Magento\Catalog\Model\Product */
         $product = $observer->getEvent()->getProduct();
         if ($product->getSpecialPrice() && $product->getSpecialFromDate() === null) {
-            $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
+            // Set the special_from_date to the current date with time 00:00:00 when a special price is defined
+            // but no start date is specified. This ensures the special price takes effect immediately
+            // and is consistent with how the special price validation works in Magento.
+            // The time is explicitly set to midnight to ensure the special price is active for the entire day.
+            $product->setData(
+                'special_from_date',
+                $this->localeDate->date()->setTime(0, 0)->format('Y-m-d H:i:s')
+            );
         }
         return $this;
     }

app/code/Magento/Catalog/Test/Unit/Observer/SetSpecialPriceStartDateTest.php

@@ -88,13 +88,13 @@ protected function setUp(): void
     }
 
     /**
-     * Test observer execute method
+     * Test observer execute method when special_from_date is null
      */
     public function testExecuteModifySpecialFromDate(): void
     {
         $specialPrice = 15;
         $specialFromDate = null;
-        $localeDateMock = ['special_from_date' => $this->returnValue($this->dateObject)];
+        $formattedDate = '2023-01-01 00:00:00';
 
         $this->observerMock
             ->expects($this->once())
@@ -106,10 +106,18 @@ public function testExecuteModifySpecialFromDate(): void
             ->method('getProduct')
             ->willReturn($this->productMock);
 
-        $this->dateObject->expects($this->any())
+        $this->dateObject
+            ->expects($this->once())
             ->method('setTime')
+            ->with(0, 0)
             ->willReturnSelf();
 
+        $this->dateObject
+            ->expects($this->once())
+            ->method('format')
+            ->with('Y-m-d H:i:s')
+            ->willReturn($formattedDate);
+
         $this->timezone
             ->expects($this->once())
             ->method('date')
@@ -128,7 +136,79 @@ public function testExecuteModifySpecialFromDate(): void
         $this->productMock
             ->expects($this->once())
             ->method('setData')
-            ->willReturn($localeDateMock);
+            ->with('special_from_date', $formattedDate);
+
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Test observer doesn't modify special_from_date when it's already set
+     */
+    public function testExecuteDoesNotModifyExistingSpecialFromDate(): void
+    {
+        $specialPrice = 15;
+        $existingSpecialFromDate = '2023-01-01 00:00:00';
+
+        $this->observerMock
+            ->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+
+        $this->eventMock
+            ->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+
+        $this->productMock
+            ->expects($this->once())
+            ->method('getSpecialPrice')
+            ->willReturn($specialPrice);
+
+        $this->productMock
+            ->expects($this->once())
+            ->method('getSpecialFromDate')
+            ->willReturn($existingSpecialFromDate);
+
+        $this->productMock
+            ->expects($this->never())
+            ->method('setData');
+
+        $this->timezone
+            ->expects($this->never())
+            ->method('date');
+
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Test observer doesn't set special_from_date when special price is not set
+     */
+    public function testExecuteDoesNotSetSpecialFromDateWithoutSpecialPrice(): void
+    {
+        $specialPrice = null;
+
+        $this->observerMock
+            ->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+
+        $this->eventMock
+            ->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+
+        $this->productMock
+            ->expects($this->once())
+            ->method('getSpecialPrice')
+            ->willReturn($specialPrice);
+
+        $this->productMock
+            ->expects($this->never())
+            ->method('getSpecialFromDate');
+
+        $this->productMock
+            ->expects($this->never())
+            ->method('setData');
 
         $this->observer->execute($this->observerMock);
     }

app/code/Magento/Config/etc/system_file.xsd

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -178,7 +178,7 @@
             <xs:sequence>
                 <xs:choice minOccurs="0" maxOccurs="unbounded">
                     <xs:element name="label" type="xs:string" />
-                    <xs:element ref="comment" />
+                    <xs:element name="comment" type="commentType" minOccurs="0" />
                     <xs:element name="tooltip" type="xs:string" />
                     <xs:element name="hint" type="xs:string" />
                     <xs:element name="frontend_class" type="xs:string" />
@@ -479,20 +479,12 @@
         </xs:restriction>
     </xs:simpleType>
 
-    <xs:element name="comment">
-        <xs:annotation>
-            <xs:documentation>
-                Comment type
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:complexType mixed="true">
-            <xs:sequence>
-                <xs:any minOccurs="0" maxOccurs="1" processContents="lax" />
-            </xs:sequence>
-            <xs:attributeGroup ref="commentAttributeGroup"/>
-        </xs:complexType>
-    </xs:element>
+    <xs:complexType name="commentType" mixed="true">
+        <xs:sequence>
+            <xs:element name="model" type="typeModel" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="model" type="xs:string" use="optional"/>
+    </xs:complexType>
 
     <xs:simpleType name="typeConfigPath">
         <xs:annotation>

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * Adminhtml block for fieldset of configurable product
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset;
 
@@ -101,7 +99,7 @@ public function getCurrentStore()
     }
 
     /**
-     * Returns additional values for js config, con be overridden by descendants
+     * Returns additional values for js config, can be overridden by descendants
      *
      * @return array
      */

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -203,7 +203,7 @@ public function getCurrentStore()
     }
 
     /**
-     * Returns additional values for js config, con be overridden by descendants
+     * Returns additional values for js config, can be overridden by descendants
      *
      * @return array
      */

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php

@@ -11,12 +11,10 @@
  * @api
  * @since 100.0.2
  */
-class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
+class Newsletter extends AbstractCreate
 {
     /**
-     * Constructor
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -43,13 +41,4 @@ public function getHeaderCssClass()
     {
         return 'head-newsletter-list';
     }
-
-    /**
-     * @inheritdoc
-     * phpcs:disable
-     */
-    protected function _toHtml()
-    {
-        return parent::_toHtml();
-    }
 }