🔃 [Magento Community Engineering] Community Contributions - 2.3-develop expedited

Accepted Community Pull Requests:
 - #23725:  Fixed an issue where an attribute named length would break the use default value checkbox from saving (by @stijnbernards)
 - #23926: Use Default Store View Constant instead of '0' (by @edenduong)
 - #23801: Resolved Can not save "CMS Block" with empty content issue 23800 (by @edenduong)
 - #20431: fixes-for-schedule-in-admin:: Schedule Update From (Schedule Design U� (by @nadim2jcommerce)
 - #18624: Add MAGE_RUN_TYPE+MAGE_RUN_CODE to FPC identifier (by @amenk)


Fixed GitHub Issues:
 - #23800: Can not save "CMS Block" with empty content (reported by @edenduong) has been fixed in #23801 by @edenduong in 2.3-develop branch
   Related commits:
     1. 1435253

 - #20377: Schedule Update From (Schedule Design Update) not saving When switch store view from admin (reported by @nadim2jcommerce) has been fixed in #20431 by @nadim2jcommerce in 2.3-develop branch
   Related commits:
     1. 6eb9717
     2. aa11360

Author: magento-engcom-team

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Store\Model\Store;
 
+/**
+ * Block for rendering option of bundle product
+ *
+ * Class \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option
+ */
 class Option extends \Magento\Backend\Block\Widget
 {
     /**
@@ -79,6 +87,8 @@ protected function _construct()
     }
 
     /**
+     * Return Field Id
+     *
      * @return string
      */
     public function getFieldId()
@@ -87,6 +97,8 @@ public function getFieldId()
     }
 
     /**
+     * Return Field Name
+     *
      * @return string
      */
     public function getFieldName()
@@ -108,6 +120,8 @@ public function getProduct()
     }
 
     /**
+     * Render
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -118,6 +132,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Set Element
+     *
      * @param AbstractElement $element
      * @return $this
      */
@@ -128,6 +144,8 @@ public function setElement(AbstractElement $element)
     }
 
     /**
+     * Get Element
+     *
      * @return AbstractElement|null
      */
     public function getElement()
@@ -136,6 +154,8 @@ public function getElement()
     }
 
     /**
+     * Return Is Multi Websites
+     *
      * @return bool
      */
     public function isMultiWebsites()
@@ -144,6 +164,8 @@ public function isMultiWebsites()
     }
 
     /**
+     * Prepare Layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -184,6 +206,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get Add Button Html
+     *
      * @return string
      */
     public function getAddButtonHtml()
@@ -192,6 +216,8 @@ public function getAddButtonHtml()
     }
 
     /**
+     * Get Close Search Button Html
+     *
      * @return string
      */
     public function getCloseSearchButtonHtml()
@@ -200,6 +226,8 @@ public function getCloseSearchButtonHtml()
     }
 
     /**
+     * Get Add Selection Button Html
+     *
      * @return string
      */
     public function getAddSelectionButtonHtml()
@@ -239,6 +267,8 @@ public function getOptions()
     }
 
     /**
+     * Get Add Button Id
+     *
      * @return mixed
      */
     public function getAddButtonId()
@@ -248,6 +278,8 @@ public function getAddButtonId()
     }
 
     /**
+     * Get Options Delete Button Html
+     *
      * @return string
      */
     public function getOptionDeleteButtonHtml()
@@ -256,6 +288,8 @@ public function getOptionDeleteButtonHtml()
     }
 
     /**
+     * Get Selection Html
+     *
      * @return string
      */
     public function getSelectionHtml()
@@ -264,6 +298,8 @@ public function getSelectionHtml()
     }
 
     /**
+     * Get Type Select Html
+     *
      * @return mixed
      */
     public function getTypeSelectHtml()
@@ -286,6 +322,8 @@ public function getTypeSelectHtml()
     }
 
     /**
+     * Get Require Select Html
+     *
      * @return mixed
      */
     public function getRequireSelectHtml()
@@ -304,10 +342,12 @@ public function getRequireSelectHtml()
     }
 
     /**
+     * Return Is Default Store
+     *
      * @return bool
      */
     public function isDefaultStore()
     {
-        return $this->getProduct()->getStoreId() == '0';
+        return $this->getProduct()->getStoreId() == Store::DEFAULT_STORE_ID;
     }
 }

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Bundle\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type as ShipmentType;
@@ -16,6 +18,7 @@
 use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\Component\Modal;
+use Magento\Store\Model\Store;
 
 /**
  * Create Ship Bundle Items and Affect Bundle Product Selections fields
@@ -814,6 +817,6 @@ protected function getSelectionPriceType()
      */
     protected function isDefaultStore()
     {
-        return $this->locator->getProduct()->getStoreId() == 0;
+        return $this->locator->getProduct()->getStoreId() == Store::DEFAULT_STORE_ID;
     }
 }