🔃 [Magento Community Engineering] Community Contributions

Accepted Community Pull Requests:
 - #26611: #26610 Fix failing CI due to invalid variable handler (by @lbajsarowicz)
 - #26634: Xml fixes for Magento_AdvancedPricingImportExport module (by @sanganinamrata)
 - #26241: #26240: Fixed logic for getting option price index for selected swatch option (by @sergiy-v)
 - #26525: Unit test for Magento\Reports\Observer\EventSaver (by @karyna-tsymbal-atwix)
 - #26549: [Fedex] covered Model/Source/Generic.php by unit test (by @srsathish92)
 - #26487: Unit test for Magento\Fedex\Plugin\Block\Tracking\PopupDeliveryDate (by @karyna-tsymbal-atwix)
 - #26439: magento/magento2#: Unit test for \Magento\Bundle\Observer\InitOptionRendererObserver (by @atwixfirster)
 - #26429: magento/magento2#: Unit test for \Magento\Bundle\Observer\AppendUpsellProductsObserver (by @atwixfirster)


Fixed GitHub Issues:
 - #26610: MFTF: AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest is failing in CI process (reported by @lbajsarowicz) has been fixed in #26611 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. b29cdcd

 - #26240: Minimum Advertised Price doesn't change for selected swatch option for configurable product (reported by @sergiy-v) has been fixed in #26241 by @sergiy-v in 2.4-develop branch
   Related commits:
     1. 2d2f1e0
     2. 2f04078
     3. c8c31bc
     4. 324fa3f
     5. 03ef933
     6. 4ace1e6

Author: slavvka

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/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;
     }
 }