Continued:

- added "import" for ControllerResolver and BaseControllerResolver
- fixed namespace lookup

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

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 20cfaeafe778e5e611b9d389ddab35f80a116e89..c82b00d63e5c293995ce90881412b2977fefa2c8 100644 (file)
--- 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 f5ed6a9285eeae7959e2dc40530bdfccf960d951..3c9023f5085f1af88ffc76ca641abe5f740aba93 100644 (file)
--- 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 8f4f024825da0d0f06e20bb19824bf9f291c137c..fdcf6af03bcf740daeb17592b90818e4a45cda28 100644 (file)
--- 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 096a4b152b8c1dd29f79befa7186edc25b528970..500734ea844985683733638b2e03fc3dfde1a65c 100644 (file)
--- 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 0890dff5da22dac72df8f598af0e305bcb71c9fb..c48e2749b7e7e22258190396a8f7ff87b2372564 100644 (file)
--- 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 3863c0e907c927ff6c746ea6d89689951f82527a..1e4283a1a121f5b36d966ff3e3083aa36693dfc4 100644 (file)
--- 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 ece144058e6e1817111c90bbfa8f560e1422edae..7da3c36ff8156cc7a16009f86fb01915aacff022 100644 (file)
--- 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 a3c5307ac7e9e6138b558bcd17743ba64fbccbb2..ff8f5b612f61838fa6962b99f429d9f7944be7d2 100644 (file)
--- 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;
 
 /**