X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses.php;h=9debeb10c10ae61afb8a0041d3c1c6c3b38dd05d;hp=74227ad546990759bd141a827177e84d19f1b24e;hb=88deca9fb4d77cdc34fb762070cad57da8cdd5be;hpb=5dcdec05cf48f5f940dabab64e3a59e0570ebae3

diff --git a/inc/classes.php b/inc/classes.php
index 74227ad5..9debeb10 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -2,12 +2,12 @@
 /**
  * Load required framework classes first
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @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
@@ -23,26 +23,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Lower framework classes
-$lowerClasses = array(
-	'exceptions', // Exceptions
-	'interfaces', // Interfaces
-	'main',       // General main classes
-	'middleware'  // The middleware
-);
-
-// Cache loader instance
-$loaderInstance = ClassLoader::getSelfInstance();
-
-// Load all classes
-foreach ($lowerClasses as $className) {
-	// Try to load the framework classes
-	$loaderInstance->scanClassPath('inc/classes/' . $className . '/');
-} // END - foreach
-
-// Clean up the global namespace
-unset($lowerClasses[3]); // Applications shall not have any middleware
-unset($className);
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
 
 ////// Until here the framework classes are loaded //////