Skip to content

Commit 288d0d4

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch '2.2-develop' of github.com:magento/magento2 into issues/12294
2 parents 2ccb374 + a39e37f commit 288d0d4

File tree

242 files changed

+28087
-24843
lines changed

Some content is hidden

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

242 files changed

+28087
-24843
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/Model/Menu/Item.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -467,15 +467,15 @@ public function toArray()
467467
{
468468
return [
469469
'parent_id' => $this->_parentId,
470-
'module_name' => $this->_moduleName,
470+
'module' => $this->_moduleName,
471471
'sort_index' => $this->_sortIndex,
472-
'depends_on_config' => $this->_dependsOnConfig,
472+
'dependsOnConfig' => $this->_dependsOnConfig,
473473
'id' => $this->_id,
474474
'resource' => $this->_resource,
475475
'path' => $this->_path,
476476
'action' => $this->_action,
477-
'depends_on_module' => $this->_dependsOnModule,
478-
'tooltip' => $this->_tooltip,
477+
'dependsOnModule' => $this->_dependsOnModule,
478+
'toolTip' => $this->_tooltip,
479479
'title' => $this->_title,
480480
'target' => $this->target,
481481
'sub_menu' => isset($this->_submenu) ? $this->_submenu->toArray() : null
@@ -492,15 +492,15 @@ public function toArray()
492492
public function populateFromArray(array $data)
493493
{
494494
$this->_parentId = $this->_getArgument($data, 'parent_id');
495-
$this->_moduleName = $this->_getArgument($data, 'module_name', 'Magento_Backend');
495+
$this->_moduleName = $this->_getArgument($data, 'module', 'Magento_Backend');
496496
$this->_sortIndex = $this->_getArgument($data, 'sort_index');
497-
$this->_dependsOnConfig = $this->_getArgument($data, 'depends_on_config');
497+
$this->_dependsOnConfig = $this->_getArgument($data, 'dependsOnConfig');
498498
$this->_id = $this->_getArgument($data, 'id');
499499
$this->_resource = $this->_getArgument($data, 'resource');
500500
$this->_path = $this->_getArgument($data, 'path', '');
501501
$this->_action = $this->_getArgument($data, 'action');
502-
$this->_dependsOnModule = $this->_getArgument($data, 'depends_on_module');
503-
$this->_tooltip = $this->_getArgument($data, 'tooltip', '');
502+
$this->_dependsOnModule = $this->_getArgument($data, 'dependsOnModule');
503+
$this->_tooltip = $this->_getArgument($data, 'toolTip');
504504
$this->_title = $this->_getArgument($data, 'title');
505505
$this->target = $this->_getArgument($data, 'target');
506506
if (isset($data['sub_menu'])) {

‎app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class ItemTest extends \PHPUnit\Framework\TestCase
5656
'title' => 'Item Title',
5757
'action' => '/system/config',
5858
'resource' => 'Magento_Config::config',
59-
'depends_on_module' => 'Magento_Backend',
60-
'depends_on_config' => 'system/config/isEnabled',
61-
'tooltip' => 'Item tooltip',
59+
'dependsOnModule' => 'Magento_Backend',
60+
'dependsOnConfig' => 'system/config/isEnabled',
61+
'toolTip' => 'Item tooltip',
6262
];
6363

6464
protected function setUp()

‎app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_constructor_data.php

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
'title' => 'Item Title',
1313
'action' => '/system/config',
1414
'resource' => 'Magento_Config::config',
15-
'depends_on_module' => 'Magento_Backend',
16-
'depends_on_config' => 'system/config/isEnabled',
17-
'tooltip' => 'Item tooltip',
15+
'dependsOnModule' => 'Magento_Backend',
16+
'dependsOnConfig' => 'system/config/isEnabled',
17+
'toolTip' => 'Item tooltip',
1818
],
1919
[
2020
'parent_id' => null,
21-
'module_name' => 'Magento_Backend',
21+
'module' => 'Magento_Backend',
2222
'sort_index' => null,
23-
'depends_on_config' => 'system/config/isEnabled',
23+
'dependsOnConfig' => 'system/config/isEnabled',
2424
'id' => 'item',
2525
'resource' => 'Magento_Config::config',
2626
'path' => '',
2727
'action' => '/system/config',
28-
'depends_on_module' => 'Magento_Backend',
29-
'tooltip' => 'Item tooltip',
28+
'dependsOnModule' => 'Magento_Backend',
29+
'toolTip' => 'Item tooltip',
3030
'title' => 'Item Title',
3131
'sub_menu' => null,
3232
'target' => null
@@ -38,43 +38,43 @@
3838
'title' => 'Item Title',
3939
'action' => '/system/config',
4040
'resource' => 'Magento_Config::config',
41-
'depends_on_module' => 'Magento_Backend',
42-
'depends_on_config' => 'system/config/isEnabled',
43-
'tooltip' => 'Item tooltip',
41+
'dependsOnModule' => 'Magento_Backend',
42+
'dependsOnConfig' => 'system/config/isEnabled',
43+
'toolTip' => 'Item tooltip',
4444
],
4545
[
4646
'parent_id' => '1',
47-
'module_name' => 'Magento_Module1',
47+
'module' => 'Magento_Module1',
4848
'sort_index' => '50',
49-
'depends_on_config' => null,
49+
'dependsOnConfig' => null,
5050
'id' => '5',
5151
'resource' => null,
5252
'path' => null,
5353
'action' => null,
54-
'depends_on_module' => null,
55-
'tooltip' => null,
54+
'dependsOnModule' => null,
55+
'toolTip' => null,
5656
'title' => null,
5757
'sub_menu' => [
5858
'id' => 'item',
5959
'title' => 'Item Title',
6060
'action' => '/system/config',
6161
'resource' => 'Magento_Config::config',
62-
'depends_on_module' => 'Magento_Backend',
63-
'depends_on_config' => 'system/config/isEnabled',
64-
'tooltip' => 'Item tooltip',
62+
'dependsOnModule' => 'Magento_Backend',
63+
'dependsOnConfig' => 'system/config/isEnabled',
64+
'toolTip' => 'Item tooltip',
6565
],
6666
],
6767
[
6868
'parent_id' => '1',
69-
'module_name' => 'Magento_Module1',
69+
'module' => 'Magento_Module1',
7070
'sort_index' => '50',
71-
'depends_on_config' => null,
71+
'dependsOnConfig' => null,
7272
'id' => '5',
7373
'resource' => null,
7474
'path' => '',
7575
'action' => null,
76-
'depends_on_module' => null,
77-
'tooltip' => '',
76+
'dependsOnModule' => null,
77+
'toolTip' => '',
7878
'title' => null,
7979
'sub_menu' => ['submenuArray'],
8080
'target' => null
@@ -83,51 +83,51 @@
8383
'data with submenu to constructor' => [
8484
[
8585
'parent_id' => '1',
86-
'module_name' => 'Magento_Module1',
86+
'module' => 'Magento_Module1',
8787
'sort_index' => '50',
88-
'depends_on_config' => null,
88+
'dependsOnConfig' => null,
8989
'id' => '5',
9090
'resource' => null,
9191
'path' => null,
9292
'action' => null,
93-
'depends_on_module' => null,
94-
'tooltip' => null,
93+
'dependsOnModule' => null,
94+
'toolTip' => null,
9595
'title' => null,
9696
'sub_menu' => [
9797
'id' => 'item',
9898
'title' => 'Item Title',
9999
'action' => '/system/config',
100100
'resource' => 'Magento_Config::config',
101-
'depends_on_module' => 'Magento_Backend',
102-
'depends_on_config' => 'system/config/isEnabled',
103-
'tooltip' => 'Item tooltip',
101+
'dependsOnModule' => 'Magento_Backend',
102+
'dependsOnConfig' => 'system/config/isEnabled',
103+
'toolTip' => 'Item tooltip',
104104
],
105105
],
106106
[
107107
'parent_id' => '1',
108-
'module_name' => 'Magento_Module1',
108+
'module' => 'Magento_Module1',
109109
'sort_index' => '50',
110110
'sub_menu' => [
111111
'id' => 'item',
112112
'title' => 'Item Title',
113113
'action' => '/system/config',
114114
'resource' => 'Magento_Config::config',
115-
'depends_on_module' => 'Magento_Backend',
116-
'depends_on_config' => 'system/config/isEnabled',
117-
'tooltip' => 'Item tooltip',
115+
'dependsOnModule' => 'Magento_Backend',
116+
'dependsOnConfig' => 'system/config/isEnabled',
117+
'toolTip' => 'Item tooltip',
118118
],
119119
],
120120
[
121121
'parent_id' => '1',
122-
'module_name' => 'Magento_Module1',
122+
'module' => 'Magento_Module1',
123123
'sort_index' => '50',
124-
'depends_on_config' => null,
124+
'dependsOnConfig' => null,
125125
'id' => null,
126126
'resource' => null,
127127
'path' => '',
128128
'action' => null,
129-
'depends_on_module' => null,
130-
'tooltip' => '',
129+
'dependsOnModule' => null,
130+
'toolTip' => '',
131131
'title' => null,
132132
'sub_menu' => ['submenuArray'],
133133
'target' => null

0 commit comments

Comments
 (0)