Continued:

- added more namespaces
- added "import" of ClassLoader and ApplicationHelper

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

diff --git a/application/tests/data.php b/application/tests/data.php
index 02757850b2289d9c40ee3b29eacbe65b8f68ba53..7d50b5871eff2b76fbb486839c2d400ef1143610 100644 (file)
--- a/application/tests/data.php
+++ b/application/tests/data.php
@@ -1,6 +1,7 @@
 <?php
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Helper\Application\ApplicationHelper;
 
 /**
  * Application data

diff --git a/application/tests/loader.php b/application/tests/loader.php
index 48f95ef8030d65d556ca263fc7753d306a7ec5db..089bb9f5931dcf75888d700d9dbba287dde42f09 100644 (file)
--- a/application/tests/loader.php
+++ b/application/tests/loader.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Loader\ClassLoader;
+
 /**
  * The application's class loader
  *

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index af15cba0a92ea1e9c2e1c869909abb3ce0cacbf9..16dc8d890ea3016dc74bd2a9610129ed31905c6b 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Object;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Template\CompileableTemplate;
 

diff --git a/index.php b/index.php
index 34e000d470d68b73258a697639e3545fb9deb7c3..9bd38f95bc50b3a8350e8d8d1f7dc0a4e44bfdef 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,6 +4,8 @@ namespace CoreFramework\EntryPoint;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Helper\Application\ApplicationHelper;
+use CoreFramework\Loader\ClassLoader;
 
 /**
  * The main class with the entry point to the whole application. This class
@@ -123,7 +125,7 @@ final class ApplicationEntryPoint {
                        $applicationInstance = NULL;
 
                        // Is the class there?
-                       if (class_exists('ApplicationHelper')) {
+                       if (class_exists('CoreFramework\Helper\Application\ApplicationHelper')) {
                                // Get application instance
                                $applicationInstance = ApplicationHelper::getSelfInstance();