From 463e9e846f7331972e6aeb7209895d799bef800a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 14 May 2014 21:38:59 +0200
Subject: [PATCH] Introduced scanFrameworkClasses().
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 inc/classes.php                  | 22 ++--------------------
 inc/loader/class_ClassLoader.php | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/inc/classes.php b/inc/classes.php
index b1455d1b..b80779e4 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -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 //////
 
diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 8b48d60a..dce3df9c 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -157,6 +157,30 @@ class ClassLoader {
 		return $loaderInstance;
 	}
 
+	/**
+	 * Scans for all framework classes, exceptions and interfaces.
+	 *
+	 * @return	void
+	 */
+	public static function scanFrameworkClasses () {
+		// Lower framework classes
+		$lowerClasses = array(
+			'exceptions', // Exceptions
+			'interfaces', // Interfaces
+			'main',       // General main classes
+			'middleware'  // The middleware
+		);
+
+		// Cache loader instance
+		$loaderInstance = self::getSelfInstance();
+
+		// Load all classes
+		foreach ($lowerClasses as $className) {
+			// Try to load the framework classes
+			$loaderInstance->scanClassPath('inc/classes/' . $className . '/');
+		} // END - foreach
+	}
+
 	/**
 	 * Initializes our loader class
 	 *
-- 
2.39.5