From bbf8d1ba0d35bac874225f0f9ef2102b4dbb1c78 Mon Sep 17 00:00:00 2001 From: Roland Haeder <roland@mxchange.org> Date: Wed, 15 Feb 2017 22:11:15 +0100 Subject: [PATCH] Continued: - added more namespaces - added "import" of ClassLoader and ApplicationHelper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- application/tests/data.php | 1 + application/tests/loader.php | 3 +++ inc/main/classes/class_BaseFrameworkSystem.php | 1 + index.php | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/application/tests/data.php b/application/tests/data.php index 02757850..7d50b587 100644 --- 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 48f95ef8..089bb9f5 100644 --- 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 af15cba0..16dc8d89 100644 --- 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 34e000d4..9bd38f95 100644 --- 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(); -- 2.39.5