Merge branch '2.4-develop' into add-StorefrontCheckRefundHGrandTotalActionGroup

Author: eduard13

Gruntfile.js.sample

@@ -16,10 +16,12 @@ module.exports = function (grunt) {
         tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
         themes;
 
-        filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
-        themes = filesRouter.get('themes');
+    filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
+    themes = filesRouter.get('themes');
 
-    tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
+    tasks = _.map(tasks, function (task) {
+        return task.replace('.js', '');
+    });
     tasks.push('time-grunt');
     tasks.forEach(function (task) {
         require(task)(grunt);
@@ -50,10 +52,9 @@ module.exports = function (grunt) {
         prod: function (component) {
             var tasks = [
                 'less',
-                'autoprefixer',
                 'cssmin',
                 'usebanner'
-            ].map(function(task){
+            ].map(function (task) {
                 return task + ':' + component;
             });
 
@@ -72,7 +73,7 @@ module.exports = function (grunt) {
                 'clean',
                 'exec:all'
             ];
-            _.each(themes, function(theme, name) {
+            _.each(themes, function (theme, name) {
                 tasks.push('less:' + name);
             });
             grunt.task.run(tasks);

app/bootstrap.php

@@ -30,6 +30,16 @@
     exit(1);
 }
 
+// PHP 8 compatibility. Define constants that are not present in PHP < 8.0
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80000) {
+    if (!defined('T_NAME_QUALIFIED')) {
+        define('T_NAME_QUALIFIED', 24001);
+    }
+    if (!defined('T_NAME_FULLY_QUALIFIED')) {
+        define('T_NAME_FULLY_QUALIFIED', 24002);
+    }
+}
+
 require_once __DIR__ . '/autoload.php';
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/code/Magento/AdminAnalytics/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html

@@ -9,21 +9,21 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
         <div class="message-system-collapsible">
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/AmqpStore/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/module-store": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "suggest": {
         "magento/module-asynchronous-operations": "*",

app/code/Magento/Analytics/Model/Config/Mapper.php

@@ -52,10 +52,9 @@ public function execute($configData)
                 $providerData['parameters'] = !empty($providerData['parameters'])
                     ? reset($providerData['parameters'])
                     : [];
-                $providerData['parameters'] = array_map(
-                    'reset',
-                    $providerData['parameters']
-                );
+                array_walk($providerData['parameters'], function (&$array) {
+                    $array = reset($array);
+                });
                 $providers[$providerType] = $providerData;
             }
             $files[$fileData['name']] = $fileData;

app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php

@@ -50,15 +50,15 @@ class CurlTest extends TestCase
     private $converterMock;
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->curlAdapterMock = $this->createMock(\Magento\Framework\HTTP\Adapter\Curl::class);
 
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $curlFactoryMock = $this->getMockBuilder(CurlFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $curlFactoryMock
@@ -76,7 +76,7 @@ protected function setUp(): void
                 'curlFactory' => $curlFactoryMock,
                 'responseFactory' => $this->responseFactoryMock,
                 'converter' => $this->converterMock,
-                'logger' => $this->loggerMock,
+                'logger' => $this->loggerMock
             ]
         );
     }
@@ -94,7 +94,7 @@ public function getTestData()
                     'version' => '1.1',
                     'body'=> ['name' => 'value'],
                     'url' => 'http://www.mystore.com',
-                    'method' => ZendClient::POST,
+                    'method' => ZendClient::POST
                 ]
             ]
         ];
@@ -122,14 +122,8 @@ public function testRequestSuccess(array $data)
         $this->curlAdapterMock->expects($this->once())
             ->method('read')
             ->willReturn($responseString);
-        $this->curlAdapterMock
-            ->method('getErrno')
-            ->willReturn(0);
-
-        $this->responseFactoryMock
-            ->method('create')
-            ->with($responseString)
-            ->willReturn($response);
+        $this->curlAdapterMock->method('getErrno')->willReturn(0);
+        $this->responseFactoryMock->method('create')->with($responseString)->willReturn($response);
 
         $this->assertEquals(
             $response,
@@ -196,7 +190,7 @@ public function testRequestError(array $data)
     private function createJsonConverter()
     {
         $converterMock = $this->getMockBuilder(JsonConverter::class)
-            ->setMethodsExcept(['getContentTypeHeader'])
+            ->onlyMethods(['getContentTypeHeader','toBody'])
             ->disableOriginalConstructor()
             ->getMock();
         $converterMock->method('toBody')->willReturnCallback(function ($value) {

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-authorization": "*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html

@@ -9,21 +9,21 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
         <div class="message-system-collapsible">
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>

app/code/Magento/Authorization/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-backend": "*"
     },

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -851,7 +851,7 @@ public function fileClose($resource): bool
         //phpcs:enable
 
         foreach ($this->streams as $path => $stream) {
-            //phpcs:disable
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             if (stream_get_meta_data($stream)['uri'] === $resourcePath) {
                 $this->adapter->writeStream($path, $resource, new Config(self::CONFIG));
 

app/code/Magento/AwsS3/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-remote-storage": "*",
         "league/flysystem": "^2.0",

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -102,6 +102,8 @@ public function __construct(
     }
 
     /**
+     * Ensures user is authenticated before accessing backend action controllers.
+     *
      * @param \Magento\Backend\App\AbstractAction $subject
      * @param \Closure $proceed
      * @param \Magento\Framework\App\RequestInterface $request
@@ -225,10 +227,9 @@ protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInt
 
         // Checks, whether secret key is required for admin access or request uri is explicitly set
         if ($this->_url->useSecretKey()) {
-            $requestParts = explode('/', trim($request->getRequestUri(), '/'), 3);
-            $baseUrlPath = trim(parse_url($this->backendUrl->getBaseUrl(), PHP_URL_PATH), '/');
-            $routeIndex = empty($baseUrlPath) ? 0 : 1;
-            $requestUri = $this->_url->getUrl($requestParts[$routeIndex]);
+            // The requested URL has an invalid secret key and therefore redirecting to this URL
+            // will cause a security vulnerability.
+            $requestUri = $this->_url->getUrl($this->_url->getStartupPageUrl());
         } elseif ($request) {
             $requestUri = $request->getRequestUri();
         }

app/code/Magento/Backend/Model/Dashboard/Chart/Date.php

@@ -63,6 +63,8 @@ public function getByPeriod(string $period): array
 
         if ($period === Period::PERIOD_24_HOURS) {
             $dateEnd->modify('-1 hour');
+        } elseif ($period === Period::PERIOD_TODAY) {
+            $dateEnd->modify('now');
         } else {
             $dateEnd->setTime(23, 59, 59);
             $dateStart->setTime(0, 0, 0);

app/code/Magento/Backend/Model/Dashboard/Period.php

@@ -12,6 +12,7 @@
  */
 class Period
 {
+    public const PERIOD_TODAY = 'today';
     public const PERIOD_24_HOURS = '24h';
     public const PERIOD_7_DAYS = '7d';
     public const PERIOD_1_MONTH = '1m';
@@ -30,6 +31,7 @@ class Period
     public function getDatePeriods(): array
     {
         return [
+            static::PERIOD_TODAY => __('Today'),
             static::PERIOD_24_HOURS => __('Last 24 Hours'),
             static::PERIOD_7_DAYS => __('Last 7 Days'),
             static::PERIOD_1_MONTH => __('Current Month'),
@@ -46,6 +48,7 @@ public function getDatePeriods(): array
     public function getPeriodChartUnits(): array
     {
         return [
+            static::PERIOD_TODAY => self::PERIOD_UNIT_HOUR,
             static::PERIOD_24_HOURS => self::PERIOD_UNIT_HOUR,
             static::PERIOD_7_DAYS => self::PERIOD_UNIT_DAY,
             static::PERIOD_1_MONTH => self::PERIOD_UNIT_DAY,

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertNoErrorMessageActionGroup.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssertNoErrorMessageActionGroup">
+        <dontSeeElement selector="{{AdminMessagesSection.error}}" stepKey="dontSeeErrorMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickLogoutActionGroup.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminClickLogoutActionGroup">
+        <grabAttributeFrom selector="{{AdminHeaderSection.signOut}}" userInput="href" stepKey="logoutUrl"/>
+        <amOnPage url="{$logoutUrl}" stepKey="logout2"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminLoginWithCustomUrlActionGroup.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminLoginWithCustomUrlActionGroup" extends="AdminLoginActionGroup">
+        <annotations>
+            <description>Login to specific backend URL.</description>
+        </annotations>
+        <arguments>
+            <argument name="customUrl" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{customUrl}}" stepKey="navigateToAdmin"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

@@ -17,5 +17,6 @@
         <element name="pageHeading" type="text" selector=".page-content .page-heading"/>
         <!-- Used for page not found error -->
         <element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
+        <element name="signOut" type="button" selector=".page-header .account-signout"/>
     </section>
 </sections>