Merge branch '2.4-develop' into order-cancellation

Author: svera

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -29,8 +29,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
     protected $_path = 'backups';
 
     /**
-     * Backup data
-     *
      * @var \Magento\Backup\Helper\Data
      */
     protected $_backupData = null;
@@ -46,7 +44,9 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * @var \Magento\Framework\Filesystem
      */
     private $_filesystem;
+
     /**
+     *
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Backup\Helper\Data $backupData
      * @param \Magento\Framework\Filesystem $filesystem
@@ -61,21 +61,26 @@ public function __construct(
     ) {
         $this->_backupData = $backupData;
         parent::__construct($entityFactory, $filesystem);
-
         $this->_filesystem = $filesystem;
         $this->_backup = $backup;
         $this->_varDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-
         $this->_hideBackupsForApache();
+        $this->initialize();
+    }
 
+    /**
+     * Initialize collection
+     *
+     * @return void
+     */
+    private function initialize()
+    {
         // set collection specific params
         $extensions = $this->_backupData->getExtensions();
-
         foreach ($extensions as $value) {
             $extensions[] = '(' . preg_quote($value, '/') . ')';
         }
         $extensions = implode('|', $extensions);
-
         $this->_varDirectory->create($this->_path);
         $path = rtrim($this->_varDirectory->getAbsolutePath($this->_path), '/') . '/';
         $this->setOrder(
@@ -90,6 +95,15 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->initialize();
+    }
+
     /**
      * Create .htaccess file and deny backups directory access from web
      *

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -255,6 +255,6 @@ private function getBundleOptions(Product $saleableItem)
      */
     public function _resetState(): void
     {
-        $this->priceList = [];
+        $this->priceList = null;
     }
 }

app/code/Magento/BundleGraphQl/Model/Resolver/BundlePriceDetails.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class BundlePriceDetails implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Product $product */
+        $product = $value['model'];
+
+        $price = $product->getPrice();
+        $finalPrice = $product->getFinalPrice();
+        $discountPercentage = 100 - (($finalPrice * 100) / $price);
+        return [
+            'main_price' =>  $price,
+            'main_final_price' => $finalPrice,
+            'discount_percentage' => $discountPercentage
+        ];
+    }
+}

app/code/Magento/BundleGraphQl/etc/schema.graphqls

@@ -47,6 +47,12 @@ type SelectedBundleOptionValue @doc(description: "Contains details about a value
     price: Float! @doc(description: "The price of the value for the selected bundle product option.")
 }
 
+type PriceDetails @doc(description: "Can be used to retrieve the main price details in case of bundle product") {
+    main_price: Float @doc(description: "The regular price of the main product")
+    main_final_price: Float @doc(description: "The final price after applying the discount to the main product")
+    discount_percentage: Float @doc(description: "The percentage of discount applied to the main product price")
+}
+
 type BundleItem @doc(description: "Defines an individual item within a bundle product.") {
     option_id: Int @deprecated(reason: "Use `uid` instead") @doc(description: "An ID assigned to each type of item in a bundle product.")
     uid: ID @doc(description: "The unique ID for a `BundleItem` object.")
@@ -79,6 +85,7 @@ type BundleProduct implements ProductInterface, RoutableInterface, PhysicalProdu
     dynamic_sku: Boolean @doc(description: "Indicates whether the bundle product has a dynamic SKU.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicSku")
     ship_bundle_items: ShipBundleItemsEnum @doc(description: "Indicates whether to ship bundle items together or individually.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\ShipBundleItems")
     dynamic_weight: Boolean @doc(description: "Indicates whether the bundle product has a dynamically calculated weight.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Product\\Fields\\DynamicWeight")
+    price_details: PriceDetails @doc(description: "The price details of the main product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundlePriceDetails")
     items: [BundleItem] @doc(description: "An array containing information about individual bundle items.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleItems")
 }
 

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
@@ -783,7 +784,7 @@ private function getStoreIdByCode(string $storeCode): int
         if (!isset($this->storeCodeToId[$storeCode])) {
             /** @var $store Store */
             foreach ($this->storeManager->getStores() as $store) {
-                $this->storeCodeToId[$store->getCode()] = $store->getId();
+                $this->storeCodeToId[$store->getCode()] = (int)$store->getId();
             }
         }
 

app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Helper\Product\Flat;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Catalog Product Flat Indexer Helper
@@ -15,17 +16,17 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
+class Indexer extends \Magento\Framework\App\Helper\AbstractHelper implements ResetAfterRequestInterface
 {
     /**
      * Path to list of attributes used for flat indexer
      */
-    const XML_NODE_ATTRIBUTE_NODES = 'global/catalog/product/flat/attribute_groups';
+    public const XML_NODE_ATTRIBUTE_NODES = 'global/catalog/product/flat/attribute_groups';
 
     /**
      * Size of ids batch for reindex
      */
-    const BATCH_SIZE = 500;
+    public const BATCH_SIZE = 500;
 
     /**
      * Resource instance
@@ -49,7 +50,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Retrieve catalog product flat columns array in old format (used before MMDB support)
      *
-     * @return array
+     * @var array
      */
     protected $_attributes;
 
@@ -93,8 +94,6 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_flatAttributeGroups = [];
 
     /**
-     * Config factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\ConfigFactory
      */
     protected $_configFactory;
@@ -256,6 +255,7 @@ public function getFlatColumns()
                     $this->isAddChildData()
                 )->getFlatColumns();
                 if ($columns !== null) {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $this->_columns = array_merge($this->_columns, $columns);
                 }
             }
@@ -332,6 +332,7 @@ public function getAttributeCodes()
 
             foreach ($this->_flatAttributeGroups as $attributeGroupName) {
                 $attributes = $this->_attributeConfig->getAttributeNames($attributeGroupName);
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_systemAttributes = array_unique(array_merge($attributes, $this->_systemAttributes));
             }
 
@@ -416,6 +417,7 @@ public function getFlatIndexes()
                     $this->isAddChildData()
                 )->getFlatIndexes();
                 if ($indexes !== null) {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $this->_indexes = array_merge($this->_indexes, $indexes);
                 }
             }
@@ -515,4 +517,13 @@ public function deleteAbandonedStoreFlatTables()
             $connection->dropTable($table);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_entityTypeId = null;
+        $this->_flatAttributeGroups = [];
+    }
 }

app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php

@@ -157,6 +157,6 @@ private function getAttributes(): array
      */
     public function _resetState(): void
     {
-        $this->attributes = [];
+        $this->attributes = null;
     }
 }

app/code/Magento/Catalog/Model/Config.php

@@ -89,11 +89,6 @@ class Config extends \Magento\Eav\Model\Config
      */
     protected $_eavConfig;
 
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory
      */
@@ -166,7 +161,8 @@ public function __construct(
             $universalFactory,
             $serializer,
             $scopeConfig,
-            $attributesForPreload
+            $attributesForPreload,
+            $storeManager,
         );
     }
 

app/code/Magento/Catalog/Model/Product.php

@@ -2840,7 +2840,7 @@ public function _resetState(): void
     {
         $this->_customOptions = [];
         $this->_errors = [];
-        $this->_canAffectOptions = [];
+        $this->_canAffectOptions = false;
         $this->_productIdCached = null;
     }
 }

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

@@ -81,8 +81,8 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_storeId = null;
+        parent::_resetState();
     }
 
     /**