Skip to content

Commit 4d4e88a

Browse files
vzabaznovvzabaznov
authored
Merge pull request magento#1845 from magento-helix/MAGETWO-85590
[Helix] merge 2.2 into 2.2-develop
2 parents b1cc3ea + cb85ecc commit 4d4e88a

File tree

108 files changed

+1483
-713
lines changed

Some content is hidden

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

108 files changed

+1483
-713
lines changed

‎.htaccess

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,15 @@
346346
Require all denied
347347
</IfVersion>
348348
</Files>
349+
<Files auth.json>
350+
<IfVersion < 2.4>
351+
order allow,deny
352+
deny from all
353+
</IfVersion>
354+
<IfVersion >= 2.4>
355+
Require all denied
356+
</IfVersion>
357+
</Files>
349358
<Files magento_umask>
350359
<IfVersion < 2.4>
351360
order allow,deny

‎.htaccess.sample

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,15 @@
323323
Require all denied
324324
</IfVersion>
325325
</Files>
326+
<Files auth.json>
327+
<IfVersion < 2.4>
328+
order allow,deny
329+
deny from all
330+
</IfVersion>
331+
<IfVersion >= 2.4>
332+
Require all denied
333+
</IfVersion>
334+
</Files>
326335
<Files magento_umask>
327336
<IfVersion < 2.4>
328337
order allow,deny

‎CHANGELOG.md

Lines changed: 226 additions & 0 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"lib-libxml": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.2.0",
14+
"version": "100.2.1",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Analytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-backend": "100.2.*",
7-
"magento/module-config": "100.2.*",
7+
"magento/module-config": "101.0.*",
88
"magento/module-integration": "100.2.*",
99
"magento/module-store": "100.2.*",
10-
"magento/framework": "100.2.*"
10+
"magento/framework": "101.0.*"
1111
},
1212
"type": "magento2-module",
1313
"version": "100.2.0",

‎app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-theme": "100.2.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.2.1",
27+
"version": "100.2.2",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/framework": "101.0.*"
1010
},
1111
"type": "magento2-module",
12-
"version": "100.2.0",
12+
"version": "100.2.1",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

‎app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct($merchantId, $publicKey, $privateKey, $environment)
4848
* Initializes credentials.
4949
*
5050
* @return void
51-
* @deprecated is not used anymore
51+
* @deprecated 100.2.2 is not used anymore
5252
*/
5353
protected function initCredentials()
5454
{

‎app/code/Magento/Braintree/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"magento/module-quote": "101.0.*",
1919
"magento/module-paypal": "100.2.*",
2020
"magento/module-ui": "101.0.*",
21-
"braintree/braintree_php": "3.22.0"
21+
"braintree/braintree_php": "3.25.0"
2222
},
2323
"suggest": {
2424
"magento/module-checkout-agreements": "100.2.*",
2525
"magento/module-theme": "100.2.*"
2626
},
2727
"type": "magento2-module",
28-
"version": "100.2.1",
28+
"version": "100.2.2",
2929
"license": [
3030
"proprietary"
3131
],

‎app/code/Magento/Bundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"magento/module-bundle-sample-data": "Sample Data version:100.2.*"
2626
},
2727
"type": "magento2-module",
28-
"version": "100.2.1",
28+
"version": "100.2.2",
2929
"license": [
3030
"OSL-3.0",
3131
"AFL-3.0"

‎app/code/Magento/Catalog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
3535
},
3636
"type": "magento2-module",
37-
"version": "102.0.1",
37+
"version": "102.0.2",
3838
"license": [
3939
"OSL-3.0",
4040
"AFL-3.0"

‎app/code/Magento/CatalogAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-catalog": "101.1.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-catalog": "102.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

‎app/code/Magento/CatalogImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"ext-ctype": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.2.1",
19+
"version": "100.2.2",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

‎app/code/Magento/CatalogInventory/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-ui": "101.0.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "100.2.1",
16+
"version": "100.2.2",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

‎app/code/Magento/CatalogRule/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
1818
},
1919
"type": "magento2-module",
20-
"version": "101.0.1",
20+
"version": "101.0.2",
2121
"license": [
2222
"OSL-3.0",
2323
"AFL-3.0"

‎app/code/Magento/CatalogSearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"magento/framework": "101.0.*"
1616
},
1717
"type": "magento2-module",
18-
"version": "100.2.1",
18+
"version": "100.2.2",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

‎app/code/Magento/CatalogUrlRewrite/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/module-ui": "101.0.*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.2.1",
17+
"version": "100.2.2",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

‎app/code/Magento/Checkout/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"magento/module-cookie": "100.2.*"
2828
},
2929
"type": "magento2-module",
30-
"version": "100.2.1",
30+
"version": "100.2.2",
3131
"license": [
3232
"OSL-3.0",
3333
"AFL-3.0"

‎app/code/Magento/Cms/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"magento/module-cms-sample-data": "Sample Data version:100.2.*"
1919
},
2020
"type": "magento2-module",
21-
"version": "102.0.1",
21+
"version": "102.0.2",
2222
"license": [
2323
"OSL-3.0",
2424
"AFL-3.0"

‎app/code/Magento/Config/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-deploy": "100.2.*"
1414
},
1515
"type": "magento2-module",
16-
"version": "101.0.1",
16+
"version": "101.0.2",
1717
"license": [
1818
"OSL-3.0",
1919
"AFL-3.0"

‎app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ protected function _applyConfigurableOption()
133133
['le' => $this->getTable('catalog_product_entity')],
134134
'le.' . $linkField . ' = l.parent_id',
135135
['parent_id' => 'entity_id']
136+
)->join(
137+
['i' => $this->_getDefaultFinalPriceTable()],
138+
'le.entity_id = i.entity_id',
139+
[]
136140
);
137141

138142
$select = $connection->select();

‎app/code/Magento/ConfigurableProduct/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"magento/module-product-links-sample-data": "Sample Data version:100.2.*"
2525
},
2626
"type": "magento2-module",
27-
"version": "100.2.1",
27+
"version": "100.2.2",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/Contact/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/framework": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Cron/Model/ResourceModel/Schedule.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,14 @@ public function trySetJobUniqueStatusAtomic($scheduleId, $newStatus, $currentSta
6666
{
6767
$connection = $this->getConnection();
6868

69-
$match = $connection->quoteInto('existing.job_code = current.job_code AND existing.status = ?', $newStatus);
69+
// this condition added to avoid cron jobs locking after incorrect termination of running job
70+
$match = $connection->quoteInto(
71+
'existing.job_code = current.job_code ' .
72+
'AND (existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY OR existing.executed_at IS NULL) ' .
73+
'AND existing.status = ?',
74+
$newStatus
75+
);
76+
7077
$selectIfUnlocked = $connection->select()
7178
->joinLeft(
7279
['existing' => $this->getTable('cron_schedule')],

‎app/code/Magento/Cron/Setup/Recurring.php

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Cron\Setup;
8+
9+
use Magento\Framework\Setup\InstallSchemaInterface;
10+
use Magento\Framework\Setup\ModuleContextInterface;
11+
use Magento\Framework\Setup\SchemaSetupInterface;
12+
13+
/**
14+
* Cron recurring setup
15+
*/
16+
class Recurring implements InstallSchemaInterface
17+
{
18+
/**
19+
* @var \Magento\Cron\Model\ResourceModel\Schedule
20+
*/
21+
private $schedule;
22+
23+
/**
24+
* Recurring constructor.
25+
* @param \Magento\Cron\Model\ResourceModel\Schedule $schedule
26+
*/
27+
public function __construct(
28+
\Magento\Cron\Model\ResourceModel\Schedule $schedule
29+
) {
30+
$this->schedule = $schedule;
31+
}
32+
33+
/**
34+
* {@inheritdoc}
35+
*/
36+
public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
37+
{
38+
$connection = $this->schedule->getConnection();
39+
$connection->update(
40+
$this->schedule->getMainTable(),
41+
[
42+
'status' => \Magento\Cron\Model\Schedule::STATUS_ERROR,
43+
'messages' => 'The job is terminated due to system upgrade'
44+
],
45+
$connection->quoteInto('status = ?', \Magento\Cron\Model\Schedule::STATUS_RUNNING)
46+
);
47+
}
48+
}

‎app/code/Magento/Cron/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/module-config": "101.0.*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.2.0",
13+
"version": "100.2.1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Customer/Block/Address/Edit.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,11 @@ protected function _prepareLayout()
139139

140140
if ($postedData = $this->_customerSession->getAddressFormData(true)) {
141141
$postedData['region'] = [
142-
'region_id' => $postedData['region_id'],
143-
'region' => $postedData['region'],
142+
'region' => $postedData['region'] ?? null,
144143
];
144+
if (!empty($postedData['region_id'])) {
145+
$postedData['region']['region_id'] = $postedData['region_id'];
146+
}
145147
$this->dataObjectHelper->populateWithArray(
146148
$this->_address,
147149
$postedData,

‎app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ protected function setUp()
101101
);
102102
}
103103

104-
public function testSetLayoutWithOwnAddressAndPostedData()
104+
/**
105+
* @param array $postedData
106+
* @dataProvider postedDataProvider
107+
*/
108+
public function testSetLayoutWithOwnAddressAndPostedData(array $postedData)
105109
{
106110
$addressId = 1;
107111
$customerId = 1;
108112
$title = __('Edit Address');
109-
$postedData = [
110-
'region_id' => 1,
111-
'region' => 'region',
112-
];
113113
$newPostedData = $postedData;
114114
$newPostedData['region'] = $postedData;
115115

@@ -169,6 +169,21 @@ public function testSetLayoutWithOwnAddressAndPostedData()
169169
$this->assertEquals($layoutMock, $this->model->getLayout());
170170
}
171171

172+
/**
173+
* @return array
174+
*/
175+
public function postedDataProvider()
176+
{
177+
return [
178+
[
179+
['region_id' => 1, 'region' => 'region']
180+
],
181+
[
182+
['region' => 'region without id']
183+
]
184+
];
185+
}
186+
172187
/**
173188
* @throws \Magento\Framework\Exception\LocalizedException
174189
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)

‎app/code/Magento/Customer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"magento/module-customer-sample-data": "Sample Data version:100.2.*"
3030
},
3131
"type": "magento2-module",
32-
"version": "101.0.1",
32+
"version": "101.0.2",
3333
"license": [
3434
"OSL-3.0",
3535
"AFL-3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<?php
2020
$_validationClass = $block->escapeHtmlAttr(
2121
$this->helper('Magento\Customer\Helper\Address')
22-
->getAttributeValidationClass('fax')
22+
->getAttributeValidationClass('telephone')
2323
);
2424
?>
2525
<input type="text"

‎app/code/Magento/CustomerAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
7-
"magento/module-customer": "100.2.*"
6+
"magento/framework": "101.0.*",
7+
"magento/module-customer": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0",

‎app/code/Magento/CustomerImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/framework": "101.0.*"
1313
},
1414
"type": "magento2-module",
15-
"version": "100.2.0",
15+
"version": "100.2.1",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

0 commit comments

Comments
 (0)