Continued:

- added missing $namespace parameter
- added missing imports of exception classes

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index efc4ba35eda18d4255eeb640f829461bc637256d..81cb73a41b644d835e313cb3ae75692f9db52ac9 100644 (file)
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -110,7 +110,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl
                $formAction = $requestInstance->getRequestElement('form');
 
                // Get command instance from resolver
-               $commandInstance = $this->getResolverInstance()->resolveCommand($formAction);
+               $commandInstance = $this->getResolverInstance()->resolveCommand('Org\Mxchange\CoreFramework\Command\Failed', $formAction);
 
                // Add more filters by the command
                $commandInstance->addExtraFilters($this, $requestInstance);

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 66c8ffc3ae159bc268c3c0d1f9f5160b6aba726e..d88eb3998a84b91392a4db6e693f2eaa05a6451e 100644 (file)
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
 /**
  * A concrete filter for validating the username. This filter may intercept the

diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index 0dc829bb9df4da7ac128f806a7319aa81e28b981..ebe51a65a771a31f9d43917037ea60fb64c63b1e 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
 /**
  * A concrete filter for verfying the username. This filter may intercept the

diff --git a/framework/main/classes/resolver/action/class_BaseActionResolver.php b/framework/main/classes/resolver/action/class_BaseActionResolver.php
index 30c2b4bcd875c618886ccdf759e60740d005e93e..fa1009067d6c8fbe7a6bdae1a7f60a0127837006 100644 (file)
--- a/framework/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/framework/main/classes/resolver/action/class_BaseActionResolver.php
@@ -76,9 +76,6 @@ abstract class BaseActionResolver extends BaseResolver {
         * @throws      InvalidArgumentException        Thrown if given action is not set
         */
        public function isActionValid ($namespace, $actionName) {
-               // By default nothing shall be valid
-               $isValid = false;
-
                // Is a action set?
                if (empty($namespace)) {
                        // Then thrown an exception here
@@ -100,13 +97,13 @@ abstract class BaseActionResolver extends BaseResolver {
                $this->setClassName($className);
 
                // Is this class already loaded?
-               if (class_exists($this->getClassName())) {
-                       // This class does exist. :-)
-                       $isValid = true;
-               } // END - if
+               $isValid = class_exists($this->getClassName());
 
-               // Set action name
-               $this->setActionName($actionName);
+               // Is it valid?
+               if ($isValid) {
+                       // Set action name
+                       $this->setActionName($actionName);
+               }
 
                // Return the result
                return $isValid;

diff --git a/framework/main/classes/resolver/command/class_BaseCommandResolver.php b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
index 4d0daeee460e37e317e9314e3114086d77629f56..a7f0e916db16a27b780997c74cf4927b03d481bd 100644 (file)
--- a/framework/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -131,21 +131,32 @@ abstract class BaseCommandResolver extends BaseResolver {
        /**
         * Resolves the command by its direct name and returns an instance of its class
         *
+        * @param       $namespace                      Namespace to look in
         * @param       $commandName            The direct command name we shall resolve
         * @return      $commandInstance        An instance of the command class
         * @throws      InvalidCommandException         Thrown if $commandName is invalid
         */
-       public function resolveCommand ($commandName) {
+       public function resolveCommand ($namespace, $commandName) {
+               // Is a action set?
+               if (empty($namespace)) {
+                       // Then thrown an exception here
+                       throw new InvalidArgumentException('Parameter "namespace" is empty');
+               } elseif (empty($actionName)) {
+                       // Then thrown an exception here
+                       throw new InvalidArgumentException('Parameter "actionName" is empty');
+               }
+
                // Initiate the instance variable
                $commandInstance = NULL;
 
                // Is the command empty? Then fall back to default command
                if (empty($commandName)) {
+                       // Init default command
                        $commandName = $this->getConfigInstance()->getConfigEntry('default_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_command');
                } // END - if
 
                // Check if command is valid
-               if ($this->isCommandValid($commandName) === false) {
+               if ($this->isCommandValid($namespace, $commandName) === false) {
                        // This command is invalid!
                        throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if

diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index 2c57676a5921eab266086a7b5654e13cae55b309..216aa11f89cbc587e13f5b078e1ad83eb6133979 100644 (file)
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -136,10 +136,7 @@ abstract class BaseControllerResolver extends BaseResolver {
         * @throws      DefaultControllerException      Thrown if default controller was not found
         */
        protected function isControllerValid ($namespace, $controllerName) {
-               // By default nothing shall be valid
-               $isValid = false;
-
-               // Is namespace and controller name set?
+               // Is a action set?
                if (empty($namespace)) {
                        // Then thrown an exception here
                        throw new InvalidArgumentException('Parameter "namespace" is empty');
@@ -148,6 +145,9 @@ abstract class BaseControllerResolver extends BaseResolver {
                        throw new InvalidArgumentException('Parameter "controllerName" is empty');
                }
 
+               // By default nothing shall be valid
+               $isValid = false;
+
                // Create class name
                $className = sprintf(
                        '%s\%sController',

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index d0380778c9f8f19bf49ff61b6ebf7fbea1164b7c..c7fb4b22b50ea879a3d2fda88fc574839daf0c85 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Manager\Guest\ManageableGuest;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
+use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
 /**
  * A generic class for handling guests

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index 4979bdb41c96fabe5f486fdac6c6d5b7555d9e56..a187f948975866dd52407a86aa392de3dcee94ca 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
+use Org\Mxchange\CoreFramework\User\UsernameMissingException;
 
 /**
  * A generic class for handling users