From 069a655032770e2dc8049e0f3bc07996cef3e816 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 18 May 2017 23:29:20 +0200
Subject: [PATCH] Next wave: - imported (Base)ControllerResolver - imported
 ManageableApplication - created new namespaces - fixed namespaces, is
 application-specific
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/hub/class_ApplicationHelper.php            |  2 +-
 .../console/class_HubConsoleCommandResolver.php        |  6 ++++++
 .../command/html/class_HubHtmlCommandResolver.php      |  6 ++++++
 .../console/class_HubConsoleControllerResolver.php     | 10 +++++++++-
 .../html/class_HubHtmlControllerResolver.php           | 10 +++++++++-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 1ef110253..56c008135 100644
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -230,7 +230,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 
 		// Get a controller resolver
 		$resolverClass = sprintf(
-			'CoreFramework\Tests\Resolver\Controller\%s',
+			'Hub\Resolver\Controller\%s',
 			self::convertToClassName(sprintf(
 				'%s_%s_controller_resolver',
 				$this->getAppShortName(),
diff --git a/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php b/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
index 2343d40c4..5a4baacd4 100644
--- a/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
+++ b/application/hub/classes/resolver/command/console/class_HubConsoleCommandResolver.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\Command;
+
+// Import Framework stuff
+use CoreFramework\Manager\ManageableApplication;
+
 /**
  * A command resolver for local (non-hubbed) web commands
  *
diff --git a/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php b/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
index 95841f395..cb8f662a0 100644
--- a/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
+++ b/application/hub/classes/resolver/command/html/class_HubHtmlCommandResolver.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\Command;
+
+// Import Framework stuff
+use CoreFramework\Manager\ManageableApplication;
+
 /**
  * A command resolver for HTML commands
  *
diff --git a/application/hub/classes/resolver/controller/console/class_HubConsoleControllerResolver.php b/application/hub/classes/resolver/controller/console/class_HubConsoleControllerResolver.php
index 2a73ee255..3cb417f23 100644
--- a/application/hub/classes/resolver/controller/console/class_HubConsoleControllerResolver.php
+++ b/application/hub/classes/resolver/controller/console/class_HubConsoleControllerResolver.php
@@ -1,4 +1,12 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\Controller;
+
+// Import framework stuff
+use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Resolver\Controller\BaseControllerResolver;
+use CoreFramework\Resolver\Controller\ControllerResolver;
+
 /**
  * A resolver for resolving controllers locally
  *
@@ -52,7 +60,7 @@ class HubConsoleControllerResolver extends BaseControllerResolver implements Con
 		if (empty($controllerName)) {
 			// Then thrown an exception here
 			throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
+		} elseif ($resolverInstance->isControllerValid('Hub\Controller', $controllerName) === false)  {
 			// Invalid command found
 			throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
 		}
diff --git a/application/hub/classes/resolver/controller/html/class_HubHtmlControllerResolver.php b/application/hub/classes/resolver/controller/html/class_HubHtmlControllerResolver.php
index 1376a827e..cc54da23a 100644
--- a/application/hub/classes/resolver/controller/html/class_HubHtmlControllerResolver.php
+++ b/application/hub/classes/resolver/controller/html/class_HubHtmlControllerResolver.php
@@ -1,4 +1,12 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\Controller;
+
+// Import framework stuff
+use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Resolver\Controller\BaseControllerResolver;
+use CoreFramework\Resolver\Controller\ControllerResolver;
+
 /**
  * A resolver for resolving controllers locally
  *
@@ -52,7 +60,7 @@ class HubHtmlControllerResolver extends BaseControllerResolver implements Contro
 		if (empty($controllerName)) {
 			// Then thrown an exception here
 			throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
+		} elseif ($resolverInstance->isControllerValid('Hub\Controller', $controllerName) === false)  {
 			// Invalid command found
 			throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
 		}
-- 
2.39.5