Skip to content

Commit b8528ae

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #16135: Fix type hints and add undefined property in Webapi [2.3-develop] (by @mhauri) - #16170: 1163: CreateCreditMemoEntityTest rework to support MSI reservation mechanism. (by @nmalevanec) - #16153: 1190: CreateOrderBackendPartOneTest rework to support MSI reservation mechanism. (by @nmalevanec) - #16061: Change the favicon file to the newer Magento logo (by @DMMundle) - #16155: [Forwardport] chore: prefer woff and woff2 (by @DanielRuf) - #15777: [Forwardport] Fix negative basket total due to shipping tax residue (by @osrecio) - #15861: [Forwardport] ISSUE-14747 Newsletter subscription confirmation message does not dis� (by @rahul-kachhadiya) - #16097: [Forwardport] fix: prevent inline-block issue in name form due to space and font-size (by @DanielRuf) - #15798: [Forwardport] Removed unnecessary css. #2 (by @chirag-wagento) - #16038: [Forwardport] bugfix checkout page cart icon color (by @chirag-wagento) - #15759: [Forwardport] 2.3 develop pr port 15566 (by @vgelani) - #16137: FIX for apparently random API failures while using array types (by @phoenix128) Fixed GitHub Issues: - #1163: Problem when change less file in magento. (reported by @zivendesign) has been fixed in #16170 by @nmalevanec in 2.3-develop branch Related commits: 1. f53c620 - #1190: installation error in 0.74.0-beta4 (reported by @sivajik34) has been fixed in #16153 by @nmalevanec in 2.3-develop branch Related commits: 1. 2b8b9d5 - #14747: Newsletter subscription confirmation message does not display after clicking link in email (reported by @tohann) has been fixed in #15861 by @rahul-kachhadiya in 2.3-develop branch Related commits: 1. 75516bf - #16047: inline-block issue in name form (reported by @DanielRuf) has been fixed in #16097 by @DanielRuf in 2.3-develop branch Related commits: 1. 204b4ac - #15565: Getting wrong frontend-controller, when using storecodes in urls (reported by @EliasKotlyar) has been fixed in #15759 by @vgelani in 2.3-develop branch Related commits: 1. 61856f5 2. 4c77dff
2 parents f48f78a + 8015ecb commit b8528ae

File tree

42 files changed

+60
-846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+60
-846
lines changed

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

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,15 @@ $suffix = $block->showSuffix();
2828
?>
2929
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
3030
<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
31-
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
32-
<span><?= $block->escapeHtml(__('Name')) ?></span>
33-
</label>
31+
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
3432
<div class="control">
3533
<fieldset class="fieldset fieldset-fullname">
3634
<div class="fields">
3735
<?php endif; ?>
3836

3937
<?php if ($prefix): ?>
4038
<div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
41-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
42-
<span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
43-
</label>
44-
39+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
4540
<div class="control">
4641
<?php if ($block->getPrefixOptions() === false): ?>
4742
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
@@ -65,10 +60,7 @@ $suffix = $block->showSuffix();
6560
</div>
6661
<?php endif; ?>
6762
<div class="field field-name-firstname required">
68-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
69-
<span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
70-
</label>
71-
63+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
7264
<div class="control">
7365
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
7466
name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
@@ -80,10 +72,7 @@ $suffix = $block->showSuffix();
8072
<?php if ($middle): ?>
8173
<?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
8274
<div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
83-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
84-
<span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
85-
</label>
86-
75+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
8776
<div class="control">
8877
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
8978
name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
@@ -94,10 +83,7 @@ $suffix = $block->showSuffix();
9483
</div>
9584
<?php endif; ?>
9685
<div class="field field-name-lastname required">
97-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
98-
<span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
99-
</label>
100-
86+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
10187
<div class="control">
10288
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
10389
name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
@@ -108,10 +94,7 @@ $suffix = $block->showSuffix();
10894
</div>
10995
<?php if ($suffix): ?>
11096
<div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
111-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
112-
<span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
113-
</label>
114-
97+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
11598
<div class="control">
11699
<?php if ($block->getSuffixOptions() === false): ?>
117100
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public function execute()
3232
}
3333
}
3434

35-
$this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
35+
$resultRedirect = $this->resultRedirectFactory->create();
36+
$resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
37+
return $resultRedirect;
3638
}
3739
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
8383
*/
8484
public function getDefaultPath()
8585
{
86-
return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
86+
$store = $this->storeManager->getStore();
87+
$value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
88+
return $value;
8789
}
8890
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total)
152152
$total->setBaseTotalAmount('subtotal', 0);
153153
$total->setTotalAmount('tax', 0);
154154
$total->setBaseTotalAmount('tax', 0);
155+
$total->setTotalAmount('shipping', 0);
156+
$total->setBaseTotalAmount('shipping', 0);
155157
$total->setTotalAmount('discount_tax_compensation', 0);
156158
$total->setBaseTotalAmount('discount_tax_compensation', 0);
157159
$total->setTotalAmount('shipping_discount_tax_compensation', 0);
158160
$total->setBaseTotalAmount('shipping_discount_tax_compensation', 0);
159161
$total->setSubtotalInclTax(0);
160162
$total->setBaseSubtotalInclTax(0);
163+
$total->setShippingInclTax(0);
164+
$total->setBaseShippingInclTax(0);
165+
$total->setShippingTaxAmount(0);
166+
$total->setBaseShippingTaxAmount(0);
167+
$total->setShippingAmountForDiscount(0);
168+
$total->setBaseShippingAmountForDiscount(0);
169+
$total->setBaseShippingAmountForDiscount(0);
170+
$total->setTotalAmount('extra_tax', 0);
171+
$total->setBaseTotalAmount('extra_tax', 0);
161172
}
162173

163174
/**

‎app/code/Magento/Theme/view/adminhtml/web/favicon.ico

32.6 KB
Binary file not shown.

‎app/code/Magento/Theme/view/frontend/web/favicon.ico

32.6 KB
Binary file not shown.

‎app/code/Magento/Theme/view/install/web/favicon.ico

32.6 KB
Binary file not shown.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
5151
*/
5252
protected $_errorProcessor;
5353

54+
/**
55+
* @var \Magento\Framework\App\State
56+
*/
57+
protected $_appState;
58+
5459
/**
5560
* @var \Magento\Framework\Locale\ResolverInterface
5661
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function __construct(
107107
*
108108
* @param string $operation
109109
* @param array $arguments
110-
* @return \stdClass|null
110+
* @return array
111111
* @throws WebapiException
112112
* @throws \LogicException
113113
* @throws AuthorizationException

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class GuestAuthorization
1919
* Check if resource for which access is needed has anonymous permissions defined in webapi config.
2020
*
2121
* @param \Magento\Framework\Authorization $subject
22-
* @param callable $proceed
22+
* @param \Closure $proceed
2323
* @param string $resource
2424
* @param string $privilege
2525
* @return bool true If resource permission is anonymous,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Server
3131
const REQUEST_PARAM_LIST_WSDL = 'wsdl_list';
3232

3333
/**
34-
* @var \Magento\Framework\App\AreaLIst
34+
* @var \Magento\Framework\App\AreaList
3535
*/
3636
protected $_areaList;
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function testToXmlDeveloperModeOff()
125125
public function testToXmlDeveloperModeOn()
126126
{
127127
$this->_appStateMock->expects($this->any())->method('getMode')->will($this->returnValue('developer'));
128-
$actualXml = $this->_soapFault->toXml(true);
128+
$actualXml = $this->_soapFault->toXml();
129129
$this->assertContains('<m:Trace>', $actualXml, 'Exception trace is not found in XML.');
130130
}
131131

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@
3535
.action {
3636
&.showcart {
3737
&:before {
38-
.lib-css(color, @primary__color);
38+
.lib-css(color, @button__color);
39+
}
40+
41+
&:hover:before {
42+
.lib-css(color, @button__hover__color);
3943
}
4044
}
4145
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
&:last-child {
2323
margin-bottom: 0;
2424
}
25-
26-
&.primary {
27-
// &:extend(.abs-button-l all);
28-
}
2925
}
3026

3127
&:last-child {

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<item name="grandTotal" xsi:type="string">425.00</item>
2020
</data>
2121
<data name="payment/method" xsi:type="string">cashondelivery</data>
22-
<data name="status" xsi:type="string">Pending</data>
23-
<data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Hold, Invoice, Ship, Edit</data>
22+
<data name="status" xsi:type="string">Processing</data>
23+
<data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Invoice, Edit</data>
2424
<data name="configData" xsi:type="string">cashondelivery</data>
25-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
25+
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
2626
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
2727
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
2828
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -42,7 +42,6 @@
4242
<data name="status" xsi:type="string">Pending</data>
4343
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
4444
<data name="configData" xsi:type="string">checkmo_specificcountry_gb</data>
45-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
4645
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
4746
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
4847
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -59,10 +58,10 @@
5958
<item name="grandTotal" xsi:type="string">565.00</item>
6059
</data>
6160
<data name="payment/method" xsi:type="string">banktransfer</data>
62-
<data name="status" xsi:type="string">Pending</data>
63-
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Reorder, Invoice, Edit</data>
61+
<data name="status" xsi:type="string">Processing</data>
62+
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Reorder, Invoice, Edit</data>
6463
<data name="configData" xsi:type="string">banktransfer</data>
65-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
64+
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
6665
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
6766
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
6867
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -84,7 +83,6 @@
8483
<data name="status" xsi:type="string">Pending</data>
8584
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Edit</data>
8685
<data name="configData" xsi:type="string">freeshipping_specificcountry_gb, banktransfer</data>
87-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
8886
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
8987
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
9088
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -103,10 +101,10 @@
103101
</data>
104102
<data name="payment/method" xsi:type="string">purchaseorder</data>
105103
<data name="payment/po_number" xsi:type="string">123456</data>
106-
<data name="status" xsi:type="string">Pending</data>
107-
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Reorder, Edit</data>
104+
<data name="status" xsi:type="string">Processing</data>
105+
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Invoice, Reorder, Edit</data>
108106
<data name="configData" xsi:type="string">purchaseorder</data>
109-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
107+
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
110108
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
111109
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
112110
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
@@ -127,7 +125,7 @@
127125
<item name="grandTotal" xsi:type="string">21.91</item>
128126
</data>
129127
<data name="payment/method" xsi:type="string">checkmo</data>
130-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
128+
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
131129
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
132130
</variation>
133131
<variation name="CreateOrderBackendTestVariation7" summary="Create Order for New Customer in Admin with Offline Payment Method" ticketId="MAGETWO-12520">
@@ -145,7 +143,7 @@
145143
<item name="grandTotal" xsi:type="string">21.91</item>
146144
</data>
147145
<data name="payment/method" xsi:type="string">checkmo</data>
148-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
146+
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
149147
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
150148
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
151149
</variation>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
<step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
5656
<step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
5757
<step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
58-
<step name="submitOrder" module="Magento_Sales" />
58+
<step name="submitOrder" module="Magento_Sales" next="createShipment" />
59+
<step name="createShipment" module="Magento_Sales"/>
5960
</scenario>
6061
<scenario name="VoidAuthorizationTest" firstStep="setupConfiguration">
6162
<step name="setupConfiguration" module="Magento_Config" next="createProducts" />
@@ -146,7 +147,8 @@
146147
<scenario name="CreateCreditMemoEntityTest" firstStep="setupConfiguration">
147148
<step name="setupConfiguration" module="Magento_Config" next="createOrder" />
148149
<step name="createOrder" module="Magento_Sales" next="createInvoice" />
149-
<step name="createInvoice" module="Magento_Sales" next="createCreditMemo" />
150+
<step name="createInvoice" module="Magento_Sales" next="createShipment" />
151+
<step name="createShipment" module="Magento_Sales" next="createCreditMemo" />
150152
<step name="createCreditMemo" module="Magento_Sales" />
151153
</scenario>
152154
</config>

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,13 @@ fieldset[disabled] .pager .action-next {
10001000
}
10011001
@font-face {
10021002
font-family: 'icons-blank-theme';
1003-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1004-
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');
1003+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10051004
font-weight: normal;
10061005
font-style: normal;
10071006
}
10081007
@font-face {
10091008
font-family: 'icons-blank-theme';
1010-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1011-
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');
1009+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10121010
font-weight: normal;
10131011
font-style: normal;
10141012
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ public function getParamType(ParameterReflection $param)
523523
if ($type == 'array') {
524524
// try to determine class, if it's array of objects
525525
$docBlock = $param->getDeclaringFunction()->getDocBlock();
526-
$pattern = "/\@param\s+([\w\\\_]+\[\])\s+\\\${$param->getName()}\n/";
526+
$pattern = "/\@param\s+([\w\\\_]+\[\])\s+\\\${$param->getName()}[\n\r]/";
527527
$matches = [];
528528
if (preg_match($pattern, $docBlock->getContents(), $matches)) {
529529
return $matches[1];

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,8 @@
947947
// ) {
948948
// @font-face {
949949
// font-family: @family-name;
950-
// src: url('@{font-path}.eot');
951-
// src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
952-
// url('@{font-path}.woff2') format('woff2'),
953-
// url('@{font-path}.woff') format('woff'),
954-
// url('@{font-path}.ttf') format('truetype'),
955-
// url('@{font-path}.svg#@{family-name}') format('svg');
950+
// src: url('@{font-path}.woff2') format('woff2'),
951+
// url('@{font-path}.woff') format('woff');
956952
// font-weight: @font-weight;
957953
// font-style: @font-style;
958954
// }

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
) {
1616
@font-face {
1717
font-family: @family-name;
18-
src: url('@{font-path}.eot');
19-
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
20-
url('@{font-path}.woff2') format('woff2'),
21-
url('@{font-path}.woff') format('woff'),
22-
url('@{font-path}.ttf') format('truetype'),
23-
url('@{font-path}.svg#@{family-name}') format('svg');
18+
src: url('@{font-path}.woff2') format('woff2'),
19+
url('@{font-path}.woff') format('woff');
2420
font-weight: @font-weight;
2521
font-style: @font-style;
2622
}

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot

-6.52 KB
Binary file not shown.

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf

-6.32 KB
Binary file not shown.

‎lib/web/fonts/MUI-Icons/MUI-Icons.eot

-18.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)