Fix errors found by static test

Author: kandy

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

@@ -15,12 +15,13 @@ class DependencyChecker
     /**
      * @var PackageInfo
      */
-    protected $packageInfo;
+    private $packageInfo;
 
     /**
      * @var ModuleList
      */
     private $list;
+
     /**
      * @var ModuleList\Loader
      */
@@ -46,6 +47,7 @@ public function __construct(ModuleList $list, ModuleList\Loader $loader, Package
      * @param string[] $toBeDisabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function checkDependenciesWhenDisableModules($toBeDisabledModules, $currentlyEnabledModules = null)
     {
@@ -61,8 +63,9 @@ public function checkDependenciesWhenDisableModules($toBeDisabledModules, $curre
      * @param string[] $toBeEnabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function checkDependenciesWhenEnableModules($toBeEnabledModules, $currentlyEnabledModules = null)
+    public function checkDependenciesWhenEnableModules(array $toBeEnabledModules, array $currentlyEnabledModules = null)
     {
         $masterList = $currentlyEnabledModules ?? $this->list->getNames();
         // assume enable succeeds: union of currently enabled modules and to-be-enabled modules
@@ -79,19 +82,19 @@ public function checkDependenciesWhenEnableModules($toBeEnabledModules, $current
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
+    private function checkDependencyGraph(bool $isEnable, array $moduleNames, array $enabledModules)
     {
         $fullModuleList = $this->loader->load();
         $graph = $this->createGraph($fullModuleList);
         $dependenciesMissingAll = [];
         $graphMode = $isEnable ? Graph::DIRECTIONAL : Graph::INVERSE;
+        $modules = array_merge(
+            array_keys($fullModuleList),
+            $this->packageInfo->getNonExistingDependencies()
+        );
         foreach ($moduleNames as $moduleName) {
             $dependenciesMissing = [];
             $paths = $graph->findPathsToReachableNodes($moduleName, $graphMode);
-            $modules = array_merge(
-                array_keys($fullModuleList),
-                $this->packageInfo->getNonExistingDependencies()
-            );
             foreach ($modules as $module) {
                 if (isset($paths[$module])) {
                     if ($isEnable && !in_array($module, $enabledModules)) {
@@ -112,7 +115,7 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
      * @param array $fullModuleList
      * @return Graph
      */
-    private function createGraph($fullModuleList)
+    private function createGraph(array $fullModuleList): Graph
     {
         $nodes = [];
         $dependencies = [];

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

@@ -44,8 +44,6 @@ protected function setUp()
             ->method('getRequire')
             ->will($this->returnValueMap($requireMap));
 
-
-
         $this->listMock = $this->createMock(\Magento\Framework\Module\ModuleList::class);
         $this->loaderMock = $this->createMock(\Magento\Framework\Module\ModuleList\Loader::class);
         $this->loaderMock

setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php

@@ -77,6 +77,7 @@ public function __construct(
 
     /**
      * Auto discover ConfigOptionsList class and collect them.
+     *
      * These classes should reside in <module>/Setup directories.
      *
      * @return \Magento\Framework\Setup\ConfigOptionsListInterface[]
@@ -86,7 +87,7 @@ public function collectOptionsLists()
         $optionsList = [];
 
         $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
-        foreach ($modulePaths as $moduleName => $modulePath) {
+        foreach (array_keys($modulePaths) as $moduleName) {
             $optionsClassName = str_replace('_', '\\', $moduleName) . '\Setup\ConfigOptionsList';
             if (class_exists($optionsClassName)) {
                 $optionsClass = $this->objectManagerProvider->get()->create($optionsClassName);