#1251 Fix references to Modules class

OPUS4 · Oct 30, 2024 · d0f3556 · d0f3556
1 parent 22a7616
commit d0f3556
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 11 deletions.
diff --git a/library/Application/Translate.php b/library/Application/Translate.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\Config;
 use Opus\Common\LoggingTrait;
 use Opus\Translate\Dao;
@@ -116,7 +117,7 @@ public static function setInstance($instance)
     public function loadModules($reload = false)
     {
         if (! $this->loaded || $reload) {
-            $modules = Application_Modules::getInstance()->getModules();
+            $modules = Modules::getInstance()->getModules();
 
             foreach ($modules as $name => $module) {
                 $moduleDir = APPLICATION_PATH . '/modules/' . $name;

diff --git a/library/Application/Translate/TranslationManager.php b/library/Application/Translate/TranslationManager.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\Translate\TranslateException;
 use Opus\Common\Translate\UnknownTranslationKeyException;
 use Opus\Translate\Dao;
@@ -136,7 +137,7 @@ public function getModules()
             $allowedModules = $this->getAllowedModules();
 
             if ($allowedModules === null) {
-                $modulesManager = Application_Modules::getInstance();
+                $modulesManager = Modules::getInstance();
                 $allowedModules = array_keys($modulesManager->getModules());
             }
 
@@ -161,7 +162,7 @@ public function getAllowedModules()
             if (! empty($value)) {
                 $modules = array_map('trim', explode(',', $value));
 
-                $allModules = Application_Modules::getInstance()->getModules();
+                $allModules = Modules::getInstance()->getModules();
 
                 $allowedModules = [];
 

diff --git a/library/Application/Update/ImportCustomTranslations.php b/library/Application/Update/ImportCustomTranslations.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\Console\ConsoleColors;
 use Opus\Translate\Dao;
 
@@ -42,7 +43,7 @@ class Application_Update_ImportCustomTranslations extends Application_Update_Plu
      */
     public function run()
     {
-        $modules = array_keys(Application_Modules::getInstance()->getModules());
+        $modules = array_keys(Modules::getInstance()->getModules());
 
         $manager = new Application_Translate_TranslationManager();
         $manager->setFolderNames('language_custom');

diff --git a/modules/admin/controllers/AccessController.php b/modules/admin/controllers/AccessController.php
@@ -30,6 +30,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\UserRole;
 use Opus\Common\UserRoleInterface;
 
@@ -108,7 +109,7 @@ public function listmoduleAction()
         $this->view->roleName = $role->getName();
         $this->view->modules  = $roleModules;
 
-        $modules = array_keys(Application_Modules::getInstance()->getModules());
+        $modules = array_keys(Modules::getInstance()->getModules());
         unset($modules['default']);
 
         $this->view->allModules   = $modules;

diff --git a/modules/admin/controllers/AccountController.php b/modules/admin/controllers/AccountController.php
@@ -30,6 +30,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\Account;
 use Opus\Common\AccountInterface;
 use Opus\Common\UserRole;
@@ -110,7 +111,7 @@ public function showAction()
             $this->_helper->redirector('index');
         }
 
-        $modules = array_keys(Application_Modules::getInstance()->getModules());
+        $modules = array_keys(Modules::getInstance()->getModules());
         unset($modules['default']);
 
         $this->view->allModules = $modules;

diff --git a/modules/admin/controllers/ModuleController.php b/modules/admin/controllers/ModuleController.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
+
 /**
  * Controller for module management.
  */
@@ -41,7 +43,7 @@ class Admin_ModuleController extends Application_Controller_Action
      */
     public function indexAction()
     {
-        $modules = Application_Modules::getInstance()->getModules();
+        $modules = Modules::getInstance()->getModules();
 
         $this->view->modules = $modules;
 

diff --git a/tests/library/Application/Form/Element/TranslationModulesTest.php b/tests/library/Application/Form/Element/TranslationModulesTest.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
+
 class Application_Form_Element_TranslationModulesTest extends ControllerTestCase
 {
     /** @var string */
@@ -60,7 +62,7 @@ public function testInitAllModules()
 
         $options = $element->getMultiOptions();
 
-        $modules = array_keys(Application_Modules::getInstance()->getModules());
+        $modules = array_keys(Modules::getInstance()->getModules());
 
         $this->assertCount(count($modules) + 1, $options);
     }

diff --git a/tests/library/Application/ModulesTest.php b/tests/library/Application/ModulesTest.php
@@ -42,7 +42,7 @@ public function testGetInstance()
         $modules = Modules::getInstance();
 
         $this->assertNotNull($modules);
-        $this->assertInstanceOf('Application_Modules', $modules);
+        $this->assertInstanceOf(Modules::class, $modules);
 
         $this->assertSame($modules, Modules::getInstance());
     }

diff --git a/tests/library/Application/Translate/TranslationManagerTest.php b/tests/library/Application/Translate/TranslationManagerTest.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
 use Opus\Common\Translate\TranslateException;
 use Opus\Common\Translate\UnknownTranslationKeyException;
 use Opus\Translate\Dao;
@@ -760,7 +761,7 @@ public function testGetModulesNoRestrictions()
 
         $modules = $manager->getModules();
 
-        $modulesManager = Application_Modules::getInstance();
+        $modulesManager = Modules::getInstance();
 
         $this->assertEquals(array_keys($modulesManager->getModules()), $modules);
     }

diff --git a/tests/library/Application/View/Helper/AdminCssClassTest.php b/tests/library/Application/View/Helper/AdminCssClassTest.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Modules;
+
 class Application_View_Helper_AdminCssClassTest extends ControllerTestCase
 {
     /** @var string */
@@ -39,7 +41,7 @@ class Application_View_Helper_AdminCssClassTest extends ControllerTestCase
      */
     public function modulesProvider()
     {
-        $modules = Application_Modules::getInstance()->getModules();
+        $modules = Modules::getInstance()->getModules();
 
         $data = [];