🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests: - magento#15561: [Forwardport] Removed duplicate line and added comment on variable (by @vgelani) - magento#15547: [Forwardport 2.3] Fix typos in multishipping module (by @VitaliyBoyko) - magento#15391: [Forwardport] Add 'const' type support to layout arguments (by @IgorVitol)
gelanivishal · May 29, 2018 · d849f99 · d849f99
2 parents 166dd61 + 2ef0752
commit d849f99
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * Mustishipping checkout base abstract block
+ * Multishipping checkout base abstract block
  *
  * @author      Magento Core Team <[email protected]>
  */

diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 
 /**
- * Mustishipping checkout shipping
+ * Multishipping checkout shipping
  *
  * @api
  * @author     Magento Core Team <[email protected]>

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -15,9 +15,9 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
-    //protected $_template = 'tax/checkout/subtotal.phtml';
+    /**
+     * @var \Magento\Tax\Model\Config
+     */
     protected $_taxConfig;
 
     /**

diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
@@ -252,6 +252,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>

diff --git a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
      */
     /**
-     * Mustishipping checkout base abstract block
+     * Multishipping checkout base abstract block
      *
      * @author      Magento Core Team <[email protected]>
      */
@@ Expand Down @@