Merge branch '2.2-develop' of github.com:magento/magento2 into issue/…

…12342/JSTestDriver-removal
mediact · Jan 18, 2018 · 574daf5 · 574daf5
2 parents a667b63 + f28dbc0
commit 574daf5
Show file tree

Hide file tree

Showing 254 changed files with 3,949 additions and 1,551 deletions.
diff --git a/COPYING.txt b/COPYING.txt
@@ -1,4 +1,4 @@
-Copyright © 2013-2017 Magento, Inc.
+Copyright © 2013-2018 Magento, Inc.
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 

diff --git a/README.md b/README.md
@@ -5,13 +5,13 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
 *	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 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].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 

diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -14,12 +14,12 @@
 if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
     if (PHP_SAPI == 'cli') {
         echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
-            'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
+            'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
-    <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
+    <a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
     Magento System Requirements</a>.
 </div>
 HTML;

diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -467,15 +467,15 @@ public function toArray()
     {
         return [
             'parent_id' => $this->_parentId,
-            'module_name' => $this->_moduleName,
+            'module' => $this->_moduleName,
             'sort_index' => $this->_sortIndex,
-            'depends_on_config' => $this->_dependsOnConfig,
+            'dependsOnConfig' => $this->_dependsOnConfig,
             'id' => $this->_id,
             'resource' => $this->_resource,
             'path' => $this->_path,
             'action' => $this->_action,
-            'depends_on_module' => $this->_dependsOnModule,
-            'tooltip' => $this->_tooltip,
+            'dependsOnModule' => $this->_dependsOnModule,
+            'toolTip' => $this->_tooltip,
             'title' => $this->_title,
             'target' => $this->target,
             'sub_menu' => isset($this->_submenu) ? $this->_submenu->toArray() : null
@@ -492,15 +492,15 @@ public function toArray()
     public function populateFromArray(array $data)
     {
         $this->_parentId = $this->_getArgument($data, 'parent_id');
-        $this->_moduleName = $this->_getArgument($data, 'module_name', 'Magento_Backend');
+        $this->_moduleName = $this->_getArgument($data, 'module', 'Magento_Backend');
         $this->_sortIndex = $this->_getArgument($data, 'sort_index');
-        $this->_dependsOnConfig = $this->_getArgument($data, 'depends_on_config');
+        $this->_dependsOnConfig = $this->_getArgument($data, 'dependsOnConfig');
         $this->_id = $this->_getArgument($data, 'id');
         $this->_resource = $this->_getArgument($data, 'resource');
         $this->_path = $this->_getArgument($data, 'path', '');
         $this->_action = $this->_getArgument($data, 'action');
-        $this->_dependsOnModule = $this->_getArgument($data, 'depends_on_module');
-        $this->_tooltip = $this->_getArgument($data, 'tooltip', '');
+        $this->_dependsOnModule = $this->_getArgument($data, 'dependsOnModule');
+        $this->_tooltip = $this->_getArgument($data, 'toolTip');
         $this->_title = $this->_getArgument($data, 'title');
         $this->target = $this->_getArgument($data, 'target');
         if (isset($data['sub_menu'])) {

diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php
@@ -56,9 +56,9 @@ class ItemTest extends \PHPUnit\Framework\TestCase
         'title' => 'Item Title',
         'action' => '/system/config',
         'resource' => 'Magento_Config::config',
-        'depends_on_module' => 'Magento_Backend',
-        'depends_on_config' => 'system/config/isEnabled',
-        'tooltip' => 'Item tooltip',
+        'dependsOnModule' => 'Magento_Backend',
+        'dependsOnConfig' => 'system/config/isEnabled',
+        'toolTip' => 'Item tooltip',
     ];
 
     protected function setUp()

diff --git a/app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_constructor_data.php b/app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_constructor_data.php
@@ -12,21 +12,21 @@
             'title' => 'Item Title',
             'action' => '/system/config',
             'resource' => 'Magento_Config::config',
-            'depends_on_module' => 'Magento_Backend',
-            'depends_on_config' => 'system/config/isEnabled',
-            'tooltip' => 'Item tooltip',
+            'dependsOnModule' => 'Magento_Backend',
+            'dependsOnConfig' => 'system/config/isEnabled',
+            'toolTip' => 'Item tooltip',
         ],
         [
             'parent_id' => null,
-            'module_name' => 'Magento_Backend',
+            'module' => 'Magento_Backend',
             'sort_index' => null,
-            'depends_on_config' => 'system/config/isEnabled',
+            'dependsOnConfig' => 'system/config/isEnabled',
             'id' => 'item',
             'resource' => 'Magento_Config::config',
             'path' => '',
             'action' => '/system/config',
-            'depends_on_module' => 'Magento_Backend',
-            'tooltip' => 'Item tooltip',
+            'dependsOnModule' => 'Magento_Backend',
+            'toolTip' => 'Item tooltip',
             'title' => 'Item Title',
             'sub_menu' => null,
             'target' => null
@@ -38,43 +38,43 @@
             'title' => 'Item Title',
             'action' => '/system/config',
             'resource' => 'Magento_Config::config',
-            'depends_on_module' => 'Magento_Backend',
-            'depends_on_config' => 'system/config/isEnabled',
-            'tooltip' => 'Item tooltip',
+            'dependsOnModule' => 'Magento_Backend',
+            'dependsOnConfig' => 'system/config/isEnabled',
+            'toolTip' => 'Item tooltip',
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => '5',
             'resource' => null,
             'path' => null,
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => null,
+            'dependsOnModule' => null,
+            'toolTip' => null,
             'title' => null,
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => '5',
             'resource' => null,
             'path' => '',
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => '',
+            'dependsOnModule' => null,
+            'toolTip' => '',
             'title' => null,
             'sub_menu' => ['submenuArray'],
             'target' => null
@@ -83,51 +83,51 @@
     'data with submenu to constructor' => [
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => '5',
             'resource' => null,
             'path' => null,
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => null,
+            'dependsOnModule' => null,
+            'toolTip' => null,
             'title' => null,
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => null,
             'resource' => null,
             'path' => '',
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => '',
+            'dependsOnModule' => null,
+            'toolTip' => '',
             'title' => null,
             'sub_menu' => ['submenuArray'],
             'target' => null

diff --git a/app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_data.php b/app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_data.php
@@ -11,22 +11,22 @@
             'title' => 'Item Title',
             'action' => '/system/config',
             'resource' => 'Magento_Config::config',
-            'depends_on_module' => 'Magento_Backend',
-            'depends_on_config' => 'system/config/isEnabled',
-            'tooltip' => 'Item tooltip',
+            'dependsOnModule' => 'Magento_Backend',
+            'dependsOnConfig' => 'system/config/isEnabled',
+            'toolTip' => 'Item tooltip',
             'sub_menu' => null,
         ],
         [
             'parent_id' => null,
-            'module_name' => 'Magento_Backend',
+            'module' => 'Magento_Backend',
             'sort_index' => null,
-            'depends_on_config' => 'system/config/isEnabled',
+            'dependsOnConfig' => 'system/config/isEnabled',
             'id' => 'item',
             'resource' => 'Magento_Config::config',
             'path' => '',
             'action' => '/system/config',
-            'depends_on_module' => 'Magento_Backend',
-            'tooltip' => 'Item tooltip',
+            'dependsOnModule' => 'Magento_Backend',
+            'toolTip' => 'Item tooltip',
             'title' => 'Item Title',
             'sub_menu' => null,
             'target' => null
@@ -35,85 +35,85 @@
     'with submenu' => [
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => '5',
             'resource' => null,
             'path' => null,
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => null,
+            'dependsOnModule' => null,
+            'toolTip' => null,
             'title' => null,
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => '5',
             'resource' => null,
             'path' => null,
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => '',
+            'dependsOnModule' => null,
+            'toolTip' => '',
             'title' => null,
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
             'target' => null
         ]
     ],
     'small set of data' => [
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
         ],
         [
             'parent_id' => '1',
-            'module_name' => 'Magento_Module1',
+            'module' => 'Magento_Module1',
             'sort_index' => '50',
-            'depends_on_config' => null,
+            'dependsOnConfig' => null,
             'id' => null,
             'resource' => null,
             'path' => '',
             'action' => null,
-            'depends_on_module' => null,
-            'tooltip' => '',
+            'dependsOnModule' => null,
+            'toolTip' => '',
             'title' => null,
             'sub_menu' => [
                 'id' => 'item',
                 'title' => 'Item Title',
                 'action' => '/system/config',
                 'resource' => 'Magento_Config::config',
-                'depends_on_module' => 'Magento_Backend',
-                'depends_on_config' => 'system/config/isEnabled',
-                'tooltip' => 'Item tooltip',
+                'dependsOnModule' => 'Magento_Backend',
+                'dependsOnConfig' => 'system/config/isEnabled',
+                'toolTip' => 'Item tooltip',
             ],
             'target' => null
         ]