Continued:

[core.git] / framework / main / classes / resolver / class_

diff --git a/framework/main/classes/resolver/class_ b/framework/main/classes/resolver/class_
index 317825e6704036bad88ef38b4d2b61d116b4260b..d9fcab2a42f2e067a6b06cafb1d090680fbce1ff 100644 (file)
--- a/framework/main/classes/resolver/class_
+++ b/framework/main/classes/resolver/class_
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -27,7 +27,7 @@ class ???Resolver extends BaseResolver implements Resolver {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
@@ -52,7 +52,7 @@ class ???Resolver extends BaseResolver implements Resolver {
                if (empty($!!!Name)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
+               } elseif ($resolverInstance->is|||Valid($!!!Name) === false) {
                        // Invalid action found
                        throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
                }
@@ -84,13 +84,13 @@ class ???Resolver extends BaseResolver implements Resolver {
                $!!!Name = $requestInstance->getRequestElement('action');
 
                // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+               if (empty($!!!Name)) $!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
 
                // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
+               if ($this->is|||Valid($!!!Name) === false) {
                        // This action is invalid!
                        throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $!!!Instance = $this->load|||();
@@ -99,7 +99,7 @@ class ???Resolver extends BaseResolver implements Resolver {
                if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
                        // This action has an invalid instance!
                        throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Set last action
                $this->setResolvedInstance($!!!Instance);
@@ -123,14 +123,14 @@ class ???Resolver extends BaseResolver implements Resolver {
 
                // Is the action empty? Then fall back to default action
                if (empty($!!!Name)) {
-                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
+                       $!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
+               }
 
                // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
+               if ($this->is|||Valid($!!!Name) === false) {
                        // This action is invalid!
                        throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $!!!Instance = $this->load|||();