X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fincludes.php;h=7817f7aa6d5d748cacbe90b372ab6cbb077d215f;hb=717829ec4b1f04e88e65838110d7cc8d9c4933c1;hp=0174a4ab86a022604aca2164f5a0d3870d596764;hpb=5dcdec05cf48f5f940dabab64e3a59e0570ebae3;p=core.git

diff --git a/inc/includes.php b/inc/includes.php
index 0174a4ab..7817f7aa 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -1,14 +1,18 @@
 <?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@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 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.ship-simu.org
+ * @link		http://www.shipsimu.org
  * @deprecated
- * @todo		We should minimize these includes
+ * @todo		Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,12 +31,15 @@
 // Include the class loader function
 require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
 
-// Shall we include additional configs where you can configure some things? Then
-// Load matching config
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */
 ClassLoader::getSelfInstance()->loadExtraConfigs();
 
-// Register hooks here
-require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
+// 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('CoreFramework\Loader\ClassLoader::autoLoad');
 
 // Does the user has an application specified?
 // @TODO Find a nicer OOP-ed way for this
@@ -64,5 +71,5 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 // Set the application name for later usage
 FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
 
-// [EOF]
-?>
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();