Merge branch '2.4-develop' into feature/dependencies_into_constructor_pagecache

Author: engcom-Charlie

app/code/Magento/AdvancedPricingImportExport/etc/module.xml

@@ -6,6 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_AdvancedPricingImportExport" >
-    </module>
+    <module name="Magento_AdvancedPricingImportExport"/>
 </config>

app/code/Magento/Analytics/Model/Connector.php

@@ -53,7 +53,7 @@ public function __construct(
     public function execute($commandName)
     {
         if (!array_key_exists($commandName, $this->commands)) {
-            throw new NotFoundException(__('Command was not found.'));
+            throw new NotFoundException(__('Command "%1" was not found.', $commandName));
         }
 
         /** @var \Magento\Analytics\Model\Connector\CommandInterface $command */

app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php

@@ -57,9 +57,13 @@ public function testExecute()
     }
 
     /**
+     * Executing non-existing command
+     *
      * @expectedException \Magento\Framework\Exception\NotFoundException
+     * @expectedExceptionMessage Command "register" was not found.
+     * @return void
      */
-    public function testExecuteCommandNotFound()
+    public function testExecuteCommandNotFound(): void
     {
         $commandName = 'register';
         $this->connector->execute($commandName);

app/code/Magento/Analytics/i18n/en_US.csv

@@ -7,7 +7,7 @@
 "There was an error save new configuration value.","There was an error save new configuration value."
 "Please select an industry.","Please select an industry."
 "--Please Select--","--Please Select--"
-"Command was not found.","Command was not found."
+"Command "%1" was not found.","Command "%1" was not found."
 "Input data must be string or convertible into string.","Input data must be string or convertible into string."
 "Input data must be non-empty string.","Input data must be non-empty string."
 "Not valid cipher method.","Not valid cipher method."

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -18,7 +18,6 @@ define(
         'Magento_Vault/js/view/payment/vault-enabler',
         'Magento_Braintree/js/view/payment/kount',
         'mage/translate',
-        'prototype',
         'domReady!'
     ],
     function (

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -269,6 +269,7 @@ define([
                  */
                 onError: function () {
                     self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
+                    self.reInitPayPal();
                 }
             }, self.paypalButtonSelector);
         },

app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class adds bundle products into up-sell products collection
+ */
 class AppendUpsellProductsObserver implements ObserverInterface
 {
     /**
@@ -98,9 +101,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         /* @var $bundleCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
-        $bundleCollection = $product->getCollection()->addAttributeToSelect(
+        $bundleCollection = $product->getCollection();
+        $bundleCollection->addAttributeToSelect(
             $this->config->getProductAttributes()
-        )->addStoreFilter()->addMinimalPrice()->addFinalPrice()->addTaxPercents()->setVisibility(
+        );
+        $bundleCollection->addStoreFilter();
+        $bundleCollection->addMinimalPrice();
+        $bundleCollection->addFinalPrice();
+        $bundleCollection->addTaxPercents();
+        $bundleCollection->setVisibility(
             $this->productVisibility->getVisibleInCatalogIds()
         );
 

app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php

@@ -5,20 +5,25 @@
  */
 namespace Magento\Bundle\Observer;
 
+use Magento\Bundle\Helper\Catalog\Product\Configuration;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Initiates render options
+ */
 class InitOptionRendererObserver implements ObserverInterface
 {
     /**
      * Initialize product options renderer with bundle specific params
      *
-     * @param \Magento\Framework\Event\Observer $observer
+     * @param Observer $observer
      * @return $this
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(Observer $observer)
     {
         $block = $observer->getBlock();
-        $block->addOptionsRenderCfg('bundle', \Magento\Bundle\Helper\Catalog\Product\Configuration::class);
+        $block->addOptionsRenderCfg('bundle', Configuration::class);
         return $this;
     }
 }