Merge branch 'MAGETWO-73694' into MPI-PR-2.2.5

YevSent · YevSent · commit 35c41429b01f · 2018-03-21T13:37:05.000+02:00
diff --git a/app/code/Magento/Checkout/etc/adminhtml/routes.xml b/app/code/Magento/Checkout/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="checkout" frontName="checkout">
+            <module name="Magento_Checkout" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="admin">
-        <route id="checkout" frontName="checkout">
+        <route id="checkout">
             <module name="Magento_CheckoutAgreements" before="Magento_Backend" />
         </route>
     </router>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -112,7 +112,7 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      * )))
      * @var array
      */
-    protected static $_mapDependencies = [];
+    protected static $mapDependencies = [];
 
     /**
      * Regex pattern for validation file path of theme
@@ -395,7 +395,7 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
             $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $module);
         }
 
-        $this->_addDependencies($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
+        $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $nsModule);
     }
 
     /**
@@ -406,7 +406,7 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
      */
     public function collectRedundant()
     {
-        foreach (array_keys(self::$_mapDependencies) as $module) {
+        foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
             $found = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND);
             $found['Magento\Framework'] = 'Magento\Framework';
@@ -422,7 +422,7 @@ public function collectRedundant()
     public function testRedundant()
     {
         $output = [];
-        foreach (array_keys(self::$_mapDependencies) as $module) {
+        foreach (array_keys(self::$mapDependencies) as $module) {
             $result = [];
             $redundant = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT);
             if (count($redundant)) {
@@ -649,18 +649,16 @@ protected static function _getTypes()
      * Converts a composer json component name into the Magento Module form
      *
      * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
+     * @param array $packageModuleMap Mapping package name with module namespace.
      * @return string The corresponding Magento Module e.g. 'Magento\Theme'
      */
-    protected static function convertModuleName($jsonName)
+    protected static function convertModuleName($jsonName, array $packageModuleMap)
     {
-        if (strpos($jsonName, 'magento/module') !== false) {
-            $moduleName = str_replace('-', ' ', $jsonName);
-            $moduleName = ucwords($moduleName);
-            $moduleName = str_replace('module ', '', $moduleName);
-            $moduleName = str_replace(' ', '', $moduleName);
-            $moduleName = str_replace('/', '\\', $moduleName);
-            return $moduleName;
-        } elseif (strpos($jsonName, 'magento/magento') !== false || strpos($jsonName, 'magento/framework') !== false) {
+        if (isset($packageModuleMap[$jsonName])) {
+            return $packageModuleMap[$jsonName];
+        }
+
+        if (strpos($jsonName, 'magento/magento') !== false || strpos($jsonName, 'magento/framework') !== false) {
             $moduleName = str_replace('/', "\t", $jsonName);
             $moduleName = str_replace('framework-', "Framework\t", $moduleName);
             $moduleName = str_replace('-', ' ', $moduleName);
@@ -669,17 +667,21 @@ protected static function convertModuleName($jsonName)
             $moduleName = str_replace(' ', '', $moduleName);
             return $moduleName;
         }
+
         return $jsonName;
     }
 
     /**
-     * Initialise map of dependencies
+     * Initialise map of dependencies.
      *
+     * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Exception
      */
     protected static function _initDependencies()
     {
+        $packageModuleMap = self::getPackageModuleMapping();
         $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
         foreach ($jsonFiles as $file) {
             $contents = file_get_contents($file);
@@ -688,72 +690,100 @@ protected static function _initDependencies()
                 throw new \Exception("Invalid Json: $file");
             }
             $json = new \Magento\Framework\Config\Composer\Package(json_decode($contents));
-            $moduleName = self::convertModuleName($json->get('name'));
-            self::$_mapDependencies[$moduleName] = @(self::$_mapDependencies[$moduleName] ?: []);
-
+            $moduleName = self::convertModuleName($json->get('name'), $packageModuleMap);
+            if (!isset(self::$mapDependencies[$moduleName])) {
+                self::$mapDependencies[$moduleName] = [];
+            }
             foreach (self::_getTypes() as $type) {
-                if (!isset(self::$_mapDependencies[$moduleName][$type])) {
-                    self::$_mapDependencies[$moduleName][$type] = [
+                if (!isset(self::$mapDependencies[$moduleName][$type])) {
+                    self::$mapDependencies[$moduleName][$type] = [
                         self::MAP_TYPE_DECLARED  => [],
                         self::MAP_TYPE_FOUND     => [],
                         self::MAP_TYPE_REDUNDANT => [],
                     ];
                 }
             }
 
-            $require = $json->get('require');
-            if (isset($require) && !empty($require)) {
-                foreach ($require as $requiredModule => $version) {
-                    if (0 === strpos($requiredModule, 'magento/')
-                        && 'magento/magento-composer-installer' != $requiredModule
-                    ) {
-                        $type = self::TYPE_HARD;
-                        self::_addDependencies(
-                            $moduleName,
-                            $type,
-                            self::MAP_TYPE_DECLARED,
-                            self::convertModuleName($requiredModule)
-                        );
-                    }
-                }
-            }
-            $suggest = $json->get('suggest');
-            if (isset($suggest) && !empty($suggest)) {
-                foreach ($suggest as $requiredModule => $version) {
-                    if (0 === strpos($requiredModule, 'magento/')
-                        && 'magento/magento-composer-installer' != $requiredModule
-                    ) {
-                        $type = self::TYPE_SOFT;
-                        self::_addDependencies(
-                            $moduleName,
-                            $type,
-                            self::MAP_TYPE_DECLARED,
-                            self::convertModuleName($requiredModule)
-                        );
-                    }
-                }
-            }
+            $require = array_keys((array)$json->get('require'));
+            self::addDependencies($moduleName, $require, self::TYPE_HARD, $packageModuleMap);
+
+            $suggest = array_keys((array)$json->get('suggest'));
+            self::addDependencies($moduleName, $suggest, self::TYPE_SOFT, $packageModuleMap);
         }
     }
 
     /**
-     * Add dependency map items
+     * Add dependencies to dependency list.
      *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @param $dependencies
+     * @param string $moduleName
+     * @param array $packageNames
+     * @param string $type
+     * @param array $packageModuleMap
+     *
+     * @return void
+     */
+    private static function addDependencies(
+        string $moduleName,
+        array $packageNames,
+        string $type,
+        array $packageModuleMap
+    ) {
+        $packageNames = array_filter($packageNames, function ($packageName) use ($packageModuleMap) {
+            return isset($packageModuleMap[$packageName]) ||
+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+        });
+
+        foreach ($packageNames as $packageName) {
+            self::addDependency(
+                $moduleName,
+                $type,
+                self::MAP_TYPE_DECLARED,
+                self::convertModuleName($packageName, $packageModuleMap)
+            );
+        }
+    }
+
+    /**
+     * Add dependency map items.
+     *
+     * @param string $module
+     * @param string $type
+     * @param string $mapType
+     * @param string $dependency
+     *
+     * @return void
      */
-    protected static function _addDependencies($module, $type, $mapType, $dependencies)
+    private static function addDependency(string $module, string $type, string $mapType, string $dependency)
     {
-        if (!is_array($dependencies)) {
-            $dependencies = [$dependencies];
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            self::$mapDependencies[$module][$type][$mapType][$dependency] = $dependency;
         }
-        foreach ($dependencies as $dependency) {
-            if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-                self::$_mapDependencies[$module][$type][$mapType][$dependency] = $dependency;
+    }
+
+    /**
+     * Returns package name on module name mapping.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private static function getPackageModuleMapping()
+    {
+        $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+        $packageModuleMapping = [];
+        foreach ($jsonFiles as $file) {
+            $contents = file_get_contents($file);
+            $composerJson = json_decode($contents);
+            if (null == $composerJson) {
+                throw new \Exception("Invalid Json: $file");
             }
+            $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+            $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+            $packageName = $composerJson->name;
+            $packageModuleMapping[$packageName] = $moduleName;
         }
+
+        return $packageModuleMapping;
     }
 
     /**
@@ -766,8 +796,8 @@ protected static function _addDependencies($module, $type, $mapType, $dependenci
      */
     protected function _getDependencies($module, $type, $mapType)
     {
-        if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-            return self::$_mapDependencies[$module][$type][$mapType];
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            return self::$mapDependencies[$module][$type][$mapType];
         }
         return [];
     }
@@ -785,8 +815,8 @@ protected function _setDependencies($module, $type, $mapType, $dependencies)
         if (!is_array($dependencies)) {
             $dependencies = [$dependencies];
         }
-        if (isset(self::$_mapDependencies[$module][$type][$mapType])) {
-            self::$_mapDependencies[$module][$type][$mapType] = $dependencies;
+        if (isset(self::$mapDependencies[$module][$type][$mapType])) {
+            self::$mapDependencies[$module][$type][$mapType] = $dependencies;
         }
     }
 
@@ -798,6 +828,6 @@ protected function _setDependencies($module, $type, $mapType, $dependencies)
      */
     protected function _isFake($module)
     {
-        return isset(self::$_mapDependencies[$module]) ? false : true;
+        return isset(self::$mapDependencies[$module]) ? false : true;
     }
 }
