Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2

into 2.4-develop
mage-os · Nov 19, 2024 · 4cafc44 · 4cafc44
2 parents b0e1ab7 + 915e8fe
commit 4cafc44
Show file tree

Hide file tree

Showing 249 changed files with 961 additions and 367 deletions.
diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

diff --git a/app/code/Magento/ApplicationPerformanceMonitor/composer.json b/app/code/Magento/ApplicationPerformanceMonitor/composer.json
@@ -12,7 +12,7 @@
     }
   },
   "require": {
-    "php": "~8.1.0||~8.2.0||~8.3.0",
+    "php": "~8.2.0||~8.3.0",
     "magento/framework": "*"
   }
 }
diff --git a/app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json b/app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json
@@ -12,7 +12,7 @@
     }
   },
   "require": {
-    "php": "~8.1.0||~8.2.0||~8.3.0",
+    "php": "~8.2.0||~8.3.0",
     "magento/framework": "*",
     "magento/module-application-performance-monitor": "*",
     "magento/module-new-relic-reporting": "*"

diff --git a/app/code/Magento/AsyncConfig/composer.json b/app/code/Magento/AsyncConfig/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-async-config",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },

diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
@@ -11,7 +11,7 @@
         "magento/module-authorization": "*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*"
     },

diff --git a/app/code/Magento/AwsS3/composer.json b/app/code/Magento/AwsS3/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-remote-storage": "*"
     },

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backup": "*",
         "magento/module-catalog": "*",

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-cron": "*",

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",

diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
@@ -3,7 +3,7 @@
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/module-catalog": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-graph-ql": "*",

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-store": "*",

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-page-cache": "*"
     },

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-checkout": "*",

diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-payment": "*",

diff --git a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Product\Price;
@@ -10,6 +10,7 @@
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\Catalog\Model\ResourceModel\Product\Price\BasePriceFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotDeleteException;
@@ -88,14 +89,16 @@ class PricePersistence
      * @param MetadataPool $metadataPool
      * @param string $attributeCode
      * @param DateTime|null $dateTime
+     * @param BasePriceFactory|null $basePriceFactory
      */
     public function __construct(
         Attribute $attributeResource,
         ProductAttributeRepositoryInterface $attributeRepository,
         ProductIdLocatorInterface $productIdLocator,
         MetadataPool $metadataPool,
         $attributeCode = '',
-        ?DateTime $dateTime = null
+        ?DateTime $dateTime = null,
+        private ?BasePriceFactory $basePriceFactory = null
     ) {
         $this->attributeResource = $attributeResource;
         $this->attributeRepository = $attributeRepository;
@@ -104,6 +107,8 @@ public function __construct(
         $this->metadataPool = $metadataPool;
         $this->dateTime = $dateTime ?: ObjectManager::getInstance()
             ->get(DateTime::class);
+        $this->basePriceFactory = $this->basePriceFactory ?: ObjectManager::getInstance()
+            ->get(BasePriceFactory::class);
     }
 
     /**
@@ -134,21 +139,13 @@ public function get(array $skus)
     public function update(array $prices)
     {
         array_walk($prices, function (&$price) {
-            return $price['attribute_id'] = $this->getAttributeId();
+            return $price['attribute_id'] = (int)$this->getAttributeId();
         });
-        $connection = $this->attributeResource->getConnection();
-        $connection->beginTransaction();
+
+        $basePrice = $this->basePriceFactory->create(['attributeId' => (int)$this->getAttributeId()]);
         try {
-            foreach (array_chunk($prices, $this->itemsPerOperation) as $pricesBunch) {
-                $this->attributeResource->getConnection()->insertOnDuplicate(
-                    $this->attributeResource->getTable($this->table),
-                    $pricesBunch,
-                    ['value']
-                );
-            }
-            $connection->commit();
+            $basePrice->update($prices);
         } catch (\Exception $e) {
-            $connection->rollBack();
             throw new CouldNotSaveException(
                 __('Could not save Prices.'),
                 $e