Continued:

[core.git] / framework / main / classes / resolver / action / html / class_HtmlActionResolver.php

diff --git a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
index 05b498df5c4efdba11eaabc74a5b5283dbde6cd0..ad70b5b69080ccd9176a6963bfdf68d23ecea31e 100644 (file)
--- a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -3,6 +3,8 @@
 namespace Org\Mxchange\CoreFramework\Resolver\Action;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 // Import SPL stuff
@@ -13,7 +15,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.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 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -41,7 +43,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
@@ -64,7 +66,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
                // Is the variable $actionName set and the action is valid?
                if (empty($actionName)) {
                        // Then thrown an exception here
-                       throw new InvalidArgumentException('Parameter "actionName" is empty');
+                       throw new InvalidArgumentException('Parameter "actionName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
                } elseif ($resolverInstance->isActionValid($actionName) === false) {
                        // Invalid action found
                        throw new InvalidActionException(array($resolverInstance, $actionName), self::EXCEPTION_INVALID_ACTION);
@@ -95,14 +97,14 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 
                // Is the action empty? Then fall back to default action
                if (empty($actionName)) {
-                       $actionName = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
+                       $actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
+               }
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {
                        // This action is invalid!
                        throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $actionInstance = $this->loadAction();
@@ -111,7 +113,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
                if ((!is_object($actionInstance)) || (!$actionInstance instanceof Actionable)) {
                        // This action has an invalid instance!
                        throw new InvalidActionInstanceException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Set last action
                $this->setResolvedInstance($actionInstance);
@@ -135,14 +137,14 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 
                // Is the action empty? Then fall back to default action
                if (empty($actionName)) {
-                       $actionName = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
+                       $actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
+               }
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {
                        // This action is invalid!
                        throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $actionInstance = $this->loadAction();