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

Author: vzabaznov

lib/internal/Magento/Framework/Module/Dir/Reader.php

@@ -124,7 +124,11 @@ private function getFiles($filename, $subDir = '')
     {
         $result = [];
         foreach ($this->modulesList->getNames() as $moduleName) {
-            $moduleSubDir = $this->getModuleDir($subDir, $moduleName);
+            try {
+                $moduleSubDir = $this->getModuleDir($subDir, $moduleName);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
             $file = $moduleSubDir . '/' . $filename;
             $directoryRead = $this->readFactory->create($moduleSubDir);
             $path = $directoryRead->getRelativePath($file);

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

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