*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ----------------------------------
+ * 1.3
+ * - Constructor is now empty and factory method 'createClassLoader' is created
+ * - renamed loadClasses to scanClassPath
+ * - Added initLoader(), $configInstance renamed to $configInstance
* 1.2
* - ClassLoader rewritten to PHP SPL's own RecursiveIteratorIterator class
* 1.1
*/
private static $selfInstance = null;
- /**
- * Configuration array
- */
- private $cfg = array();
-
/**
* Array with all classes
*/
/**
* Suffix with extension for all class files
*/
- private $prefix = "class_";
+ private $prefix = 'class_';
/**
* Suffix with extension for all class files
*/
- private $suffix = ".php";
-
- /**
- * Length of the suffix. Will be overwritten later.
- */
- private $suffixLen = 0;
-
- /**
- * Length of the prefix. Will be overwritten later.
- */
- private $prefixLen = 0;
+ private $suffix = '.php';
/**
* A list for directory names (no leading/trailing slashes!) which not be scanned by the path scanner
/**
* Filename for the list cache
*/
- private $listCacheFQFN = "";
+ private $listCacheFQFN = '';
/**
* Cache for class content
*/
- private $classCacheFQFN = "";
+ private $classCacheFQFN = '';
/**
* Counter for loaded include files
private $total = 0;
/**
- * The *public* constructor
+ * The protected constructor. Please use the factory method below, or use
+ * getInstance() for singleton
+ *
+ * @return void
+ */
+ protected function __construct () {
+ // Is Currently empty
+ }
+
+ /**
+ * Our renamed factory method
*
- * @param $cfgInstance Configuration class instance
+ * @param $configInstance Configuration class instance
* @return void
*/
- public function __construct (FrameworkConfiguration $cfgInstance) {
+ public final static function createClassLoader (FrameworkConfiguration $configInstance) {
+ // Get a new instance
+ $loaderInstance = new ClassLoader();
+
+ // Init the instance
+ $loaderInstance->initLoader($configInstance);
+
+ // Return the prepared instance
+ return $loaderInstance;
+ }
+
+ /**
+ * Initializes our loader class
+ *
+ * @param $configInstance Configuration class instance
+ * @return void
+ */
+ protected function initLoader (FrameworkConfiguration $configInstance) {
// Set configuration instance
- $this->cfgInstance = $cfgInstance;
+ $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 = $cfgInstance->readConfig('class_suffix');
- $this->prefix = $cfgInstance->readConfig('class_prefix');
-
- // Estimate length of prefix and suffix for substr() function (cache)
- $this->suffixLen = strlen($this->suffix);
- $this->prefixLen = strlen($this->prefix);
+ $this->suffix = $configInstance->getConfigEntry('class_suffix');
+ $this->prefix = $configInstance->getConfigEntry('class_prefix');
// Set own instance
self::$selfInstance = $this;
} // END - if
}
+ /**
+ * Autoload-function
+ *
+ * @param $className Name of the class to load
+ * @return void
+ */
+ public static function autoLoad ($className) {
+ // Try to include this class
+ self::getInstance()->includeClass($className);
+ }
+
+ /**
+ * Getter for an instance of this class
+ *
+ * @return $selfInstance An instance of this class
+ */
+ public final static function getInstance () {
+ // Is the instance there?
+ if (is_null(self::$selfInstance)) {
+ // Get a new one
+ self::$selfInstance = ClassLoader::createClassLoader(FrameworkConfiguration::getInstance());
+ } // END - if
+
+ // Return the instance
+ return self::$selfInstance;
+ }
+
/**
* The destructor makes it sure all caches got flushed
*
// 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);
} // END - if
}
- /**
- * Getter for an instance of this class
- *
- * @return $selfInstance An instance of this class
- */
- public final static function getInstance () {
- // Is the instance there?
- if (is_null(self::$selfInstance)) {
- // Get a new one
- self::$selfInstance = new ClassLoader(FrameworkConfiguration::getInstance());
- } // END - if
-
- // Return the instance
- return self::$selfInstance;
- }
-
/**
* Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
*
* @param $ignoreList An optional list (array forced) of directory and file names which shall be ignored
* @return void
*/
- public function loadClasses ($basePath, array $ignoreList = array() ) {
+ public function scanClassPath ($basePath, array $ignoreList = array() ) {
// Is a list has been restored from cache, don't read it again
if ($this->listCached === true) {
// Abort here
// 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;
// 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;
// Is this file wanted?
//* DEBUG: */ echo "FOUND:{$fileName}<br />\n";
- if ((!in_array($fileName, $this->ignoreList)) && (substr($fileName, 0, $this->prefixLen) == $this->prefix) && (substr($fileName, -$this->suffixLen, $this->suffixLen) == $this->suffix)) {
+ if ((!in_array($fileName, $this->ignoreList)) && (substr($fileName, 0, strlen($this->prefix)) == $this->prefix) && (substr($fileName, -strlen($this->suffix), strlen($this->suffix)) == $this->suffix)) {
// Get the FQFN and add it to our class list
$fqfn = $entry->getRealPath();
//* DEBUG: */ echo "ADD: {$fileName}<br />\n";
$oldPrefix = $this->prefix;
// Set new prefix (temporary!)
- $this->prefix = "config-";
- $this->prefixLen = strlen($this->prefix);
+ $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->loadClasses($basePath);
+ $this->scanClassPath($basePath);
// Include these extra configs now
$this->includeExtraConfigs();
// Set the prefix back
$this->prefix = $oldPrefix;
- $this->prefixLen = strlen($this->prefix);
-
}
/**
// Run through all class names (should not be much)
foreach ($this->classes as $fileName => $fqfn) {
// Is this a config?
- if (substr($fileName, 0, $this->prefixLen) == $this->prefix) {
+ if (substr($fileName, 0, strlen($this->prefix)) == $this->prefix) {
// Then include it
require($fqfn);
*/
public function getPrintableIncludeList () {
// Prepare the list
- $includeList = "";
+ $includeList = '';
foreach ($this->loadedClasses as $classFile) {
$includeList .= basename($classFile)."<br />\n";
} // END - foreach
projects / core.git / blobdiff