Merge remote-tracking branch 'trigger/34812' into ph-delivery

Author: xmav

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

@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 use Magento\Bundle\Model\Product\Price;
@@ -27,36 +26,22 @@ class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice imp
      */
     protected $maximalPrice;
 
-    /**
-     * @param Product $saleableItem
-     * @param float $quantity
-     * @param BundleCalculatorInterface $calculator
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     */
-    public function __construct(
-        Product $saleableItem,
-        $quantity,
-        BundleCalculatorInterface $calculator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-    ) {
-        parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
-    }
-
     /**
      * @inheritdoc
      */
     public function getAmount()
     {
-        if (!isset($this->amount[$this->getValue()])) {
-            $price = $this->getValue();
+        $price = $this->getValue();
+        $valueIndex = (string) $price;
+        if (!isset($this->amount[$valueIndex])) {
             if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) {
                 /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
                 $customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE);
                 $price += $customOptionPrice->getCustomOptionRange(true, $this->getPriceCode());
             }
-            $this->amount[$this->getValue()] = $this->calculator->getMinRegularAmount($price, $this->product);
+            $this->amount[$valueIndex] = $this->calculator->getMinRegularAmount($price, $this->product);
         }
-        return $this->amount[$this->getValue()];
+        return $this->amount[$valueIndex];
     }
 
     /**

app/code/Magento/Bundle/etc/di.xml

@@ -72,6 +72,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Bundle\Pricing\Price\BundleRegularPrice">
+        <arguments>
+            <argument name="calculator" xsi:type="object">Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface</argument>
+        </arguments>
+    </type>
     <type name="Magento\Bundle\Pricing\Price\FinalPrice">
         <arguments>
             <argument name="calculator" xsi:type="object">Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface</argument>

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -40,9 +40,9 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
     /**
      * Possible customer address types
      */
-    const TYPE_BILLING = 'billing';
+    public const TYPE_BILLING = 'billing';
 
-    const TYPE_SHIPPING = 'shipping';
+    public const TYPE_SHIPPING = 'shipping';
 
     /**
      * Prefix of model events
@@ -73,8 +73,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
     protected static $_regionModels = [];
 
     /**
-     * Directory data
-     *
      * @var \Magento\Directory\Helper\Data
      */
     protected $_directoryData = null;
@@ -241,7 +239,7 @@ public function getStreetLine($number)
     public function getStreetFull()
     {
         $street = $this->getData('street');
-        return is_array($street) ? implode("\n", $street) : $street;
+        return is_array($street) ? implode("\n", $street) : ($street ?? '');
     }
 
     /**

app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -13,11 +12,9 @@ class Index extends \Magento\Backend\App\Action implements HttpPostActionInterfa
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Magento_Widget::widget_instance';
+    public const ADMIN_RESOURCE = 'Magento_Widget::widget_instance';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry;
@@ -50,11 +47,11 @@ public function __construct(
     public function execute()
     {
         // save extra params for widgets insertion form
-        $skipped = $this->getRequest()->getParam('skip_widgets');
+        $skipped = $this->getRequest()->getParam('skip_widgets', '');
         $skipped = $this->_widgetConfig->decodeWidgetsFromQuery($skipped);
-
         $this->_coreRegistry->register('skip_widgets', $skipped);
 
+        // phpcs:ignore Magento2.Legacy.ObsoleteResponse
         $this->_view->loadLayout('empty')->renderLayout();
     }
 }

dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php

@@ -75,13 +75,13 @@ public function testGetCommentsHtml(): void
      *
      * @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data_different_currency_code.php
      */
-    public function testGetCurrencyCodeCustomValue ()
+    public function testGetCurrencyCodeCustomValue()
     {
         $template = '/<span class="customs-value-currency">\s*?(?<currency>[A-Za-z]+)\s*?<\/span>/';
         $matches = [];
         preg_match($template, $this->getHtml(), $matches);
         $currency = $matches['currency'] ?? null;
-        $this->assertEquals('FR',$currency );
+        $this->assertEquals('FR', $currency);
     }
 
     /**
@@ -102,6 +102,7 @@ private function getHtml()
         $this->registry->register('current_shipment', $shipment);
 
         $block->setTemplate('Magento_Shipping::order/packaging/popup.phtml');
+        $block->setNameInLayout('test');
 
         return $block->toHtml();
     }

dev/tests/integration/testsuite/Magento/User/Block/User/Edit/Tab/MainTest.php

@@ -28,6 +28,7 @@ protected function setUp(): void
 
         $this->_block = $objectManager->create(\Magento\User\Block\User\Edit\Tab\Main::class);
         $this->_block->setArea('adminhtml');
+        $this->_block->setNameInLayout('test');
         $this->_user = $objectManager->create(\Magento\User\Model\User::class);
 
         $objectManager->get(\Magento\Framework\Registry::class)->register('permissions_user', $this->_user);