From cabd0c2cdd08b8eaf49197ea3fb370f60af53dc4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 24 Feb 2017 21:51:47 +0100 Subject: [PATCH] Continued: - added "import" for ControllerResolver and BaseControllerResolver - fixed namespace lookup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/tests/class_ApplicationHelper.php | 2 +- .../controller/class_TestsConsoleControllerResolver.php | 2 ++ .../resolver/controller/class_BaseControllerResolver.php | 1 + .../controller/console/class_ConsoleControllerResolver.php | 2 ++ .../resolver/controller/html/class_HtmlControllerResolver.php | 2 ++ .../resolver/controller/image/class_ImageControllerResolver.php | 2 ++ .../exceptions/controller/class_DefaultControllerException.php | 1 + .../interfaces/resolver/controller/class_ControllerResolver.php | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index 20cfaeaf..c82b00d6 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -201,7 +201,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Get a controller resolver $resolverClass = sprintf( - 'CoreFramework\Resolver\Controller\%s', + 'CoreFramework\Tests\Resolver\Controller\%s', self::convertToClassName(sprintf( '%s_%s_controller_resolver', $this->getAppShortName(), diff --git a/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php b/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php index f5ed6a92..3c9023f5 100644 --- a/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php +++ b/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php @@ -5,6 +5,8 @@ namespace CoreFramework\Tests\Resolver\Controller; // Import framework stuff use CoreFramework\Controller\BaseController; use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Resolver\Controller\BaseControllerResolver; +use CoreFramework\Resolver\Controller\ControllerResolver; /** * A resolver for resolving controllers locally diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php index 8f4f0248..fdcf6af0 100644 --- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php +++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php @@ -5,6 +5,7 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Resolver\BaseResolver; +use CoreFramework\Resolver\Controller\ControllerResolver; /** * A generic controller resolver class diff --git a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php index 096a4b15..500734ea 100644 --- a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php +++ b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php @@ -5,6 +5,8 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff use CoreFramework\Controller\BaseController; use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Resolver\Controller\ControllerResolver; +use CoreFramework\Resolver\Controller\BaseControllerResolver; /** * A resolver for resolving controllers locally diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php index 0890dff5..c48e2749 100644 --- a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php +++ b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php @@ -5,6 +5,8 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff use CoreFramework\Controller\BaseController; use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Resolver\Controller\ControllerResolver; +use CoreFramework\Resolver\Controller\BaseControllerResolver; /** * A resolver for resolving controllers locally diff --git a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php index 3863c0e9..1e4283a1 100644 --- a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php +++ b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php @@ -5,6 +5,8 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff use CoreFramework\Controller\BaseController; use CoreFramework\Manager\ManageableApplication; +use CoreFramework\Resolver\Controller\ControllerResolver; +use CoreFramework\Resolver\Controller\BaseControllerResolver; /** * A resolver for resolving controllers locally diff --git a/inc/main/exceptions/controller/class_DefaultControllerException.php b/inc/main/exceptions/controller/class_DefaultControllerException.php index ece14405..7da3c36f 100644 --- a/inc/main/exceptions/controller/class_DefaultControllerException.php +++ b/inc/main/exceptions/controller/class_DefaultControllerException.php @@ -4,6 +4,7 @@ namespace CoreFramework\Controller; // Import framework stuff use CoreFramework\Generic\FrameworkException; +use CoreFramework\Resolver\Controller\ControllerResolver; /** * This exception is thrown when the default controller is missing diff --git a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php index a3c5307a..ff8f5b61 100644 --- a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php +++ b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php @@ -3,6 +3,7 @@ namespace CoreFramework\Resolver\Controller; // Import framework stuff +use CoreFramework\Resolver\Controller\ControllerResolver; use CoreFramework\Resolver\Generic\Resolver; /** -- 2.39.5