Merge pull request #38 from OXIDprojects/fix-adding-controllers

fix error message using console command fix:states fix #37
OXIDprojects · Dec 5, 2018 · eced874 · eced874
2 parents 38add1d + e0f9c97
commit eced874
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Core/ModuleStateFixer.php b/Core/ModuleStateFixer.php
@@ -272,7 +272,8 @@ private function restoreModuleInformation($module, $moduleId)
 
         if (version_compare($metaDataVersion, '2.0', '>=')) {
             try {
-                $this->setModuleControllers($module->getControllers(), $moduleId, $module);
+                $moduleControllers = $module->isActive() ? $module->getControllers() : [];
+                $this->setModuleControllers($moduleControllers, $moduleId, $module);
             } catch (ModuleValidationException $exception) {
                 print "[ERROR]: duplicate controllers:" . $exception->getMessage() ."\n";
             }
@@ -330,18 +331,20 @@ protected function setModuleControllers($moduleControllers, $moduleId, $module)
         $controllersForThatModuleInDb = $this->getModuleControllerEntries($moduleId);
 
         $duplicatedKeys = array_intersect_key($moduleControllers, $controllersForThatModuleInDb);
-        $diff = array_diff_assoc($moduleControllers,$duplicatedKeys);
+        $diff = array_diff_assoc($moduleControllers, $duplicatedKeys);
         if ($diff) {
             $this->output->writeLn("$moduleId fixing module controllers (in md):"  . var_export($moduleControllers, true));
             $this->output->writeLn("$moduleId fixing module controllers (in db):"  . var_export($controllersForThatModuleInDb, true));
 
             $this->deleteModuleControllers($moduleId);
             $this->resetModuleCache($module);
-            $this->validateModuleMetadataControllersOnActivation($moduleControllers);
+            if ($moduleControllers) {
+                $this->validateModuleMetadataControllersOnActivation($moduleControllers);
 
-            $classProviderStorage = $this->getClassProviderStorage();
+                $classProviderStorage = $this->getClassProviderStorage();
 
-            $classProviderStorage->add($moduleId, $moduleControllers);
+                $classProviderStorage->add($moduleId, $moduleControllers);
+            }
             $this->needCacheClear = true;
         }
 

diff --git a/metadata.php b/metadata.php
@@ -49,7 +49,7 @@
     Komplette &Uuml;bersicht: '.$sLinkAndText,
     ],
     'thumbnail'   => 'module_internals.png',
-    'version'     => '1.5.0',
+    'version'     => '1.5.1',
     'author'      => 'OXID Community',
     'url'         => 'https://github.com/OXIDprojects/oxid-module-internals',
     'email'       => '',