Merge branch 'MAGETWO-44017' into BUGS

Author: Oleksandr Karpenko

lib/internal/Magento/Framework/Module/DependencyChecker.php

@@ -33,6 +33,11 @@ class DependencyChecker
      */
     private $graph;
 
+    /**
+     * @var PackageInfo
+     */
+    protected $packageInfo;
+
     /**
      * Constructor
      *
@@ -44,8 +49,8 @@ public function __construct(ModuleList $list, ModuleList\Loader $loader, Package
     {
         $this->enabledModuleList = $list->getNames();
         $this->fullModuleList = $loader->load();
-        $packageInfo = $packageInfoFactory->create();
-        $this->graph = $this->createGraph($packageInfo);
+        $this->packageInfo = $packageInfoFactory->create();
+        $this->graph = $this->createGraph();
     }
 
     /**
@@ -93,7 +98,11 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
         foreach ($moduleNames as $moduleName) {
             $dependenciesMissing = [];
             $paths = $this->graph->findPathsToReachableNodes($moduleName, $graphMode);
-            foreach (array_keys($this->fullModuleList) as $module) {
+            $modules = array_merge(
+                array_keys($this->fullModuleList),
+                $this->packageInfo->getNonExistingDependencies()
+            );
+            foreach ($modules as $module) {
                 if (isset($paths[$module])) {
                     if ($isEnable && !in_array($module, $enabledModules)) {
                         $dependenciesMissing[$module] = $paths[$module];
@@ -110,24 +119,25 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
     /**
      * Create the dependency graph
      *
-     * @param PackageInfo $packageInfo
      * @return Graph
      */
-    private function createGraph(PackageInfo $packageInfo)
+    private function createGraph()
     {
         $nodes = [];
         $dependencies = [];
 
         // build the graph data
         foreach (array_keys($this->fullModuleList) as $moduleName) {
             $nodes[] = $moduleName;
-            foreach ($packageInfo->getRequire($moduleName) as $dependModuleName) {
+            foreach ($this->packageInfo->getRequire($moduleName) as $dependModuleName) {
                 if ($dependModuleName) {
                     $dependencies[] = [$moduleName, $dependModuleName];
                 }
             }
         }
-        $nodes = array_unique($nodes);
+        $nodes = array_unique(
+            array_merge($nodes, $this->packageInfo->getNonExistingDependencies())
+        );
 
         return new Graph($nodes, $dependencies);
     }

lib/internal/Magento/Framework/Module/PackageInfo.php

@@ -53,6 +53,11 @@ class PackageInfo
      */
     private $componentRegistrar;
 
+    /**
+     * @var array
+     */
+    protected $nonExistingDependencies = [];
+
     /**
      * Constructor
      *
@@ -104,7 +109,65 @@ private function load()
     public function getModuleName($packageName)
     {
         $this->load();
-        return isset($this->packageModuleMap[$packageName]) ? $this->packageModuleMap[$packageName] : '';
+
+        $moduleName = null;
+        if (isset($this->packageModuleMap[$packageName])) {
+            $moduleName = $this->packageModuleMap[$packageName];
+        } elseif ($this->isMagentoPackage($packageName)) {
+            $moduleName = $this->convertPackageNameToModuleName($packageName);
+            $this->addNonExistingDependency($moduleName);
+        }
+
+        return $moduleName;
+    }
+
+    /**
+     * Add non existing dependency
+     *
+     * @param string $dependency
+     * @return void
+     */
+    protected function addNonExistingDependency($dependency)
+    {
+        if (!isset($this->nonExistingDependencies[$dependency])) {
+            $this->nonExistingDependencies[$dependency] = $dependency;
+        }
+    }
+
+    /**
+     * Return list of non existing dependencies
+     *
+     * @return array
+     */
+    public function getNonExistingDependencies()
+    {
+        return $this->nonExistingDependencies;
+    }
+
+    /**
+     * Build module name based on internal package name
+     *
+     * @param string $packageName
+     * @return string|null
+     */
+    protected function convertPackageNameToModuleName($packageName)
+    {
+        $moduleName = str_replace('magento/module-', '', $packageName);
+        $moduleName = str_replace('-', ' ', $moduleName);
+        $moduleName = str_replace(' ', '', ucwords($moduleName));
+
+        return 'Magento_' . $moduleName;
+    }
+
+    /**
+     * Check if package is internal magento module
+     *
+     * @param string $packageName
+     * @return bool
+     */
+    protected function isMagentoPackage($packageName)
+    {
+        return strpos($packageName, 'magento/module-') === 0;
     }
 
     /**

lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php

@@ -70,10 +70,12 @@ public function setUp()
 
     public function testCheckDependenciesWhenDisableModules()
     {
-        $this->listMock
-            ->expects($this->any())
+        $this->listMock->expects($this->any())
             ->method('getNames')
             ->will($this->returnValue(['A', 'B', 'C', 'D', 'E']));
+        $this->packageInfoMock->expects($this->atLeastOnce())
+            ->method('getNonExistingDependencies')
+            ->willReturn([]);
         $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
 
         $actual = $this->checker->checkDependenciesWhenDisableModules(['B', 'D']);
@@ -83,6 +85,9 @@ public function testCheckDependenciesWhenDisableModules()
 
     public function testCheckDependenciesWhenDisableModulesWithCurEnabledModules()
     {
+        $this->packageInfoMock->expects($this->atLeastOnce())
+            ->method('getNonExistingDependencies')
+            ->willReturn([]);
         $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
 
         $actual = $this->checker->checkDependenciesWhenDisableModules(['B', 'D'], ['C', 'D', 'E']);
@@ -92,10 +97,12 @@ public function testCheckDependenciesWhenDisableModulesWithCurEnabledModules()
 
     public function testCheckDependenciesWhenEnableModules()
     {
-        $this->listMock
-            ->expects($this->any())
+        $this->listMock->expects($this->any())
             ->method('getNames')
             ->will($this->returnValue(['C']));
+        $this->packageInfoMock->expects($this->atLeastOnce())
+            ->method('getNonExistingDependencies')
+            ->willReturn([]);
         $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
         $actual = $this->checker->checkDependenciesWhenEnableModules(['B', 'D']);
         $expected = [
@@ -107,6 +114,9 @@ public function testCheckDependenciesWhenEnableModules()
 
     public function testCheckDependenciesWhenEnableModulesWithCurEnabledModules()
     {
+        $this->packageInfoMock->expects($this->atLeastOnce())
+            ->method('getNonExistingDependencies')
+            ->willReturn([]);
         $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
         $actual = $this->checker->checkDependenciesWhenEnableModules(['B', 'D'], ['C']);
         $expected = [

lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php

@@ -57,6 +57,11 @@ public function testGetModuleName()
         $this->assertEquals('C', $this->packageInfo->getModuleName('c'));
         $this->assertEquals('D', $this->packageInfo->getModuleName('d'));
         $this->assertEquals('E', $this->packageInfo->getModuleName('e'));
+        $this->assertEquals(
+            'Magento_TestModuleName',
+            $this->packageInfo->getModuleName('magento/module-test-module-name')
+        );
+        $this->assertArrayHasKey('Magento_TestModuleName', $this->packageInfo->getNonExistingDependencies());
     }
 
     public function testGetPackageName()