Skip to content

Commit b48ec86

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento-engcom/magento2ce#1302: [EngCom Team] Batch 16. Forwardports to 2.3-develop (by @magento-engcom-team) - magento-engcom/magento2ce#1299: [EngCom Team] Batch 14. Forwardports to 2.3-develop (by @magento-engcom-team) Fixed GitHub Issues: - #11828: Visual Swatches not showing swatch color in admin (reported by @lee586) has been fixed in magento-engcom/magento2ce#1302 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 176b9f0 2. ab50437 3. 6a527a8 4. a0cb9e2 5. 6e6c7d2 6. 1d45a06 7. 1fdee00 8. 727f9b3 9. f842883 10. 5474264 11. ba1d05a 12. 6fb29ac 13. be2840d 14. 17da65c 15. ded8aa9 16. 818cccd - #12320: Newsletter subscribe button title wrapped (reported by @Gvigner) has been fixed in magento-engcom/magento2ce#1302 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 176b9f0 2. ab50437 3. 6a527a8 4. a0cb9e2 5. 6e6c7d2 6. 1d45a06 7. 1fdee00 8. 727f9b3 9. f842883 10. 5474264 11. ba1d05a 12. 6fb29ac 13. be2840d 14. 17da65c 15. ded8aa9 16. 818cccd - #12877: [2.2.1] Magento Database Backup Command Fails (Fix included) (reported by @azeemism) has been fixed in magento-engcom/magento2ce#1302 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 176b9f0 2. ab50437 3. 6a527a8 4. a0cb9e2 5. 6e6c7d2 6. 1d45a06 7. 1fdee00 8. 727f9b3 9. f842883 10. 5474264 11. ba1d05a 12. 6fb29ac 13. be2840d 14. 17da65c 15. ded8aa9 16. 818cccd - #11885: Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal (reported by @Silarn) has been fixed in magento-engcom/magento2ce#1299 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 99e3a76 2. 4cfc07e 3. ea616e0 4. be55217 5. 41c52fb 6. 7f42a67 7. 1090c8b 8. c80b5ca 9. 8077af7 10. 38e34a8 11. c13ad85 12. 9e7bf93 13. 10a6288 14. abf31d2 15. 898a470 16. c99c3a7 17. 4537e78 18. 0bad56f 19. fd2418e 20. 946e9e1 - #12294: Bug: Adding Custom Attribute - The value of Admin scope can't be empty (reported by @webscot) has been fixed in magento-engcom/magento2ce#1299 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 99e3a76 2. 4cfc07e 3. ea616e0 4. be55217 5. 41c52fb 6. 7f42a67 7. 1090c8b 8. c80b5ca 9. 8077af7 10. 38e34a8 11. c13ad85 12. 9e7bf93 13. 10a6288 14. abf31d2 15. 898a470 16. c99c3a7 17. 4537e78 18. 0bad56f 19. fd2418e 20. 946e9e1 - #12844: "Cannot instantiate interface Magento\Framework\Interception\ObjectManager\ConfigInterface" error in integration tests (reported by @schmengler) has been fixed in magento-engcom/magento2ce#1299 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 99e3a76 2. 4cfc07e 3. ea616e0 4. be55217 5. 41c52fb 6. 7f42a67 7. 1090c8b 8. c80b5ca 9. 8077af7 10. 38e34a8 11. c13ad85 12. 9e7bf93 13. 10a6288 14. abf31d2 15. 898a470 16. c99c3a7 17. 4537e78 18. 0bad56f 19. fd2418e 20. 946e9e1 - #12894: Can't remove State is required for all countries (reported by @mazur-vlad) has been fixed in magento-engcom/magento2ce#1299 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 99e3a76 2. 4cfc07e 3. ea616e0 4. be55217 5. 41c52fb 6. 7f42a67 7. 1090c8b 8. c80b5ca 9. 8077af7 10. 38e34a8 11. c13ad85 12. 9e7bf93 13. 10a6288 14. abf31d2 15. 898a470 16. c99c3a7 17. 4537e78 18. 0bad56f 19. fd2418e 20. 946e9e1 - #12900: Braintree "Place Order" button is disabled after failed validation (reported by @ifekaj) has been fixed in magento-engcom/magento2ce#1299 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 99e3a76 2. 4cfc07e 3. ea616e0 4. be55217 5. 41c52fb 6. 7f42a67 7. 1090c8b 8. c80b5ca 9. 8077af7 10. 38e34a8 11. c13ad85 12. 9e7bf93 13. 10a6288 14. abf31d2 15. 898a470 16. c99c3a7 17. 4537e78 18. 0bad56f 19. fd2418e 20. 946e9e1
2 parents 0379ead + c0940f9 commit b48ec86

File tree

28 files changed

+239
-100
lines changed

28 files changed

+239
-100
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
66

77
## Magento system requirements
8-
[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
8+
[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
99

1010
## Install Magento
1111
To install Magento, see either:
1212

1313
* [Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
14-
* [Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
14+
* [Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
1515

1616
<h2>Contributing to the Magento 2 code base</h2>
1717
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -22,8 +22,8 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
2222

2323
To suggest documentation improvements, click [here][4].
2424

25-
[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
26-
[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
25+
[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
26+
[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
2727
[3]: <https://github.com/magento/magento2/issues>
2828
[4]: <http://devdocs.magento.com>
2929

‎app/bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
1515
if (PHP_SAPI == 'cli') {
1616
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
17-
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
17+
'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
2121
<p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
22-
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
22+
<a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
2323
Magento System Requirements</a>.
2424
</div>
2525
HTML;

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
<label>European Union Countries</label>
232232
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
233233
</field>
234-
<field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
234+
<field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
235235
<label>Top destinations</label>
236236
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
237237
</field>

‎app/code/Magento/Backup/Model/Db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
154154

155155
if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) {
156156
if ($tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) {
157-
$limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength());
157+
$limit = floor(self::BUFFER_LENGTH / max($tableStatus->getAvgRowLength(), 1));
158158
$multiRowsLength = ceil($tableStatus->getRows() / $limit);
159159
} else {
160160
$limit = 1;

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ define(
7979
*/
8080
onError: function (response) {
8181
braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
82+
this.isPlaceOrderActionAllowed(true);
8283
throw response.message;
8384
},
8485

‎app/code/Magento/Catalog/Helper/Product/View.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
120120
// Load default page handles and page configurations
121121
if ($params && $params->getBeforeHandles()) {
122122
foreach ($params->getBeforeHandles() as $handle) {
123-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
124123
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
124+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
125125
}
126126
}
127-
128-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
127+
129128
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
129+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
130130

131131
if ($params && $params->getAfterHandles()) {
132132
foreach ($params->getAfterHandles() as $handle) {
133-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
134133
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
134+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
135135
}
136136
}
137137

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $stores = $block->getStoresSortedBySortOrder();
5757
<input type="hidden" id="option-count-check" value="" />
5858
</div>
5959
<script id="row-template" type="text/x-magento-template">
60-
<tr>
60+
<tr <% if (data.rowClasses) { %>class="<%- data.rowClasses %>"<% } %>>
6161
<td class="col-draggable">
6262
<?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
6363
<div data-role="draggable-handle" class="draggable-handle"

‎app/code/Magento/Catalog/view/adminhtml/web/js/options.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ define([
2424
totalItems: 0,
2525
rendered: 0,
2626
template: mageTemplate('#row-template'),
27+
newOptionClass: 'new-option',
2728
isReadOnly: config.isReadOnly,
2829
add: function (data, render) {
2930
var isNewOption = false,
@@ -32,7 +33,8 @@ define([
3233
if (typeof data.id == 'undefined') {
3334
data = {
3435
'id': 'option_' + this.itemCount,
35-
'sort_order': this.itemCount + 1
36+
'sort_order': this.itemCount + 1,
37+
'rowClasses': this.newOptionClass
3638
};
3739
isNewOption = true;
3840
}
@@ -84,6 +86,10 @@ define([
8486
this.totalItems--;
8587
this.updateItemsCountField();
8688
}
89+
90+
if (element.hasClassName(this.newOptionClass)) {
91+
element.remove();
92+
}
8793
},
8894
updateItemsCountField: function () {
8995
$('option-count-check').value = this.totalItems > 0 ? '1' : '';

‎app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require([
22
'jquery',
3-
'Magento_Customer/js/customer-data'
3+
'Magento_Customer/js/customer-data',
4+
'domReady!'
45
], function ($, customerData) {
56
'use strict';
67

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
88
<!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().middlename --><!-- /ko -->
99
<!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
10-
<!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
10+
<!-- ko text: _.values(currentBillingAddress().street).join(", ") --><!-- /ko --><br/>
1111
<!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
1313
<!-- ko if: (currentBillingAddress().telephone) -->

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- ko if: (visible()) -->
88
<!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
99
<!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
10-
<!-- ko text: address().street --><!-- /ko --><br/>
10+
<!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
1111
<!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
1313
<!-- ko if: (address().telephone) -->

‎app/code/Magento/Directory/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<field id="state_required" translate="label" type="multiselect" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
110110
<label>State is Required for</label>
111111
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
112+
<can_be_empty>1</can_be_empty>
112113
</field>
113114
<field id="display_all" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="0" showInStore="0">
114115
<label>Allow to Choose State if It is Optional for Country</label>

‎app/code/Magento/Paypal/Model/Express.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,14 +669,19 @@ public function getApi()
669669
public function assignData(\Magento\Framework\DataObject $data)
670670
{
671671
parent::assignData($data);
672-
672+
673673
$additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
674674

675675
if (!is_array($additionalData)) {
676676
return $this;
677677
}
678678

679679
foreach ($additionalData as $key => $value) {
680+
// Skip extension attributes
681+
if ($key === \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) {
682+
continue;
683+
}
684+
680685
$this->getInfoInstance()->setAdditionalInformation($key, $value);
681686
}
682687
return $this;

‎app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,21 @@ public function testAssignData()
161161
{
162162
$transportValue = 'something';
163163

164+
$extensionAttribute = $this->getMockForAbstractClass(
165+
\Magento\Quote\Api\Data\PaymentExtensionInterface::class,
166+
[],
167+
'',
168+
false,
169+
false
170+
);
171+
164172
$data = new DataObject(
165173
[
166174
PaymentInterface::KEY_ADDITIONAL_DATA => [
167175
Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,
168176
Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,
169-
Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue
177+
Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue,
178+
\Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttribute
170179
]
171180
]
172181
);

‎app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,12 @@
44
*/
55

66
define([
7-
'jquery',
87
'Magento_Checkout/js/model/quote',
9-
'Magento_Checkout/js/model/url-builder',
10-
'mage/storage',
11-
'Magento_Checkout/js/model/error-processor',
12-
'Magento_Customer/js/model/customer',
13-
'Magento_Checkout/js/model/full-screen-loader'
14-
], function ($, quote, urlBuilder, storage, errorProcessor, customer, fullScreenLoader) {
8+
'Magento_Checkout/js/action/set-payment-information'
9+
], function (quote, setPaymentInformation) {
1510
'use strict';
1611

1712
return function (messageContainer) {
18-
var serviceUrl,
19-
payload,
20-
paymentData = quote.paymentMethod();
21-
22-
/**
23-
* Checkout for guest and registered customer.
24-
*/
25-
if (!customer.isLoggedIn()) {
26-
serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
27-
cartId: quote.getQuoteId()
28-
});
29-
payload = {
30-
cartId: quote.getQuoteId(),
31-
email: quote.guestEmail,
32-
paymentMethod: paymentData
33-
};
34-
} else {
35-
serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
36-
payload = {
37-
cartId: quote.getQuoteId(),
38-
paymentMethod: paymentData
39-
};
40-
}
41-
fullScreenLoader.startLoader();
42-
43-
return storage.post(
44-
serviceUrl, JSON.stringify(payload)
45-
).fail(function (response) {
46-
errorProcessor.process(response, messageContainer);
47-
}).always(function () {
48-
fullScreenLoader.stopLoader();
49-
});
13+
return setPaymentInformation(messageContainer, quote.paymentMethod());
5014
};
5115
});

‎app/code/Magento/ProductAlert/Controller/Add/TestObserver.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎app/code/Magento/Review/Controller/Product/ListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ protected function getProductPage($product)
2626
$resultPage->getConfig()->setPageLayout($product->getPageLayout());
2727
}
2828
$urlSafeSku = rawurlencode($product->getSku());
29-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
3029
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
30+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
3131
$resultPage->addUpdate($product->getCustomLayoutUpdate());
3232
return $resultPage;
3333
}

‎app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public function getJsonConfig()
8484
* Parse swatch labels for template
8585
*
8686
* @codeCoverageIgnore
87-
* @param null $swatchStoreValue
88-
* @return string
87+
* @param null|array $swatchStoreValue
88+
* @return null|array
8989
*/
9090
protected function reformatSwatchLabels($swatchStoreValue = null)
9191
{
9292
if ($swatchStoreValue === null) {
9393
return;
9494
}
95-
$newSwatch = '';
95+
$newSwatch = [];
9696
foreach ($swatchStoreValue as $key => $value) {
9797
if ($value[0] == '#') {
9898
$newSwatch[$key] = 'background: '.$value;

‎app/code/Magento/Theme/Block/Html/Topmenu.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,13 @@ protected function _getHtml(
235235

236236
if ($childLevel == 0 && $outermostClass) {
237237
$outermostClassCode = ' class="' . $outermostClass . '" ';
238-
$child->setClass($outermostClass);
238+
$currentClass = $child->getClass();
239+
240+
if (empty($currentClass)) {
241+
$child->setClass($outermostClass);
242+
} else {
243+
$child->setClass($currentClass . ' ' . $outermostClass);
244+
}
239245
}
240246

241247
if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
max-height: 250px;
4343
overflow-y: auto;
4444
padding-top: .25em;
45+
&::-webkit-scrollbar {
46+
-webkit-appearance: none;
47+
width: 7px;
48+
}
49+
&::-webkit-scrollbar-thumb {
50+
border-radius: 4px;
51+
background-color: rgba(0, 0, 0, .5);
52+
}
4553

4654
li {
4755
border: 0;

‎app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
border-bottom-left-radius: 0;
6868
border-top-left-radius: 0;
6969
margin-left: -1px;
70+
white-space: nowrap;
7071
}
7172
}
7273
}

‎dev/tests/integration/etc/di/preferences/ce.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
\Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
1717
\Magento\Framework\Interception\PluginListInterface::class =>
1818
\Magento\TestFramework\Interception\PluginList::class,
19+
\Magento\Framework\Interception\ObjectManager\ConfigInterface::class =>
20+
\Magento\TestFramework\ObjectManager\Config::class,
1921
\Magento\Framework\Interception\ObjectManager\Config\Developer::class =>
2022
\Magento\TestFramework\ObjectManager\Config::class,
2123
\Magento\Framework\View\LayoutInterface::class => \Magento\TestFramework\View\Layout::class,

0 commit comments

Comments
 (0)