Merge branch '2.4-develop' into ACQE-functional-deployment-version12

Author: magento-devops-queue-mgr-svc

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')

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\ConfigurableImportExport\Model\Import\Product\Type;
 
@@ -59,7 +60,7 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
         self::ERROR_INVALID_OPTION_VALUE => 'Column configurable_variations: Invalid option value for attribute "%s"',
         self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute',
         self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations',
-        self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%s" is unidentifiable',
+        self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%1" is unidentifiable',
     ];
 
     /**
@@ -580,10 +581,8 @@ protected function _parseVariations($rowData)
             if (empty($fieldAndValuePairs['sku'])) {
                 throw new LocalizedException(
                     __(
-                        sprintf(
-                            $this->_messageTemplates[self::ERROR_UNIDENTIFIABLE_VARIATION],
-                            $variation
-                        )
+                        $this->_messageTemplates[self::ERROR_UNIDENTIFIABLE_VARIATION],
+                        $variation
                     )
                 );
             }

app/code/Magento/EavGraphQl/Model/GetAttributeSelectedOptionComposite.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -39,9 +39,7 @@ public function __construct(array $providers = [])
     public function execute(string $entityType, array $customAttribute): ?array
     {
         if (!isset($this->providers[$entityType])) {
-            throw new RuntimeException(
-                __(sprintf('"%s" entity type not set in providers', $entityType))
-            );
+            throw new RuntimeException(__('"%1" entity type not set in providers', $entityType));
         }
         if (!$this->providers[$entityType] instanceof GetAttributeSelectedOptionInterface) {
             throw new RuntimeException(

app/code/Magento/EavGraphQl/Model/GetAttributeValueComposite.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -39,9 +39,7 @@ public function __construct(array $providers = [])
     public function execute(string $entityType, array $customAttribute): ?array
     {
         if (!isset($this->providers[$entityType])) {
-            throw new RuntimeException(
-                __(sprintf('"%s" entity type not set in providers', $entityType))
-            );
+            throw new RuntimeException(__('"%1" entity type not set in providers', $entityType));
         }
         if (!$this->providers[$entityType] instanceof GetAttributeValueInterface) {
             throw new RuntimeException(

app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml

@@ -1,28 +1,32 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /** @var \Magento\Backend\Block\Page $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <div id="preview" class="cms-revision-preview">
     <iframe name="preview_iframe"
             id="preview_iframe"
             frameborder="0"
-            title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
+            title="<?= $escaper->escapeHtmlAttr(__('Preview')) ?>"
             width="100%"
-            sandbox="allow-same-origin allow-pointer-lock"
+            sandbox="allow-scripts allow-same-origin allow-pointer-lock"
     ></iframe>
     <form id="preview_form"
-          action="<?= $block->escapeUrl($block->getUrl('*/*/popup')) ?>"
+          action="<?= $escaper->escapeUrl($block->getUrl('*/*/popup')) ?>"
           method="post"
           target="preview_iframe"
     >
     <input type="hidden" name="form_key" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
     <?php foreach ($block->getPreviewFormViewModel()->getFormFields() as $name => $value): ?>
-        <input type="hidden" name="<?= $block->escapeHtmlAttr($name) ?>" value="<?= $block->escapeHtmlAttr($value) ?>"/>
+        <input type="hidden"
+               name="<?= $escaper->escapeHtmlAttr($name) ?>"
+               value="<?= $escaper->escapeHtmlAttr($value) ?>"
+        />
     <?php endforeach; ?>
     </form>
 </div>

app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -59,7 +59,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
                 $cartItem,
                 (int)$customizableOptionId
             );
-            $customizableOptionsData[] = $customizableOption;
+
+            if (!empty($customizableOption)) {
+                $customizableOptionsData[] = $customizableOption;
+            }
         }
         return $customizableOptionsData;
     }