From 96adea083b5b6c86fbcb349c825c2aeaf76380f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 19 May 2017 01:28:57 +0200
Subject: [PATCH] Same again: - no "deeper-namespacing" - need to provide
 namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../commands/console/class_HubConsoleAptProxyCommand.php      | 2 +-
 .../classes/commands/console/class_HubConsoleChatCommand.php  | 2 +-
 .../commands/console/class_HubConsoleCrawlerCommand.php       | 2 +-
 .../commands/console/class_HubConsoleCruncherCommand.php      | 2 +-
 .../classes/commands/console/class_HubConsoleMainCommand.php  | 2 +-
 .../classes/commands/console/class_HubConsoleMinerCommand.php | 2 +-
 .../hub/classes/commands/html/class_HubHtmlIndexCommand.php   | 2 +-
 .../command/console/class_HubConsoleCommandResolver.php       | 4 +++-
 .../resolver/command/html/class_HubHtmlCommandResolver.php    | 4 +++-
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
index 6e6087533..a63caf6a6 100644
--- 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 5e8a95dc7..844e36f82 100644
--- 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 da340c6a3..9b22759dd 100644
--- 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 07f463748..94db0cac4 100644
--- 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 40988d0f5..3c20b5fd9 100644
--- 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 003ed06b9..e02fd9947 100644
--- 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 3db95ea05..c58fe04d5 100644
--- 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 5a4baacd4..ed41bdd21 100644
--- 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 cb8f662a0..cc8819009 100644
--- 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);
 		}
-- 
2.39.5