Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-1620

Author: devarul

.github/CONTRIBUTING.md

@@ -15,7 +15,7 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://developer.adobe.com/commerce/php/coding-standards/).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.

README.md

@@ -26,7 +26,7 @@ However, for those who need a full-featured eCommerce solution, we recommend [Ad
 
 ## Contribute
 
-Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://devdocs.magento.com/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
+Our [Community](https://opensource.magento.com/) is large and diverse, and our project is enormous. As a contributor, you have countless opportunities to impact product development and delivery by introducing new features or improving existing ones, enhancing test coverage, updating documentation for [developers](https://developer.adobe.com/commerce/docs/) and [end-users](https://docs.magento.com/user-guide/), catching and fixing code bugs, suggesting points for optimization, and sharing your great ideas.
 
 - [Contribute to the code](https://developer.adobe.com/commerce/contributor/guides/code-contributions/)
 - [Report an issue](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report)
@@ -36,7 +36,7 @@ Our [Community](https://opensource.magento.com/) is large and diverse, and our p
 
 ### Maintainers
 
-We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production. 
+We encourage experts from the Community to help us with GitHub routines such as accepting, merging, or rejecting pull requests and reviewing issues. Adobe has granted the Community Maintainers permission to accept, merge, and reject pull requests, as well as review issues. Thanks to invaluable input from the Community Maintainers team, we can significantly improve contribution quality and accelerate the time to deliver your updates to production.
 
 - [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 - [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/)
@@ -64,9 +64,9 @@ Stay up-to-date on the latest security news and patches by signing up for [Secur
 ## Licensing
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento).
- 
+
 [Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php) – Please see [LICENSE.txt](LICENSE.txt) for the full text of the OSL 3.0 license.
- 
+
 Subject to Licensee's/Customer's payment of fees and compliance with the terms and conditions of the applicable ordering document between Licensee/Customer and Adobe (or Magento), the terms and conditions of the applicable ordering between Licensee/Customer and Adobe (or Magento) supersede the OSL 3.0 license for each source file.
 
 ## Communications

app/bootstrap.php

@@ -17,12 +17,12 @@
 if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80100) {
     if (PHP_SAPI == 'cli') {
         echo 'Magento supports PHP 8.1.0 or later. ' .
-            'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
+            'Please read https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <p>Magento supports PHP 8.1.0 or later. Please read
-    <a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
+    <a target="_blank" href="https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html">
     Magento System Requirements</a>.
 </div>
 HTML;

app/code/Magento/AdminAnalytics/README.md

@@ -1 +1 @@
-The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.
+The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -109,25 +109,16 @@ public function getHtml()
             ' value="' .
             $this->localeResolver->getLocale() .
             '"/>';
-        $scriptString = '
-            require(["jquery", "mage/calendar"], function($){
-                $("#' .
-            $htmlId .
-            '_range").dateRange({
-                    dateFormat: "' .
-            $format .
-            '",
-                        buttonText: "' . $this->escapeHtml(__('Date selector')) .
-            '",
+        $scriptString = 'require(["jquery", "mage/calendar"], function($){
+                $("#' . $htmlId . '_range").dateRange({
+                    dateFormat: "' . $format . '",
+                    buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
+                    buttonImage: "' . $this->getViewFileUrl('Magento_Theme::calendar.png') . '",
                     from: {
-                        id: "' .
-            $htmlId .
-            '_from"
+                        id: "' . $htmlId . '_from"
                     },
                     to: {
-                        id: "' .
-            $htmlId .
-            '_to"
+                        id: "' . $htmlId . '_to"
                     }
                 })
             });';

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -17,7 +17,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
     /**
      * full day is 86400, we need 23 hours:59 minutes:59 seconds = 86399
      */
-    const END_OF_DAY_IN_SECONDS = 86399;
+    public const END_OF_DAY_IN_SECONDS = 86399;
 
     /**
      * @inheritdoc
@@ -123,6 +123,7 @@ public function getHtml()
                         timeFormat: "' . $timeFormat . '",
                         showsTime: ' . ($this->getColumn()->getFilterTime() ? 'true' : 'false') . ',
                         buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
+                        buttonImage: "' . $this->getViewFileUrl('Magento_Theme::calendar.png') . '",
                         from: {
                             id: "' . $htmlId . '_from"
                         },

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php

@@ -10,18 +10,21 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Backend\Block\Widget\Grid\Column\Filter\Date;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Escaper;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Math\Random;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Asset\Repository;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class DateTest to test Magento\Backend\Block\Widget\Grid\Column\Filter\Date
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DateTest extends TestCase
 {
@@ -49,6 +52,16 @@ class DateTest extends TestCase
     /** @var Context|MockObject */
     private $contextMock;
 
+    /**
+     * @var Http|MockObject
+     */
+    private $request;
+
+    /**
+     * @var Repository|MockObject
+     */
+    private $repositoryMock;
+
     protected function setUp(): void
     {
         $this->mathRandomMock = $this->getMockBuilder(Random::class)
@@ -88,6 +101,23 @@ protected function setUp(): void
         $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
         $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
 
+        $this->request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+
+        $this->repositoryMock = $this->getMockBuilder(Repository::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrlWithParams'])
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getAssetRepository')
+            ->willReturn($this->repositoryMock);
+
         $objectManagerHelper = new ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             Date::class,
@@ -116,6 +146,14 @@ public function testGetHtmlSuccessfulTimestamp()
             'from' => $yesterday->getTimestamp(),
             'to' => $tomorrow->getTimestamp()
         ];
+        $params = ['_secure' => false];
+        $fileId = 'Magento_Theme::calendar.png';
+        $fileUrl = 'file url';
+
+        $this->repositoryMock->expects($this->once())
+            ->method('getUrlWithParams')
+            ->with($fileId, $params)
+            ->willReturn($fileUrl);
 
         $this->mathRandomMock->expects($this->any())->method('getUniqueHash')->willReturn($uniqueHash);
         $this->columnMock->expects($this->once())->method('getHtmlId')->willReturn($id);

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php

@@ -10,17 +10,21 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Escaper;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Math\Random;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Asset\Repository;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class DateTimeTest to test Magento\Backend\Block\Widget\Grid\Column\Filter\Date
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DatetimeTest extends TestCase
 {
@@ -48,6 +52,16 @@ class DatetimeTest extends TestCase
     /** @var Context|MockObject */
     private $contextMock;
 
+    /**
+     * @var Http|MockObject
+     */
+    private $request;
+
+    /**
+     * @var Repository|MockObject
+     */
+    private $repositoryMock;
+
     protected function setUp(): void
     {
         $this->mathRandomMock = $this->getMockBuilder(Random::class)
@@ -87,6 +101,23 @@ protected function setUp(): void
         $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
         $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
 
+        $this->request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+
+        $this->repositoryMock = $this->getMockBuilder(Repository::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrlWithParams'])
+            ->getMock();
+
+        $this->contextMock->expects($this->once())
+            ->method('getAssetRepository')
+            ->willReturn($this->repositoryMock);
+
         $objectManagerHelper = new ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             Datetime::class,
@@ -115,6 +146,14 @@ public function testGetHtmlSuccessfulTimestamp()
             'from' => $yesterday->getTimestamp(),
             'to' => $tomorrow->getTimestamp()
         ];
+        $params = ['_secure' => false];
+        $fileId = 'Magento_Theme::calendar.png';
+        $fileUrl = 'file url';
+
+        $this->repositoryMock->expects($this->once())
+            ->method('getUrlWithParams')
+            ->with($fileId, $params)
+            ->willReturn($fileUrl);
 
         $this->mathRandomMock->expects($this->any())->method('getUniqueHash')->willReturn($uniqueHash);
         $this->columnMock->expects($this->once())->method('getHtmlId')->willReturn($id);