Merge branch 'magento:2.4-develop' into productRepository-plugin

Author: rmsundar1

Gruntfile.js.sample

@@ -52,7 +52,6 @@ module.exports = function (grunt) {
         prod: function (component) {
             var tasks = [
                 'less',
-                'autoprefixer',
                 'cssmin',
                 'usebanner'
             ].map(function (task) {

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/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/Model/ResourceModel/Index.php

@@ -80,8 +80,10 @@ public function __construct(
 
     /**
      * Implementation of abstract construct
+     *
      * @return void
      * @since 100.1.0
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     protected function _construct()
     {
@@ -118,7 +120,8 @@ protected function _getCatalogProductPriceData($productIds = null)
 
         $result = [];
         foreach ($connection->fetchAll($catalogProductIndexPriceUnionSelect) as $row) {
-            $result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] = round($row['min_price'], 2);
+            $result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] =
+                round((float) $row['min_price'], 2);
         }
 
         return $result;

app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php

@@ -60,6 +60,9 @@ class IndexTest extends TestCase
      */
     private $resourceConnectionMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
@@ -98,6 +101,9 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetPriceIndexDataUsesFrontendPriceIndexerTable(): void
     {
         $storeId = 1;
@@ -117,4 +123,73 @@ public function testGetPriceIndexDataUsesFrontendPriceIndexerTable(): void
 
         $this->assertEmpty($this->model->getPriceIndexData([1], $storeId));
     }
+
+    /**
+     * @param array $testData
+     * @dataProvider providerForTestPriceIndexData
+     *
+     * @return void
+     */
+    public function testGetPriceIndexData(array $testData): void
+    {
+        $storeMock = $this->getMockForAbstractClass(StoreInterface::class);
+        $storeMock->expects($this->any())->method('getId')->willReturn(1);
+        $storeMock->method('getWebsiteId')->willReturn($testData['website_id']);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->with(1)->willReturn($storeMock);
+
+        $selectMock = $this->createMock(Select::class);
+        $selectMock->expects($this->any())->method('union')->willReturnSelf();
+        $this->adapterMock->expects($this->any())->method('select')->willReturn($selectMock);
+        $this->adapterMock->expects($this->any())->method('fetchAll')->with($selectMock)->willReturn([$testData]);
+        $expectedData = [
+            $testData['entity_id'] => [
+                $testData['customer_group_id'] => round((float) $testData['min_price'], 2)
+            ]
+        ];
+
+        $this->assertEquals($this->model->getPriceIndexData([1], 1), $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    public function providerForTestPriceIndexData(): array
+    {
+        return [
+            [
+               [
+                   'website_id' => 1,
+                   'entity_id' => 1,
+                   'customer_group_id' => 1,
+                   'min_price' => '12.12'
+               ]
+            ],
+            [
+                [
+                    'website_id' => 1,
+                    'entity_id' => 2,
+                    'customer_group_id' => 2,
+                    'min_price' => null
+                ]
+            ],
+            [
+                [
+                    'website_id' => 1,
+                    'entity_id' => 3,
+                    'customer_group_id' => 3,
+                    'min_price' => 12.12
+                ]
+            ],
+            [
+                [
+                    'website_id' => 1,
+                    'entity_id' => 3,
+                    'customer_group_id' => 3,
+                    'min_price' => ''
+                ]
+            ]
+        ];
+    }
 }

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": "*",