Merge branch '2.4-develop' into Arrows_18_Apr_2023

Author: sidolov

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -7,6 +7,7 @@
 namespace Magento\Authorization\Model;
 
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * User context.
@@ -17,7 +18,7 @@
  * @api
  * @since 100.0.2
  */
-class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
+class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface, ResetAfterRequestInterface
 {
     /**
      * @var UserContextInterface[]
@@ -92,4 +93,12 @@ protected function getUserContext()
         }
         return $this->chosenUserContext;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->chosenUserContext = null;
+    }
 }

app/code/Magento/Bundle/Model/Plugin/Frontend/ProductIdentitiesExtender.php

@@ -9,11 +9,12 @@
 
 use Magento\Bundle\Model\Product\Type as BundleType;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Add child identities to product identities on storefront.
  */
-class ProductIdentitiesExtender
+class ProductIdentitiesExtender implements ResetAfterRequestInterface
 {
     /**
      * @var BundleType
@@ -68,4 +69,12 @@ private function getChildrenIds($entityId): array
 
         return $this->cacheChildrenIds[$entityId];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->cacheChildrenIds = [];
+    }
 }

app/code/Magento/Bundle/Model/Plugin/ProductIdentitiesExtender.php

@@ -9,11 +9,12 @@
 
 use Magento\Bundle\Model\Product\Type as BundleType;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Add parent identities to product identities.
  */
-class ProductIdentitiesExtender
+class ProductIdentitiesExtender implements ResetAfterRequestInterface
 {
     /**
      * @var BundleType
@@ -68,4 +69,12 @@ private function getParentIdsByChild($entityId): array
 
         return $this->cacheParentIdsByChild[$entityId];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->cacheParentIdsByChild = [];
+    }
 }

app/code/Magento/Bundle/Model/Product/SelectionProductsDisabledRequired.php

@@ -10,6 +10,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Bundle\Model\ResourceModel\Selection as BundleSelection;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Catalog\Model\Product;
@@ -18,7 +19,7 @@
 /**
  * Class to return ids of options and child products when all products in required option are disabled in bundle product
  */
-class SelectionProductsDisabledRequired
+class SelectionProductsDisabledRequired implements ResetAfterRequestInterface
 {
     /**
      * @var BundleSelection
@@ -161,4 +162,12 @@ private function getCacheKey(int $bundleId, int $websiteId): string
     {
         return $bundleId . '-' . $websiteId;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->productsDisabledRequired = [];
+    }
 }

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

@@ -12,6 +12,7 @@
 use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
 use Magento\Bundle\Pricing\Price\BundleSelectionPrice;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\Adjustment\Calculator as CalculatorBase;
 use Magento\Framework\Pricing\Amount\AmountFactory;
 use Magento\Framework\Pricing\Amount\AmountInterface;
@@ -25,7 +26,7 @@
  * Bundle price calculator
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Calculator implements BundleCalculatorInterface
+class Calculator implements BundleCalculatorInterface, ResetAfterRequestInterface
 {
     /**
      * @var CalculatorBase
@@ -214,7 +215,8 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
      * @param Option $option
      * @param bool $canSkipRequiredOption
      * @return bool
-     * @deprecated 100.2.0
+     * @deprecated 100.2.0 Not used anymore.
+     * @see Nothing
      */
     protected function canSkipOption($option, $canSkipRequiredOption)
     {
@@ -226,7 +228,8 @@ protected function canSkipOption($option, $canSkipRequiredOption)
      *
      * @param Product $bundleProduct
      * @return bool
-     * @deprecated 100.2.0
+     * @deprecated 100.2.0 Not used anymore.
+     * @see Nothing
      */
     protected function hasRequiredOption($bundleProduct)
     {
@@ -245,6 +248,7 @@ function ($item) {
      * @param Product $saleableItem
      * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      * @deprecated 100.2.0
+     * @see Nothing
      */
     protected function getBundleOptions(Product $saleableItem)
     {
@@ -425,4 +429,12 @@ public function processOptions($option, $selectionPriceList, $searchMin = true)
         }
         return $result;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->optionAmount = [];
+    }
 }

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

@@ -11,13 +11,14 @@
 use Magento\Catalog\Model\Product;
 use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Helper\Data as CatalogData;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
  * Provide lightweight implementation which uses price index
  */
-class DefaultSelectionPriceListProvider implements SelectionPriceListProviderInterface
+class DefaultSelectionPriceListProvider implements SelectionPriceListProviderInterface, ResetAfterRequestInterface
 {
     /**
      * @var BundleSelectionFactory
@@ -245,4 +246,12 @@ private function getBundleOptions(Product $saleableItem)
     {
         return $saleableItem->getTypeInstance()->getOptionsCollection($saleableItem);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->priceList = [];
+    }
 }

app/code/Magento/Bundle/Pricing/Price/BundleOptions.php

@@ -8,14 +8,15 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Catalog\Model\Product;
 
 /**
  * Bundle option price calculation model.
  */
-class BundleOptions
+class BundleOptions implements ResetAfterRequestInterface
 {
     /**
      * @var BundleCalculatorInterface
@@ -91,6 +92,7 @@ public function calculateOptions(
             /** @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice $selectionPriceList */
             $selectionPriceList = $this->calculator->createSelectionPriceList($option, $bundleProduct);
             $selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $priceList = array_merge($priceList, $selectionPriceList);
         }
         $amount = $this->calculator->calculateBundleAmount(0., $bundleProduct, $priceList);
@@ -135,4 +137,12 @@ public function getOptionSelectionAmount(
 
         return $this->optionSelectionAmountCache[$cacheKey];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->optionSelectionAmountCache = [];
+    }
 }

app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php

@@ -7,14 +7,16 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 use Magento\Bundle\Model\Product\Price;
 
 /**
  * Bundle product regular price model
  */
-class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface
+class BundleRegularPrice extends RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
 {
     /**
      * @var BundleCalculatorInterface
@@ -72,4 +74,13 @@ public function getMinimalPrice()
     {
         return $this->getAmount();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->maximalPrice = null;
+        $this->amount = [];
+    }
 }

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 use Magento\Bundle\ViewModel\ValidateQuantity;
+
+// phpcs:disable Generic.Files.LineLength.TooLong
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
 <?php $_option = $block->getOption(); ?>
@@ -49,8 +51,7 @@ $viewModel = $block->getData('validateQuantityViewModel');
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option change-container-classname"
-                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>
-                               -<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                             <?php if ($_option->getRequired()) {
                                 echo 'data-validate="{\'validate-one-required-by-name\':true}"';
                             } ?>
@@ -61,8 +62,7 @@ $viewModel = $block->getData('validateQuantityViewModel');
                                value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                                data-errors-message-box="#validation-message-box-radio"/>
                         <label class="label"
-                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>
-                               -<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
                             <span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
                             <br/>
                             <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>

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

@@ -7,37 +7,43 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
+use Magento\BundleGraphQl\Model\Resolver\Links\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
  * @inheritdoc
  */
 class BundleItemLinks implements ResolverInterface
 {
     /**
-     * @var Collection
+     * @var CollectionFactory
      */
-    private $linkCollection;
+    private CollectionFactory $linkCollectionFactory;
 
     /**
      * @var ValueFactory
      */
-    private $valueFactory;
+    private ValueFactory $valueFactory;
 
     /**
-     * @param Collection $linkCollection
+     * @param Collection $linkCollection Deprecated. Use $linkCollectionFactory instead
      * @param ValueFactory $valueFactory
+     * @param CollectionFactory|null $linkCollectionFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Collection $linkCollection,
-        ValueFactory $valueFactory
+        ValueFactory $valueFactory,
+        CollectionFactory $linkCollectionFactory = null
     ) {
-        $this->linkCollection = $linkCollection;
+        $this->linkCollectionFactory = $linkCollectionFactory
+            ?: ObjectManager::getInstance()->get(CollectionFactory::class);
         $this->valueFactory = $valueFactory;
     }
 
@@ -49,12 +55,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['option_id']) || !isset($value['parent_id'])) {
             throw new LocalizedException(__('"option_id" and "parent_id" values should be specified'));
         }
-
-        $this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
-        $result = function () use ($value) {
-            return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);
+        $linkCollection = $this->linkCollectionFactory->create();
+        $linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
+        $result = function () use ($value, $linkCollection) {
+            return $linkCollection->getLinksForOptionId((int)$value['option_id']);
         };
-
         return $this->valueFactory->create($result);
     }
 }