MC-35885: Process public PR with bin/magento improvements

Author: vzabaznov

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

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Module\ModuleList\Loader;
 
 /**
  * A list of modules in the Magento application
@@ -26,7 +27,7 @@ class ModuleList implements ModuleListInterface
     /**
      * Loader of module information from source code
      *
-     * @var ModuleList\Loader
+     * @var Loader
      */
     private $loader;
 
@@ -50,9 +51,9 @@ class ModuleList implements ModuleListInterface
      * Constructor
      *
      * @param DeploymentConfig $config
-     * @param ModuleList\Loader $loader
+     * @param Loader $loader
      */
-    public function __construct(DeploymentConfig $config, ModuleList\Loader $loader)
+    public function __construct(DeploymentConfig $config, Loader $loader)
     {
         $this->config = $config;
         $this->loader = $loader;
@@ -98,10 +99,17 @@ public function getOne($name)
     public function getNames()
     {
         $this->loadConfigData();
+
+        $modulesList = array_keys($this->loader->load());
+
         if (!$this->configData) {
             return [];
         }
-        $result = array_keys(array_filter($this->configData));
+
+        $modulesInConfig = array_keys(array_filter($this->configData));
+
+        $result = array_intersect($modulesInConfig, $modulesList);
+
         return $result;
     }