Same again:

- no "deeper-namespacing"
- need to provide namespace

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

diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
index 6e60875338961e891d8069f9704e12240cf3986a..a63caf6a6b34a46a662104e898e78ce2154b49ac 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\AptProxy;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
index 5e8a95dc7886902ba671528ffbe141f91b7856e7..844e36f82eee8c45cde77347cbe7a3e386f8fa79 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Chat;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
index da340c6a33742974ad308489d42d80ed662cc311..9b22759dd7be7fde2b66b49167ff527065c1164d 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Crawler;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
index 07f4637489fecc78956cb065139b3655b8a7898e..94db0cac411cbbb0632beb89506e60f65277985c 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Cruncher;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
index 40988d0f5f852a7060619f396b7505f590d467e7..3c20b5fd9e19374b7a098065d89bebc1be6cb25e 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Node;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
index 003ed06b9b4b006c8d325342fa5f221c458c4051..e02fd9947e6faa4f03871a82f88d40cdff7d4891 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Miner;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php b/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
index 3db95ea055345b7e1723c695e12e49b4a55601c1..c58fe04d58bae7c1535df42bba9e2c1547579d4e 100644 (file)
--- a/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
+++ b/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Command\Index;
+namespace Hub\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;

diff --git a/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php b/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
index 5a4baacd4312b441850fd53f936af97d480c6427..ed41bdd2150a103637cc108b89ebced50519b68f 100644 (file)
--- a/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
+++ b/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
@@ -4,6 +4,8 @@ namespace Hub\Resolver\Command;
 
 // Import Framework stuff
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Resolver\Command\BaseCommandResolver;
+use CoreFramework\Resolver\Command\CommandResolver;
 
 /**
  * A command resolver for local (non-hubbed) web commands
@@ -58,7 +60,7 @@ class HubConsoleCommandResolver extends BaseCommandResolver implements CommandRe
                if (empty($commandName)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->isCommandValid($commandName) === FALSE) {
+               } elseif ($resolverInstance->isCommandValid('Hub\Command', $commandName) === FALSE) {
                        // Invalid command found
                        throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);
                }

diff --git a/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php b/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
index cb8f662a00a3a75bbddfd5d1a5ea3cc39920c6cd..cc88190099b8ace8597883865bf2c76d47d0c01d 100644 (file)
--- a/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
+++ b/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
@@ -4,6 +4,8 @@ namespace Hub\Resolver\Command;
 
 // Import Framework stuff
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Resolver\Command\BaseCommandResolver;
+use CoreFramework\Resolver\Command\CommandResolver;
 
 /**
  * A command resolver for HTML commands
@@ -58,7 +60,7 @@ class HubHtmlCommandResolver extends BaseCommandResolver implements CommandResol
                if (empty($commandName)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->isCommandValid($commandName) === FALSE) {
+               } elseif ($resolverInstance->isCommandValid('Hub\Command', $commandName) === FALSE) {
                        // Invalid command found
                        throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND);
                }