Skip to content

Commit 4405582

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #15511: Fixes in config module (by @mhauri) - #15462: Adding manners to GitHub templates 2.2 (by @dmanners) - #15416: Moved css from media #TODO (by @vgelani) - #15312: [Fix] forgot to add lowercase conversion on grouped product assignation (by @jalogut) - #15454: Fix HTML syntax in report.phtml error template (by @abcpremium) - #15040: [2.2-develop] Transport variable can not be altered in email_invoice_set_template_vars_before Event (by @gwharton) - #15513: Fix typos in Multishipping and User module (by @avoelkl) Fixed GitHub Issues: - #10210: Transport variable can not be altered in email_invoice_set_template_vars_before Event (reported by @diybook) has been fixed in #15040 by @gwharton in 2.2-develop branch Related commits: 1. ca3245f 2. 874260d
2 parents 3b35bc5 + 8d74d8f commit 4405582

File tree

13 files changed

+103
-52
lines changed

13 files changed

+103
-52
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
1-
<!--- Provide a general summary of the issue in the Title above -->
2-
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this issue we recommend that you add the following information:
4+
- Summary of the issue,
5+
- Information on your environment,
6+
- Steps to reproduce,
7+
- Expected and actual results,
8+
9+
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
10+
-->
311

412
### Preconditions
5-
<!--- Provide a more detailed information of environment you use -->
6-
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
13+
<!---
14+
Please provide as detailed information about your environment as possible.
15+
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
16+
-->
717
1.
818
2.
919

1020
### Steps to reproduce
11-
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
21+
<!---
22+
It is important to provide a set of clear steps to reproduce this bug.
23+
If relevant please include code samples
24+
-->
1225
1.
1326
2.
1427
3.
1528

1629
### Expected result
1730
<!--- Tell us what should happen -->
18-
1.
31+
1. [Screenshots, logs or description]
1932

2033
### Actual result
2134
<!--- Tell us what happens instead -->
22-
1. [Screenshot, logs]
23-
24-
<!--- (This may be platform independent comment) -->
35+
1. [Screenshots, logs or description]

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
<!--- Provide a general summary of the Pull Request in the Title above -->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary of the pull request,
5+
- Issue(s) related to the changes made,
6+
- Manual testing scenarios,
7+
-->
8+
9+
<!--- Please provide a general summary of the Pull Request in the Title above -->
210

311
### Description
4-
<!--- Provide a description of the changes proposed in the pull request -->
12+
<!---
13+
Please provide a description of the changes proposed in the pull request.
14+
Letting us know what has changed and why it needed changing will help us validate this pull request.
15+
-->
516

617
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
18+
<!---
19+
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
20+
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
21+
-->
822
1. magento/magento2#<issue_number>: Issue title
923
2. ...
1024

1125
### Manual testing scenarios
12-
<!--- Provide a set of unambiguous steps to test the proposed code change -->
26+
<!---
27+
Please provide a set of unambiguous steps to test the proposed code change.
28+
Giving us manual testing scenarios will help with the processing and validation process.
29+
-->
1330
1. ...
1431
2. ...
1532

‎app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,21 @@
4747
"data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
4848
"options": {
4949
"nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
50-
"loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ? 'true' : 'false' ?>,
51-
"keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ? 'true' : 'false' ?>,
52-
"arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ? 'true' : 'false' ?>,
53-
"allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false' ?>,
54-
"showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ? 'true' : 'false' ?>,
50+
<?php if (($block->getVar("gallery/loop"))): ?>
51+
"loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
52+
<?php endif; ?>
53+
<?php if (($block->getVar("gallery/keyboard"))): ?>
54+
"keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
55+
<?php endif; ?>
56+
<?php if (($block->getVar("gallery/arrows"))): ?>
57+
"arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
58+
<?php endif; ?>
59+
<?php if (($block->getVar("gallery/allowfullscreen"))): ?>
60+
"allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
61+
<?php endif; ?>
62+
<?php if (($block->getVar("gallery/caption"))): ?>
63+
"showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
64+
<?php endif; ?>
5565
"width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
5666
"thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
5767
<?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
@@ -69,18 +79,28 @@
6979
"transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
7080
<?php endif; ?>
7181
"transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
72-
"navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ? 'true' : 'false' ?>,
82+
<?php if (($block->getVar("gallery/navarrows"))): ?>
83+
"navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
84+
<?php endif; ?>
7385
"navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
7486
"navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
7587
},
7688
"fullscreen": {
7789
"nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
78-
"loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false' ?>,
90+
<?php if ($block->getVar("gallery/fullscreen/loop")): ?>
91+
"loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
92+
<?php endif; ?>
7993
"navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
80-
"navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false' ?>,
94+
<?php if ($block->getVar("gallery/transition/navarrows")): ?>
95+
"navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
96+
<?php endif; ?>
8197
"navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
82-
"arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false' ?>,
83-
"showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false' ?>,
98+
<?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
99+
"arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
100+
<?php endif; ?>
101+
<?php if ($block->getVar("gallery/fullscreen/caption")): ?>
102+
"showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
103+
<?php endif; ?>
84104
<?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
85105
"transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
86106
<?php endif; ?>

‎app/code/Magento/Config/Model/Config/Importer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function import(array $data)
124124
$this->scopeConfig->clean();
125125
}
126126

127-
$this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) {
127+
$this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {
128128
$this->scope->setCurrentScope(Area::AREA_ADMINHTML);
129129

130130
// Invoke saving of new values.

‎app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testGetElementHtmlWithValue()
7474
'showInWebsite' => '1',
7575
'showInStore' => '1',
7676
'label' => null,
77-
'backend_model' => \Magento\BackendModelConfig\Backend\Image::class,
77+
'backend_model' => \Magento\Config\Model\Config\Backend\Image::class,
7878
'upload_dir' => [
7979
'config' => 'system/filesystem/media',
8080
'scope_info' => '1',

‎app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function saveData()
9999
}
100100
$scope = $this->_entityModel->getRowScope($rowData);
101101
if (Product::SCOPE_DEFAULT == $scope) {
102-
$productData = $newSku[$rowData[Product::COL_SKU]];
102+
$productData = $newSku[strtolower($rowData[Product::COL_SKU])];
103103
} else {
104104
$colAttrSet = Product::COL_ATTR_SET;
105105
$rowData[$colAttrSet] = $productData['attr_set_code'];

‎app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,26 +192,26 @@ public function saveDataProvider()
192192
'skus' => [
193193
'newSku' => [
194194
'sku_assoc1' => ['entity_id' => 1],
195-
'productSku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
195+
'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
196196
],
197197
'oldSku' => ['sku_assoc2' => ['entity_id' => 2]]
198198
],
199199
'bunch' => [
200200
'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
201-
'sku' => 'productSku',
201+
'sku' => 'productsku',
202202
'product_type' => 'grouped'
203203
]
204204
],
205205
[
206206
'skus' => [
207207
'newSku' => [
208-
'productSku' => ['entity_id' => 1, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
208+
'productsku' => ['entity_id' => 1, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
209209
],
210210
'oldSku' => []
211211
],
212212
'bunch' => [
213213
'associated_skus' => '',
214-
'sku' => 'productSku',
214+
'sku' => 'productsku',
215215
'product_type' => 'grouped'
216216
]
217217
],
@@ -227,13 +227,13 @@ public function saveDataProvider()
227227
'skus' => [
228228
'newSku' => [
229229
'sku_assoc1' => ['entity_id' => 1],
230-
'productSku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
230+
'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
231231
],
232232
'oldSku' => []
233233
],
234234
'bunch' => [
235235
'associated_skus' => 'sku_assoc1=1',
236-
'sku' => 'productSku',
236+
'sku' => 'productsku',
237237
'product_type' => 'simple'
238238
]
239239
]
@@ -247,7 +247,7 @@ public function testSaveDataScopeStore()
247247
{
248248
$this->entityModel->expects($this->once())->method('getNewSku')->will($this->returnValue([
249249
'sku_assoc1' => ['entity_id' => 1],
250-
'productSku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
250+
'productsku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
251251
]));
252252
$this->entityModel->expects($this->once())->method('getOldSku')->will($this->returnValue([
253253
'sku_assoc2' => ['entity_id' => 3]
@@ -257,7 +257,7 @@ public function testSaveDataScopeStore()
257257

258258
$bunch = [[
259259
'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
260-
'sku' => 'productSku',
260+
'sku' => 'productsku',
261261
'product_type' => 'grouped'
262262
]];
263263
$this->entityModel->expects($this->at(2))->method('getNextBunch')->will($this->returnValue($bunch));

‎app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
/**
8-
* Mustishipping checkout base abstract block
8+
* Multishipping checkout base abstract block
99
*
1010
* @author Magento Core Team <[email protected]>
1111
*/

‎app/code/Magento/Multishipping/Block/Checkout/Shipping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\Quote\Model\Quote\Address;
1010

1111
/**
12-
* Mustishipping checkout shipping
12+
* Multishipping checkout shipping
1313
*
1414
* @api
1515
* @author Magento Core Team <[email protected]>

‎app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Sales\Model\ResourceModel\Order as OrderResource;
1414
use Magento\Sales\Model\Order\Address\Renderer;
1515
use Magento\Framework\Event\ManagerInterface;
16+
use Magento\Framework\DataObject;
1617

1718
/**
1819
* Class OrderSender
@@ -130,14 +131,17 @@ protected function prepareTemplate(Order $order)
130131
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
131132
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
132133
];
133-
$transport = new \Magento\Framework\DataObject($transport);
134+
$transportObject = new DataObject($transport);
134135

136+
/**
137+
* Event argument `transport` is @deprecated. Use `transportObject` instead.
138+
*/
135139
$this->eventManager->dispatch(
136140
'email_order_set_template_vars_before',
137-
['sender' => $this, 'transport' => $transport]
141+
['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject]
138142
);
139143

140-
$this->templateContainer->setTemplateVars($transport->getData());
144+
$this->templateContainer->setTemplateVars($transportObject->getData());
141145

142146
parent::prepareTemplate($order);
143147
}

‎app/code/Magento/User/Model/Backend/Config/ObserverConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
7272
}
7373

7474
/**
75-
* Get admin maxiumum security failures from config
75+
* Get admin maximum security failures from config
7676
*
7777
* @return int
7878
*/

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@
6262
// Common
6363
// _____________________________________________
6464

65-
& when (@media-common = true) {
66-
body {
65+
.page-wrapper {
66+
.ie9 & {
6767
.lib-css(background-color, @page__background-color);
68+
min-height: 0;
6869
}
70+
}
6971

70-
// ToDo UI: move it directly to .page-wrapper (now it doesn't appear in mediaquery cuz of size of css)
71-
.page-wrapper {
72-
.ie9 & {
73-
.lib-css(background-color, @page__background-color);
74-
min-height: 0;
75-
}
72+
& when (@media-common = true) {
73+
body {
74+
.lib-css(background-color, @page__background-color);
7675
}
7776

7877
//

‎pub/errors/default/report.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@
3636
</div>
3737
<div class="field lastname required">
3838
<label for="lastname" class="label">Last Name</label>
39-
<div class=control">
39+
<div class="control">
4040
<input type="text" name="lastname" id="lastname" value="<?= $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
4141
</div>
4242
</div>
4343
<div class="field email required">
4444
<label for="email_address" class="label">Email Address</label>
45-
<div class=control">
45+
<div class="control">
4646
<input type="text" name="email" id="email_address" value="<?= $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
4747
</div>
4848
</div>
4949
<div class="field telephone">
5050
<label for="telephone" class="label">Telephone</label>
51-
<div class=control">
51+
<div class="control">
5252
<input type="text" name="telephone" id="telephone" value="<?= $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
5353
</div>
5454
</div>
5555
<div class="field comment">
5656
<label for="comment" class="label">Comment</label>
57-
<div class=control">
57+
<div class="control">
5858
<textarea name="comment" cols="5" rows="3" class="textarea"><?= $this->postData['comment'] ?></textarea>
5959
</div>
6060
</div>

0 commit comments

Comments
 (0)