fix gentle issues

aurelien-riv · May 17, 2018 · 03216f3 · 03216f3
1 parent 9b34b27
commit 03216f3
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 26 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -2,9 +2,6 @@
 
 namespace DBChecker;
 
-use DBChecker\InputModules\AbstractDBAL;
-use DBChecker\InputModules\InputModuleManager;
-use DBChecker\modules\DataBase\DatabasesModule;
 use DBChecker\modules\ModuleManager;
 use Symfony\Component\Yaml\Yaml;
 
@@ -14,15 +11,8 @@ class Config
 
     public function __construct($yamlPath)
     {
-        $settings = Yaml::parseFile($yamlPath);
-
         $this->moduleManager = new ModuleManager();
-
-        $this->moduleManager->loadModule(new InputModuleManager(), $settings);
-        foreach (ModuleManager::ENABLED_MODULES as $module)
-        {
-            $this->moduleManager->loadModule(new $module(), $settings);
-        }
+        $this->moduleManager->loadModules(Yaml::parseFile($yamlPath));
     }
 
     /**
@@ -35,6 +25,6 @@ public function getModuleWorkers()
 
     public function getDBALs() : \Generator
     {
-        return $this->moduleManager->getDatabaseModule()->getDBALs();
+        yield from $this->moduleManager->getDatabaseModule()->getDBALs();
     }
 }
diff --git a/src/InputModules/InputModuleManager.php b/src/InputModules/InputModuleManager.php
@@ -23,6 +23,7 @@ public function getConfigTreeBuilder()
             ->addDefaultsIfNotSet()
             ->children()
                 ->arrayNode('connections')
+                ->isRequired()
                 ->requiresAtLeastOneElement()
                 ->arrayPrototype()
                     ->ignoreExtraKeys(false)

diff --git a/src/modules/DataIntegrityCheck/DataIntegrityCheck.php b/src/modules/DataIntegrityCheck/DataIntegrityCheck.php
@@ -13,6 +13,10 @@ class DataIntegrityCheck implements ModuleWorkerInterface
 {
     private $config;
 
+    /**
+     * DataIntegrityCheck constructor.
+     * @param ModuleInterface|DataIntegrityCheckModule $module
+     */
     public function __construct(ModuleInterface $module)
     {
         $this->config = $module->getConfig();

diff --git a/src/modules/ModuleManager.php b/src/modules/ModuleManager.php
@@ -3,11 +3,9 @@
 namespace DBChecker\modules;
 
 use DBChecker\BaseModuleInterface;
-use DBChecker\InputModules\InputModuleInterface;
 use DBChecker\InputModules\InputModuleManager;
 use DBChecker\ModuleInterface;
 use DBChecker\modules\AnalyzeTableCheck\AnalyzeTableCheckModule;
-use DBChecker\modules\DataBase\DatabasesModule;
 use DBChecker\modules\DataIntegrityCheck\DataIntegrityCheckModule;
 use DBChecker\modules\FileCheck\FileCheckModule;
 use DBChecker\modules\FragmentationCheck\FragmentationCheckModule;
@@ -37,6 +35,14 @@ class ModuleManager
         PwnedAccountsDetectModule::class
     ];
 
+    public function loadModules($settings)
+    {
+        foreach (static::ENABLED_MODULES as $module)
+        {
+            $this->loadModule(new $module(), $settings);
+        }
+    }
+
     public function loadModule(BaseModuleInterface $module, $settings)
     {
         $moduleName = $module->getName();
@@ -50,6 +56,10 @@ public function loadModule(BaseModuleInterface $module, $settings)
             $module->loadConfig($moduleSettings);
             $this->modules[] = $module;
         }
+        else if ($module instanceof InputModuleManager)
+        {
+            throw new \InvalidArgumentException("No input module has been defined");
+        }
     }
 
     public function getDatabaseModule() : InputModuleManager
@@ -61,7 +71,7 @@ public function getDatabaseModule() : InputModuleManager
                 return $module;
             }
         }
-        return null;
+        throw new \LogicException("This code shouldn't be reached");
     }
 
     public function getWorkers() : \Generator

diff --git a/src/modules/SchemaIntegrityCheck/SchemaIntegrityCheck.php b/src/modules/SchemaIntegrityCheck/SchemaIntegrityCheck.php
@@ -4,12 +4,17 @@
 
 use DBChecker\InputModules\AbstractDBAL;
 use DBChecker\ModuleInterface;
+use DBChecker\modules\DataIntegrityCheck\DataIntegrityCheckModule;
 use DBChecker\ModuleWorkerInterface;
 
 class SchemaIntegrityCheck implements ModuleWorkerInterface
 {
     private $config;
 
+    /**
+     * SchemaIntegrityCheck constructor.
+     * @param ModuleInterface|DataIntegrityCheckModule $module
+     */
     public function __construct(ModuleInterface $module)
     {
         $this->config = $module->getConfig();

diff --git a/tests/DatabaseUtilities.php b/tests/DatabaseUtilities.php
@@ -2,7 +2,7 @@
 
 namespace DBCheckerTests;
 
-use DBChecker\DBAL\AbstractDBAL;
+use DBChecker\InputModules\AbstractDBAL;
 use DBChecker\InputModules\MySQL\MySQLDBAL;
 use DBChecker\InputModules\SQLite\SQLiteDBAL;
 use DBChecker\modules\ModuleManager;
@@ -32,10 +32,15 @@ public static function getMysqlConfig()
         ];
     }
 
-    public function getPdo(ModuleManager $moduleManager, $index=0)
+    public function getDbal(ModuleManager $moduleManager, $index=0)
     {
         $dbals = iterator_to_array($moduleManager->getDatabaseModule()->getDBALs());
-        $dbal = $dbals[$index];
+        return $dbals[$index];
+    }
+
+    public function getPdo(ModuleManager $moduleManager, $index=0)
+    {
+        $dbal = $this->getDbal($moduleManager, $index);
         $queries = $this->getAttributeValue($dbal, 'queries');
         return $this->getAttributeValue($queries, 'pdo');
     }

diff --git a/tests/modules/MissingKeyDetect/MissingKeyDetectTest.php b/tests/modules/MissingKeyDetect/MissingKeyDetectTest.php
@@ -52,8 +52,7 @@ public function tearDown()
 
     private function init($dbIndex) : AbstractDBAL
     {
-        $dbals = iterator_to_array($this->moduleManager->getDatabaseModule()->getDBALs());
-        $dbal = $dbals[$dbIndex];
+        $dbal = $this->getDbal($this->moduleManager, $dbIndex);
         $queries = $this->getAttributeValue($dbal, 'queries');
         $pdo = $this->getAttributeValue($queries, 'pdo');
         $this->initDb($pdo);

diff --git a/tests/modules/RelCheckTest/RelCheckTest.php b/tests/modules/RelCheckTest/RelCheckTest.php
@@ -50,8 +50,7 @@ public function tearDown()
 
     private function init($dbIndex)
     {
-        $dbals = iterator_to_array($this->moduleManager->getDatabaseModule()->getDBALs());
-        $dbal = $dbals[$dbIndex];
+        $dbal = $this->getDbal($this->moduleManager, $dbIndex);
         $queries = $this->getAttributeValue($dbal, 'queries');
         $pdo = $this->getAttributeValue($queries, 'pdo');
         $this->initDb($dbal, $pdo);

diff --git a/tests/modules/SchemaIntegrityCheck/SchemaIntegrityTest.php b/tests/modules/SchemaIntegrityCheck/SchemaIntegrityTest.php
@@ -44,8 +44,7 @@ public function tearDown()
 
     private function initDBal($dbIndex)
     {
-        $dbals = iterator_to_array($this->moduleManager->getDatabaseModule()->getDBALs());
-        $dbal = $dbals[$dbIndex];
+        $dbal = $this->getDbal($this->moduleManager, $dbIndex);
         $queries = $this->getAttributeValue($dbal, 'queries');
         $pdo = $this->getAttributeValue($queries, 'pdo');
         $pdo->exec("CREATE TABLE t1 (id INTEGER PRIMARY KEY, data VARCHAR(64));");

diff --git a/tests/modules/UniqueIntegrityCheck/UniqueIntegrityCheckTest.php b/tests/modules/UniqueIntegrityCheck/UniqueIntegrityCheckTest.php
@@ -48,8 +48,7 @@ public function tearDown()
 
     private function init($dbIndex)
     {
-        $dbals = iterator_to_array($this->moduleManager->getDatabaseModule()->getDBALs());
-        $dbal = $dbals[$dbIndex];
+        $dbal = $this->getDbal($this->moduleManager, $dbIndex);
         $queries = $this->getAttributeValue($dbal, 'queries');
         $pdo = $this->getAttributeValue($queries, 'pdo');
         $this->initDb($pdo);