#1251 Change name Application_Configuration

OPUS4 · Oct 30, 2024 · db81d06 · db81d06
1 parent 92f66a8
commit db81d06
Show file tree

Hide file tree

Showing 48 changed files with 145 additions and 79 deletions.
diff --git a/library/Application/Bootstrap.php b/library/Application/Bootstrap.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\Log\LogService;
 use Opus\Common\Repository;
 use Opus\Db\DatabaseBootstrap;
@@ -274,7 +275,7 @@ protected function _initTranslation()
 
         Application_Translate::setInstance($translate);
 
-        $configHelper = new Application_Configuration();
+        $configHelper = new Configuration();
 
         $session = $this->getResource('Session');
 
@@ -379,7 +380,7 @@ protected function _initVersionInfo()
     {
         $this->bootstrap('View');
         $view = $this->getResource('View');
-        $view->headMeta()->appendName('Opus-Version', Application_Configuration::getOpusVersion());
+        $view->headMeta()->appendName('Opus-Version', Configuration::getOpusVersion());
     }
 
     /**

diff --git a/library/Application/Configuration/Workspace.php b/library/Application/Configuration/Workspace.php
@@ -29,20 +29,21 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\OpusException;
 
 /**
  * Checking of information about workspace.
  */
-class Application_Configuration_Workspace
+class Configuration_Workspace
 {
     /**
      * @return array
      * @throws OpusException
      */
     public function getFolders()
     {
-        $workspacePath = Application_Configuration::getInstance()->getWorkspacePath();
+        $workspacePath = Configuration::getInstance()->getWorkspacePath();
 
         $folders = [];
 

diff --git a/library/Application/Console/App.php b/library/Application/Console/App.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\Console\DefaultCommandProvider;
 use Opus\Job\TaskManager;
 use Opus\Pdf\Console\CoverGenerateCommand;
@@ -43,7 +44,7 @@ class Application_Console_App extends Application
 {
     public function __construct()
     {
-        parent::__construct('OPUS 4 Console Tool', Application_Configuration::getOpusVersion());
+        parent::__construct('OPUS 4 Console Tool', Configuration::getOpusVersion());
 
         $commandProvider = new DefaultCommandProvider();
         $commands        = $commandProvider->getCommands();

diff --git a/library/Application/Controller/Action/Helper/Abstract.php b/library/Application/Controller/Action/Helper/Abstract.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\LoggingTrait;
 
 /**
@@ -82,7 +83,7 @@ public function setView($view)
     public function getConfig()
     {
         if ($this->config === null) {
-            $this->config = Application_Configuration::getInstance()->getConfig();
+            $this->config = Configuration::getInstance()->getConfig();
         }
 
         return $this->config;

diff --git a/library/Application/Controller/ModuleAccess.php b/library/Application/Controller/ModuleAccess.php
@@ -30,6 +30,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\LoggingTrait;
 use Opus\Common\Security\Realm;
 
@@ -237,7 +238,7 @@ public function moduleAccessDeniedAction()
     public function getConfig()
     {
         if ($this->config === null) {
-            $this->config = Application_Configuration::getInstance()->getConfig();
+            $this->config = Configuration::getInstance()->getConfig();
         }
         return $this->config;
     }

diff --git a/library/Application/Form/Element/Translation.php b/library/Application/Form/Element/Translation.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\Translate\TranslateException;
 use Opus\Common\Translate\UnknownTranslationKeyException;
 
@@ -68,7 +69,7 @@ public function init()
 
     public function loadDefaultOptions()
     {
-        $languages = Application_Configuration::getInstance()->getSupportedLanguages();
+        $languages = Configuration::getInstance()->getSupportedLanguages();
 
         $options = [];
 

diff --git a/library/Application/Form/Validate/Filename.php b/library/Application/Form/Validate/Filename.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * Class Application_Form_Validate_uploadFilenameCheck validates the filename.
  *
@@ -137,7 +139,7 @@ public function setFilenameFormat($value)
      */
     public function validateFilenameFormat($value)
     {
-        $logger = Application_Configuration::getInstance()->getLogger();
+        $logger = Configuration::getInstance()->getLogger();
 
         if (@preg_match($value, null) === false) {
             $logger->warn('Your regular expression for your filename-validation is not valid.');

diff --git a/library/Application/Form/Validate/Identifier.php b/library/Application/Form/Validate/Identifier.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * Validator that delegates validation of identifiers depending on the type.
  *
@@ -73,7 +75,7 @@ public function isValid($value)
         $this->_setValue($value);
 
         $type   = strtolower($this->element->getValue());
-        $config = Application_Configuration::getInstance()->getConfig();
+        $config = Configuration::getInstance()->getConfig();
 
         if (isset($config->identifier->validation->$type->class)) {
             $validatorClass = $config->identifier->validation->$type->class;

diff --git a/library/Application/Search/FacetManager.php b/library/Application/Search/FacetManager.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * TODO allow adding search path for types
  */
@@ -101,7 +103,7 @@ public function getFacetConfig($name)
     public function getConfig()
     {
         if ($this->config === null) {
-            $this->config = Application_Configuration::getInstance()->getConfig();
+            $this->config = Configuration::getInstance()->getConfig();
         }
         return $this->config;
     }

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\Configuration;
 use Opus\Application\Modules;
 use Opus\Common\Config;
 use Opus\Common\LoggingTrait;
@@ -145,7 +146,7 @@ public function loadDatabase($reload = false)
             'reload'         => $reload,
         ]);
 
-        $locales = Application_Configuration::getInstance()->getSupportedLanguages();
+        $locales = Configuration::getInstance()->getSupportedLanguages();
 
         foreach ($locales as $locale) {
             $this->addTranslation([
@@ -269,7 +270,7 @@ public function getTranslations($key)
             return null;
         }
 
-        $languages = Application_Configuration::getInstance()->getSupportedLanguages();
+        $languages = Configuration::getInstance()->getSupportedLanguages();
 
         $translations = [];
 

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\Configuration;
 use Opus\Application\Modules;
 use Opus\Common\Translate\TranslateException;
 use Opus\Common\Translate\UnknownTranslationKeyException;
@@ -296,7 +297,7 @@ protected function sortLanguages($translations)
     protected function getLanguageOrderRef()
     {
         if ($this->languageOrderRef === null) {
-            $this->languageOrderRef = array_flip(Application_Configuration::getInstance()->getSupportedLanguages());
+            $this->languageOrderRef = array_flip(Configuration::getInstance()->getSupportedLanguages());
         }
 
         return $this->languageOrderRef;

diff --git a/library/Application/Update/AddImportToWorkspace.php b/library/Application/Update/AddImportToWorkspace.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\Console\ConsoleColors;
 
 /**
@@ -40,7 +41,7 @@ public function run()
     {
         $this->log('Checking import folder in workspace');
 
-        $workspacePath = Application_Configuration::getInstance()->getWorkspacePath();
+        $workspacePath = Configuration::getInstance()->getWorkspacePath();
 
         $importPath = rtrim($workspacePath, '/') . '/import';
 

diff --git a/library/Application/Update/ConvertCollectionRoleTranslations.php b/library/Application/Update/ConvertCollectionRoleTranslations.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\CollectionRole;
 use Opus\Common\Console\ConsoleColors;
 use Opus\Common\Translate\UnknownTranslationKeyException;
@@ -62,7 +63,7 @@ public function run()
                 $this->log($colors->red("Collection role (id = $roleId) name is invalid (\"$name\")"));
 
                 // create translation values using invalid collection role name
-                $supportedLanguages = Application_Configuration::getInstance()->getSupportedLanguages();
+                $supportedLanguages = Configuration::getInstance()->getSupportedLanguages();
                 $translations       = [];
                 foreach ($supportedLanguages as $lang) {
                     $translations[$lang] = $name;

diff --git a/library/Application/Util/WorkspaceCache.php b/library/Application/Util/WorkspaceCache.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * TODO maybe merge with a Workspace or Mainenance or "whatever" class
  */
@@ -39,7 +41,7 @@ class Application_Util_WorkspaceCache
      */
     public function clearTranslations()
     {
-        $files = new DirectoryIterator(Application_Configuration::getInstance()->getWorkspacePath() . '/cache');
+        $files = new DirectoryIterator(Configuration::getInstance()->getWorkspacePath() . '/cache');
 
         foreach ($files as $file) {
             $basename = $file->getBasename();

diff --git a/library/Application/View/Helper/Abstract.php b/library/Application/View/Helper/Abstract.php
@@ -29,6 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
 use Opus\Common\LoggingTrait;
 
 /**
@@ -45,6 +46,6 @@ class Application_View_Helper_Abstract extends Zend_View_Helper_Abstract
      */
     public function getConfig()
     {
-        return Application_Configuration::getInstance()->getConfig();
+        return Configuration::getInstance()->getConfig();
     }
 }
diff --git a/library/Application/View/Helper/IsDisplayField.php b/library/Application/View/Helper/IsDisplayField.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 class Application_View_Helper_IsDisplayField extends Zend_View_Helper_Abstract
 {
     /**
@@ -39,7 +41,7 @@ class Application_View_Helper_IsDisplayField extends Zend_View_Helper_Abstract
      */
     public function isDisplayField($name)
     {
-        $config = Application_Configuration::getInstance()->getConfig();
+        $config = Configuration::getInstance()->getConfig();
 
         if ($config === null) {
             return false;

diff --git a/library/Application/View/Helper/LanguageSelector.php b/library/Application/View/Helper/LanguageSelector.php
@@ -30,6 +30,8 @@
  * @license    http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * Builds the language selection form.
  */
@@ -49,7 +51,7 @@ public function languageSelector()
 
         $currentLocale = new Zend_Locale(Application_Translate::getInstance()->getLocale());
 
-        $configHelper = new Application_Configuration();
+        $configHelper = new Configuration();
 
         // only show languages that are present in resources and activated in configuration
         $translations  = Application_Translate::getInstance()->getList();

diff --git a/library/Application/View/Helper/OptionEnabled.php b/library/Application/View/Helper/OptionEnabled.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * Checks if a configuration option is activated,
  */
@@ -49,7 +51,7 @@ public function optionEnabled($optionKey, $context = null)
             $key = "$context.$key";
         }
 
-        $value = Application_Configuration::getInstance()->getValue($key);
+        $value = Configuration::getInstance()->getValue($key);
 
         return filter_var($value, FILTER_VALIDATE_BOOLEAN);
     }

diff --git a/library/Application/View/Helper/OptionUrl.php b/library/Application/View/Helper/OptionUrl.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * Gets a URL from a configuration option and renders it properly.
  *
@@ -53,7 +55,7 @@ public function optionUrl($optionKey, $context = null)
             $key = "$context.$key";
         }
 
-        $value = Application_Configuration::getInstance()->getValue($key);
+        $value = Configuration::getInstance()->getValue($key);
 
         $urlParts = parse_url($value);
 

diff --git a/library/Application/View/Helper/OptionValue.php b/library/Application/View/Helper/OptionValue.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 /**
  * View helper for returning value of configuration option.
  *
@@ -57,7 +59,7 @@ public function optionValue($optionKey, $context = null, $escape = false)
             $key = "$context.$key";
         }
 
-        $value = Application_Configuration::getInstance()->getValue($key);
+        $value = Configuration::getInstance()->getValue($key);
 
         if ($escape) {
             return htmlspecialchars($value);

diff --git a/modules/admin/controllers/ConfigController.php b/modules/admin/controllers/ConfigController.php
@@ -29,6 +29,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Application\Configuration;
+
 class Admin_ConfigController extends Application_Controller_Action
 {
     public function indexAction()
@@ -47,7 +49,7 @@ public function indexAction()
                     if ($form->isValid($data)) {
                         $config = new Zend_Config([], true);
                         $form->updateModel($config);
-                        Application_Configuration::save($config);
+                        Configuration::save($config);
                     } else {
                         break;
                     }