X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Floader%2Fclass_ClassLoader.php;h=601b06d95d539b8bb650f917d318657dc593ff05;hp=97a477e53abd917e4407e9f0b49a51f292f70da6;hb=e51607c0f33062258ba0a07b79b8e1f34fd6b832;hpb=b9c18d6c24e3be4393bf41005aa4e428a0ea3218

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 97a477e5..601b06d9 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -53,12 +53,12 @@ class ClassLoader {
 	/**
 	 * Suffix with extension for all class files
 	 */
-	private $prefix = "class_";
+	private $prefix = 'class_';
 
 	/**
 	 * Suffix with extension for all class files
 	 */
-	private $suffix = ".php";
+	private $suffix = '.php';
 
 	/**
 	 * A list for directory names (no leading/trailing slashes!) which not be scanned by the path scanner
@@ -112,7 +112,7 @@ class ClassLoader {
 	 * @param	$configInstance	Configuration class instance
 	 * @return	void
 	 */
-	public final static function createClassLoader (FrameworkConfiguration $configInstance) {
+	public static final function createClassLoader (FrameworkConfiguration $configInstance) {
 		// Get a new instance
 		$loaderInstance = new ClassLoader();
 
@@ -135,8 +135,8 @@ class ClassLoader {
 
 		// Construct the FQFN for the cache
 		if (!defined('DEVELOPER')) {
-			$this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . "list-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
-			$this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . "class-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
+			$this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . 'list-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
+			$this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . 'class-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
 		} // END - if
 
 		// Set suffix and prefix from configuration
@@ -187,7 +187,7 @@ class ClassLoader {
 	 *
 	 * @return	$selfInstance		An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		// Is the instance there?
 		if (is_null(self::$selfInstance)) {
 			// Get a new one
@@ -205,7 +205,9 @@ class ClassLoader {
 	 */
 	public function __destruct () {
 		// Skip here if dev-mode
-		if (defined('DEVELOPER')) return;
+		if (defined('DEVELOPER')) {
+			return;
+		} // END - if
 
 		// Skip here if already cached
 		if ($this->listCached === false) {
@@ -228,23 +230,6 @@ class ClassLoader {
 		} // END - if
 	}
 
-	/**
-	 * Fall-back method. Please replace loadClasses() with scanClassPath() !
-	 *
-	 * @param	$basePath		The relative base path to 'base_path' constant for all classes
-	 * @param	$ignoreList		An optional list (array forced) of directory and file names which shall be ignored
-	 * @return	void
-	 * @deprecated
-	 * @todo	Rewrite your apps to scanClassPath()
-	 */
-	public function loadClasses ($basePath, array $ignoreList = array() ) {
-		// This outputs an ugly message because you need to change to scanClassPath
-		print __METHOD__." is deprecated. Use scanClassPath() to make this warning go away.<br />\n";
-
-		// Call our new method
-		$this->scanClassPath($basePath, $ignoreList);
-	}
-
 	/**
 	 * Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
 	 *
@@ -257,7 +242,7 @@ class ClassLoader {
 		if ($this->listCached === true) {
 			// Abort here
 			return;
-		}
+		} // END - if
 
 		// Directories which our class loader ignores by default while
 		// deep-scanning the directory structure.
@@ -277,7 +262,7 @@ class ClassLoader {
 		// If the basePath is false it is invalid
 		if ($basePath2 === false) {
 			/* @todo: Do not die here. */
-			die("Cannot read {$basePath} !");
+			die('Cannot read ' . $basePath . ' !');
 		} else {
 			// Set base path
 			$basePath = $basePath2;