Merge pull request #10072 from magento-gl/sept-comprs

[Bluetooth] Community Pull Requests delivery - Sept2 comprs

Author: internal-magento-queue-manager[bot]

app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php

@@ -195,10 +195,17 @@ public function testStoreCodeShouldBeIncludedInURLOnlyIfItIsConfiguredSo(
                 [
                     [Store::XML_PATH_USE_REWRITES, ReinitableConfigInterface::SCOPE_TYPE_DEFAULT, null, true],
                     [Store::XML_PATH_UNSECURE_BASE_LINK_URL, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, ''],
+                ]
+            );
+        $config->expects($this->any())
+            ->method('isSetFlag')
+            ->willReturnMap(
+                [
                     [
                         Store::XML_PATH_STORE_IN_URL,
                         ReinitableConfigInterface::SCOPE_TYPE_DEFAULT,
-                        null, $includeStoreCode
+                        null,
+                        $includeStoreCode
                     ]
                 ]
             );

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.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\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV;
@@ -22,7 +22,6 @@ class ColumnResolver
         self::COLUMN_COUNTRY => 0,
         self::COLUMN_REGION => 1,
         self::COLUMN_ZIP => 2,
-        self::COLUMN_WEIGHT => 3, // @phpstan-ignore-line
         self::COLUMN_WEIGHT_DESTINATION => 3,
         self::COLUMN_PRICE => 4,
     ];

app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -16,14 +16,15 @@
  */
 class ColumnResolverTest extends TestCase
 {
-    const CUSTOM_FIELD = 'custom_field';
+    private const CUSTOM_FIELD = 'custom_field';
 
-    // phpstan:ignore
+    /**
+     * @var array<string, string>
+     */
     private static $values = [
         ColumnResolver::COLUMN_COUNTRY => 'country value',
         ColumnResolver::COLUMN_REGION => 'region value',
         ColumnResolver::COLUMN_ZIP => 'zip_value',
-        ColumnResolver::COLUMN_WEIGHT => 'weight_value',
         ColumnResolver::COLUMN_WEIGHT_DESTINATION => 'weight_destination_value',
         ColumnResolver::COLUMN_PRICE => 'price_value',
         self::CUSTOM_FIELD => 'custom_value',
@@ -87,11 +88,6 @@ public static function getColumnValueDataProvider()
                 ColumnResolver::COLUMN_ZIP,
                 self::$values[ColumnResolver::COLUMN_ZIP],
             ],
-            // phpstan:ignore
-            ColumnResolver::COLUMN_WEIGHT => [
-                ColumnResolver::COLUMN_WEIGHT,
-                self::$values[ColumnResolver::COLUMN_WEIGHT],
-            ],
             ColumnResolver::COLUMN_WEIGHT_DESTINATION => [
                 ColumnResolver::COLUMN_WEIGHT_DESTINATION,
                 self::$values[ColumnResolver::COLUMN_WEIGHT_DESTINATION],

app/code/Magento/OrderCancellationUi/view/frontend/web/js/cancel-order-modal.js

@@ -14,7 +14,7 @@ define([
             options = {
                 type: 'popup',
                 responsive: true,
-                title: 'Cancel Order',
+                title: $.mage.__('Cancel Order'),
                 buttons: [{
                     text: $.mage.__('Close'),
                     class: 'action-secondary action-dismiss close-modal-button',

app/code/Magento/ProductAlert/Helper/Data.php

@@ -110,8 +110,12 @@ public function getSaveUrl($type)
     /**
      * Create block instance
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T>|T $block
+     *
+     * @return T
+     *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function createBlock($block)

app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php

@@ -109,9 +109,9 @@ public function canSendCommentEmail()
     /**
      * Replace links in string
      *
-     * @param array|string $data
+     * @param string|int|float|\Stringable|array<string|int|float|\Stringable> $data
      * @param null|array $allowedTags
-     * @return string
+     * @return ($data is array ? string[] : string)
      */
     public function escapeHtml($data, $allowedTags = null)
     {

app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Block\Adminhtml\Order\View;
 
@@ -132,9 +132,9 @@ public function isCustomerNotificationNotApplicable(\Magento\Sales\Model\Order\S
     /**
      * Replace links in string
      *
-     * @param array|string $data
+     * @param string|int|float|\Stringable|array<string|int|float|\Stringable> $data
      * @param null|array $allowedTags
-     * @return string
+     * @return ($data is array ? string[] : string)
      */
     public function escapeHtml($data, $allowedTags = null)
     {

app/code/Magento/Sales/Helper/Admin.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -154,9 +154,9 @@ public function applySalableProductTypesFilter($collection)
     /**
      * Escape string preserving links
      *
-     * @param string $data
+     * @param string|int|float|\Stringable|array<string|int|float|\Stringable> $data
      * @param null|array $allowedTags
-     * @return string
+     * @return ($data is array ? string[] : string)
      */
     public function escapeHtmlWithLinks($data, $allowedTags = null)
     {

app/code/Magento/Store/App/Request/StorePathInfoValidator.php

@@ -77,17 +77,16 @@ public function __construct(
      */
     public function getValidStoreCode(Http $request, string $pathInfo = '') : ?string
     {
-        $useStoreCodeInUrl = (bool) $this->config->getValue(Store::XML_PATH_STORE_IN_URL);
-        if (!$useStoreCodeInUrl) {
+        if (!$this->config->isSetFlag(Store::XML_PATH_STORE_IN_URL)) {
             return null;
         }
 
-        if (empty($pathInfo)) {
+        if ($pathInfo === '') {
             $pathInfo = $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl());
         }
         $storeCode = $this->getStoreCode($pathInfo);
 
-        if (empty($storeCode) || $storeCode === Store::ADMIN_CODE || !$this->storeCodeValidator->isValid($storeCode)) {
+        if ($storeCode === '' || $storeCode === Store::ADMIN_CODE || !$this->storeCodeValidator->isValid($storeCode)) {
             return null;
         }
 
@@ -98,14 +97,9 @@ public function getValidStoreCode(Http $request, string $pathInfo = '') : ?strin
         try {
             $this->storeRepository->getActiveStoreByCode($storeCode);
 
-            $this->validatedStoreCodes[$storeCode] = $storeCode;
-            return $storeCode;
-        } catch (NoSuchEntityException $e) {
-            $this->validatedStoreCodes[$storeCode] = null;
-            return null;
-        } catch (StoreIsInactiveException $e) {
-            $this->validatedStoreCodes[$storeCode] = null;
-            return null;
+            return $this->validatedStoreCodes[$storeCode] = $storeCode;
+        } catch (NoSuchEntityException|StoreIsInactiveException) {
+            return $this->validatedStoreCodes[$storeCode] = null;
         }
     }
 

app/code/Magento/Store/Model/Store.php

@@ -764,8 +764,8 @@ protected function _updatePathUseStoreView($url)
     public function isUseStoreInUrl()
     {
         return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())
-            && !$this->getConfig(StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED)
-            && $this->getConfig(self::XML_PATH_STORE_IN_URL);
+            && !$this->_config->isSetFlag(StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED)
+            && $this->_config->isSetFlag(self::XML_PATH_STORE_IN_URL);
     }
 
     /**