Merge branch '2.4-develop' into baudeval-patch-1

Author: baudeval

app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml

@@ -155,6 +155,7 @@
         <wait time="2" stepKey="waitForPageLoad2" />
         <click selector="{{AdminOrderDetailsMainActionsSection.edit}}" stepKey="clickEditButton"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ok}}" stepKey="clickOk"/>
+        <waitForElementClickable selector="{{AdminOrderFormItemsSection.configure}}" stepKey="waitForItemConfigureButton"/>
         <click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
         <click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickTodropdown2"/>
         <click selector="{{AdminOrderFormConfigureProductSection.selectProductOption('3')}}" stepKey="clickToSelectOption2"/>

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

@@ -3,6 +3,7 @@
  * Copyright 2017 Adobe
  * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model;
 
@@ -17,18 +18,12 @@
  */
 class FrontendStorageConfigurationPool
 {
-    /**
-     * @var array
-     */
-    private $storageConfigurations;
-
     /**
      * StorageConfigurationPool constructor.
      * @param array $storageConfigurations
      */
-    public function __construct(array $storageConfigurations = [])
+    public function __construct(private array $storageConfigurations = [])
     {
-        $this->storageConfigurations = $storageConfigurations;
     }
 
     /**
@@ -40,16 +35,16 @@ public function __construct(array $storageConfigurations = [])
      */
     public function get($namespace)
     {
-        if (isset($this->storageConfigurations[$namespace])) {
-            if (!$this->storageConfigurations[$namespace] instanceof FrontendStorageConfigurationInterface) {
-                throw new LocalizedException(
-                    __(sprintf("Invalid pool type with namespace: %s", $namespace))
-                );
-            }
-        } else {
+        $storageConfiguration = $this->storageConfigurations[$namespace] ?? null;
+        if ($storageConfiguration === null) {
             return false;
         }
+        if (!$storageConfiguration instanceof FrontendStorageConfigurationInterface) {
+            throw new LocalizedException(
+                __("Invalid pool type with namespace: %1", $namespace)
+            );
+        }
 
-        return $this->storageConfigurations[$namespace];
+        return $storageConfiguration;
     }
 }

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -3,6 +3,7 @@
  * Copyright 2014 Adobe
  * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogInventory\Model;
 
@@ -169,13 +170,13 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         if (!$this->checkQty($stockItem, $summaryQty) || !$this->checkQty($stockItem, $qty)) {
             $message = __('The requested qty. is not available');
             if ((int) $this->scopeConfig->getValue('cataloginventory/options/not_available_message') === 1) {
-                $itemMessage = (__(sprintf(
-                    'Only %s of %s available',
+                $itemMessage = __(
+                    'Only %1 of %2 available',
                     $stockItem->getQty() - $stockItem->getMinQty(),
                     $this->localeFormat->getNumber($qty)
-                )));
+                );
             } else {
-                $itemMessage = (__('Not enough items for sale'));
+                $itemMessage = __('Not enough items for sale');
             }
             $result->setHasError(true)
                 ->setErrorCode('qty_available')