🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento#16135: Fix type hints and add undefined property in Webapi [2.3-develop] (by @mhauri)
 - magento#16170: 1163: CreateCreditMemoEntityTest rework to support MSI reservation mechanism. (by @nmalevanec)
 - magento#16153: 1190: CreateOrderBackendPartOneTest rework to support MSI reservation mechanism. (by @nmalevanec)
 - magento#16061: Change the favicon file to the newer Magento logo (by @DMMundle)
 - magento#16155: [Forwardport] chore: prefer woff and woff2 (by @DanielRuf)
 - magento#15777: [Forwardport] Fix negative basket total due to shipping tax residue (by @osrecio)
 - magento#15861: [Forwardport] ISSUE-14747 Newsletter subscription confirmation message does not dis� (by @rahul-kachhadiya)
 - magento#16097: [Forwardport] fix: prevent inline-block issue in name form due to space and font-size (by @DanielRuf)
 - magento#15798: [Forwardport] Removed unnecessary css. #2 (by @chirag-wagento)
 - magento#16038: [Forwardport] bugfix checkout page cart icon color (by @chirag-wagento)
 - magento#15759: [Forwardport] 2.3 develop pr port 15566 (by @vgelani)
 - magento#16137: FIX for apparently random API failures while using array types (by @phoenix128)


Fixed GitHub Issues:
 - magento#1163: Problem when change less file in magento. (reported by @zivendesign) has been fixed in magento#16170 by @nmalevanec in 2.3-develop branch
   Related commits:
     1. f53c620

 - magento#1190: installation error in  0.74.0-beta4 (reported by @sivajik34) has been fixed in magento#16153 by @nmalevanec in 2.3-develop branch
   Related commits:
     1. 2b8b9d5

 - magento#14747: Newsletter subscription confirmation message does not display after clicking link in email (reported by @tohann) has been fixed in magento#15861 by @rahul-kachhadiya in 2.3-develop branch
   Related commits:
     1. 75516bf

 - magento#16047: inline-block issue in name form (reported by @DanielRuf) has been fixed in magento#16097 by @DanielRuf in 2.3-develop branch
   Related commits:
     1. 204b4ac

 - magento#15565: Getting wrong frontend-controller, when using storecodes in urls (reported by @EliasKotlyar) has been fixed in magento#15759 by @vgelani in 2.3-develop branch
   Related commits:
     1. 61856f5
     2. 4c77dff

app/code/Magento/Customer/view/frontend/templates/widget/name.phtml

@@ -28,20 +28,15 @@ $suffix = $block->showSuffix();
 ?>
 <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
 <div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
-    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
-        <span><?= $block->escapeHtml(__('Name')) ?></span>
-    </label>
+    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
     <div class="control">
         <fieldset class="fieldset fieldset-fullname">
         <div class="fields">
 <?php endif; ?>
 
     <?php if ($prefix): ?>
         <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
             <div class="control">
                 <?php if ($block->getPrefixOptions() === false): ?>
                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
@@ -65,10 +60,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-firstname required">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
@@ -80,10 +72,7 @@ $suffix = $block->showSuffix();
     <?php if ($middle): ?>
         <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
         <div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
@@ -94,10 +83,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-lastname required">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
             <div class="control">
                 <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
@@ -108,10 +94,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php if ($suffix): ?>
         <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
-            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
-                <span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
-            </label>
-
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
             <div class="control">
                 <?php if ($block->getSuffixOptions() === false): ?>
                     <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"

app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php

@@ -32,6 +32,8 @@ public function execute()
             }
         }
 
-        $this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
+        return $resultRedirect;
     }
 }

app/code/Magento/Store/Model/PathConfig.php

@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
      */
     public function getDefaultPath()
     {
-        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+        $store = $this->storeManager->getStore();
+        $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
+        return $value;
     }
 }

app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php

@@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total)
         $total->setBaseTotalAmount('subtotal', 0);
         $total->setTotalAmount('tax', 0);
         $total->setBaseTotalAmount('tax', 0);
+        $total->setTotalAmount('shipping', 0);
+        $total->setBaseTotalAmount('shipping', 0);
         $total->setTotalAmount('discount_tax_compensation', 0);
         $total->setBaseTotalAmount('discount_tax_compensation', 0);
         $total->setTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setBaseTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setSubtotalInclTax(0);
         $total->setBaseSubtotalInclTax(0);
+        $total->setShippingInclTax(0);
+        $total->setBaseShippingInclTax(0);
+        $total->setShippingTaxAmount(0);
+        $total->setBaseShippingTaxAmount(0);
+        $total->setShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setTotalAmount('extra_tax', 0);
+        $total->setBaseTotalAmount('extra_tax', 0);
     }
 
     /**

app/code/Magento/Webapi/Controller/Soap.php

@@ -51,6 +51,11 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
      */
     protected $_errorProcessor;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    protected $_appState;
+
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
      */

app/code/Magento/Webapi/Controller/Soap/Request/Handler.php

@@ -107,7 +107,7 @@ public function __construct(
      *
      * @param string $operation
      * @param array $arguments
-     * @return \stdClass|null
+     * @return array
      * @throws WebapiException
      * @throws \LogicException
      * @throws AuthorizationException

app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php

@@ -19,7 +19,7 @@ class GuestAuthorization
      * Check if resource for which access is needed has anonymous permissions defined in webapi config.
      *
      * @param \Magento\Framework\Authorization $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param string $resource
      * @param string $privilege
      * @return bool true If resource permission is anonymous,

app/code/Magento/Webapi/Model/Soap/Server.php

@@ -31,7 +31,7 @@ class Server
     const REQUEST_PARAM_LIST_WSDL = 'wsdl_list';
 
     /**
-     * @var \Magento\Framework\App\AreaLIst
+     * @var \Magento\Framework\App\AreaList
      */
     protected $_areaList;
 

app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php

@@ -125,7 +125,7 @@ public function testToXmlDeveloperModeOff()
     public function testToXmlDeveloperModeOn()
     {
         $this->_appStateMock->expects($this->any())->method('getMode')->will($this->returnValue('developer'));
-        $actualXml = $this->_soapFault->toXml(true);
+        $actualXml = $this->_soapFault->toXml();
         $this->assertContains('<m:Trace>', $actualXml, 'Exception trace is not found in XML.');
     }
 

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less

@@ -35,7 +35,11 @@
             .action {
                 &.showcart {
                     &:before {
-                        .lib-css(color, @primary__color);
+                        .lib-css(color, @button__color);
+                    }
+
+                    &:hover:before {
+                        .lib-css(color, @button__hover__color);
                     }
                 }
             }

app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less

@@ -22,10 +22,6 @@
                 &:last-child {
                     margin-bottom: 0;
                 }
-
-                &.primary {
-                    //  &:extend(.abs-button-l all);
-                }
             }
 
             &:last-child {

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendPartOneTest.xml

@@ -19,10 +19,10 @@
                 <item name="grandTotal" xsi:type="string">425.00</item>
             </data>
             <data name="payment/method" xsi:type="string">cashondelivery</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Hold, Invoice, Ship, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Invoice, Edit</data>
             <data name="configData" xsi:type="string">cashondelivery</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -42,7 +42,6 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -59,10 +58,10 @@
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="payment/method" xsi:type="string">banktransfer</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Reorder, Invoice, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Reorder, Invoice, Edit</data>
             <data name="configData" xsi:type="string">banktransfer</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -84,7 +83,6 @@
             <data name="status" xsi:type="string">Pending</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
             <data name="configData" xsi:type="string">freeshipping_specificcountry_gb, banktransfer</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -103,10 +101,10 @@
             </data>
             <data name="payment/method" xsi:type="string">purchaseorder</data>
             <data name="payment/po_number" xsi:type="string">123456</data>
-            <data name="status" xsi:type="string">Pending</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Reorder, Edit</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Invoice, Reorder, Edit</data>
             <data name="configData" xsi:type="string">purchaseorder</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -127,7 +125,7 @@
                 <item name="grandTotal" xsi:type="string">21.91</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="CreateOrderBackendTestVariation7" summary="Create Order for New Customer in Admin with Offline Payment Method" ticketId="MAGETWO-12520">
@@ -145,7 +143,7 @@
                 <item name="grandTotal" xsi:type="string">21.91</item>
             </data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
+            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>

dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml

@@ -55,7 +55,8 @@
         <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
-        <step name="submitOrder" module="Magento_Sales" />
+        <step name="submitOrder" module="Magento_Sales" next="createShipment" />
+        <step name="createShipment" module="Magento_Sales"/>
     </scenario>
     <scenario name="VoidAuthorizationTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
@@ -146,7 +147,8 @@
     <scenario name="CreateCreditMemoEntityTest" firstStep="setupConfiguration">
         <step name="setupConfiguration" module="Magento_Config" next="createOrder" />
         <step name="createOrder" module="Magento_Sales" next="createInvoice" />
-        <step name="createInvoice" module="Magento_Sales" next="createCreditMemo" />
+        <step name="createInvoice" module="Magento_Sales" next="createShipment" />
+        <step name="createShipment" module="Magento_Sales" next="createCreditMemo" />
         <step name="createCreditMemo" module="Magento_Sales" />
     </scenario>
 </config>

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css

@@ -1000,15 +1000,13 @@ fieldset[disabled] .pager .action-next {
 }
 @font-face {
   font-family: 'icons-blank-theme';
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');
+  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'icons-blank-theme';
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
-  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype');
+  src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }

lib/internal/Magento/Framework/Reflection/TypeProcessor.php

@@ -523,7 +523,7 @@ public function getParamType(ParameterReflection $param)
         if ($type == 'array') {
             // try to determine class, if it's array of objects
             $docBlock = $param->getDeclaringFunction()->getDocBlock();
-            $pattern = "/\@param\s+([\w\\\_]+\[\])\s+\\\${$param->getName()}\n/";
+            $pattern = "/\@param\s+([\w\\\_]+\[\])\s+\\\${$param->getName()}[\n\r]/";
             $matches = [];
             if (preg_match($pattern, $docBlock->getContents(), $matches)) {
                 return $matches[1];

lib/web/css/docs/source/_typography.less

@@ -947,12 +947,8 @@
 //    ) {
 //        @font-face {
 //            font-family: @family-name;
-//            src: url('@{font-path}.eot');
-//            src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
-//            url('@{font-path}.woff2') format('woff2'),
-//            url('@{font-path}.woff') format('woff'),
-//            url('@{font-path}.ttf') format('truetype'),
-//            url('@{font-path}.svg#@{family-name}') format('svg');
+//            src: url('@{font-path}.woff2') format('woff2'),
+//            url('@{font-path}.woff') format('woff');
 //            font-weight: @font-weight;
 //            font-style: @font-style;
 //        }

lib/web/css/source/lib/_typography.less

@@ -15,12 +15,8 @@
 ) {
     @font-face {
         font-family: @family-name;
-        src: url('@{font-path}.eot');
-        src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
-        url('@{font-path}.woff2') format('woff2'),
-        url('@{font-path}.woff') format('woff'),
-        url('@{font-path}.ttf') format('truetype'),
-        url('@{font-path}.svg#@{family-name}') format('svg');
+        src: url('@{font-path}.woff2') format('woff2'),
+        url('@{font-path}.woff') format('woff');
         font-weight: @font-weight;
         font-style: @font-style;
     }