X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Floader%2Fclass_ClassLoader.php;h=601b06d95d539b8bb650f917d318657dc593ff05;hp=775abf6b947e81693c57af3a872c648185480c8c;hb=e51607c0f33062258ba0a07b79b8e1f34fd6b832;hpb=2d739818a3217d1e685b2464a7faf08659b0c86f diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index 775abf6b..601b06d9 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007 - 2009 Roland Haeder, this is free software + * @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 * @@ -25,7 +25,7 @@ * 1.3 * - Constructor is now empty and factory method 'createClassLoader' is created * - renamed loadClasses to scanClassPath - * - Added initLoader(), $cfgInstance renamed to $configInstance + * - Added initLoader(), $configInstance renamed to $configInstance * 1.2 * - ClassLoader rewritten to PHP SPL's own RecursiveIteratorIterator class * 1.1 @@ -40,11 +40,6 @@ class ClassLoader { */ private static $selfInstance = null; - /** - * Configuration array - */ - private $cfg = array(); - /** * Array with all classes */ @@ -58,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 @@ -89,12 +84,12 @@ class ClassLoader { /** * Filename for the list cache */ - private $listCacheFQFN = ""; + private $listCacheFQFN = ''; /** * Cache for class content */ - private $classCacheFQFN = ""; + private $classCacheFQFN = ''; /** * Counter for loaded include files @@ -117,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(); @@ -136,17 +131,17 @@ class ClassLoader { */ protected function initLoader (FrameworkConfiguration $configInstance) { // Set configuration instance - $this->cfgInstance = $configInstance; + $this->configInstance = $configInstance; // Construct the FQFN for the cache if (!defined('DEVELOPER')) { - $this->listCacheFQFN = $this->cfgInstance->readConfig('local_db_path') . "list-" . $this->cfgInstance->readConfig('app_name') . ".cache"; - $this->classCacheFQFN = $this->cfgInstance->readConfig('local_db_path') . "class-" . $this->cfgInstance->readConfig('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 - $this->suffix = $configInstance->readConfig('class_suffix'); - $this->prefix = $configInstance->readConfig('class_prefix'); + $this->suffix = $configInstance->getConfigEntry('class_suffix'); + $this->prefix = $configInstance->getConfigEntry('class_prefix'); // Set own instance self::$selfInstance = $this; @@ -192,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 @@ -210,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) { @@ -222,7 +219,7 @@ class ClassLoader { // Skip here if already cached if ($this->classesCached === false) { // Generate a full-cache of all classes - $cacheContent = ""; + $cacheContent = ''; foreach ($this->loadedClasses as $fqfn) { // Load the file $cacheContent .= file_get_contents($fqfn); @@ -233,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.
\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 * @@ -262,14 +242,14 @@ 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. - $ignoreList[] = "."; - $ignoreList[] = ".."; - $ignoreList[] = ".htaccess"; - $ignoreList[] = ".svn"; + $ignoreList[] = '.'; + $ignoreList[] = '..'; + $ignoreList[] = '.htaccess'; + $ignoreList[] = '.svn'; // Keep it in class for later usage $this->ignoreList = $ignoreList; @@ -282,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; @@ -317,10 +297,10 @@ class ClassLoader { $oldPrefix = $this->prefix; // Set new prefix (temporary!) - $this->prefix = "config-"; + $this->prefix = 'config-'; // Set base directory - $basePath = sprintf("%sinc/config/", $this->cfgInstance->readConfig('base_path')); + $basePath = $this->configInstance->getConfigEntry('base_path') . 'inc/config/'; // Load all classes from the config directory $this->scanClassPath($basePath); @@ -403,7 +383,7 @@ class ClassLoader { */ public function getPrintableIncludeList () { // Prepare the list - $includeList = ""; + $includeList = ''; foreach ($this->loadedClasses as $classFile) { $includeList .= basename($classFile)."
\n"; } // END - foreach