Debugging continued:

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 39be877dfe44369e0210269a3d8542b535be5102..7817f7aa6d5d748cacbe90b372ab6cbb077d215f 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -1,10 +1,14 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Loader\ClassLoader;
+
 /**
  * Loads more include files by using the generic class loader
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated
@@ -35,7 +39,7 @@ ClassLoader::getSelfInstance()->loadExtraConfigs();
 
 // Register auto-load function with the SPL
 // @TODO This makes the core depending on the SPL. But it should be installed anyway.
-spl_autoload_register('ClassLoader::autoLoad');
+spl_autoload_register('CoreFramework\Loader\ClassLoader::autoLoad');
 
 // Does the user has an application specified?
 // @TODO Find a nicer OOP-ed way for this
@@ -69,6 +73,3 @@ FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $applicati
 
 // Scan for all framework classes, exceptions and interfaces
 ClassLoader::scanFrameworkClasses();
-
-// [EOF]
-?>