From: Roland Häder <roland@mxchange.org>
Date: Thu, 29 Oct 2020 22:42:53 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=59b2c91c330849915cb257ed7137ea9e5ce1a5b8;p=core.git
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 efc4ba35..81cb73a4 100644
--- 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 66c8ffc3..d88eb399 100644
--- 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 0dc829bb..ebe51a65 100644
--- 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 30c2b4bc..fa100906 100644
--- 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 4d0daeee..a7f0e916 100644
--- 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 2c57676a..216aa11f 100644
--- 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 d0380778..c7fb4b22 100644
--- 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 4979bdb4..a187f948 100644
--- 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