mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 13:16:54 +02:00
Code Issues Releases Wiki Activity

Gelato: ClassLoader - use ClassLoader instead of static

Browse Source
This commit is contained in:
Awilum
2013-01-09 22:19:28 +02:00
parent d2bad4a3b6
commit adac7ea7a3
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/Gelato/ClassLoader/ClassLoader.php
View File

@@ -65,7 +65,7 @@ class ClassLoader
*/ */
public static function mapClass($className, $classPath) public static function mapClass($className, $classPath)
{ {
static::$classes[$className] = $classPath; ClassLoader::$classes[$className] = $classPath;
} }
/** /**
@@ -77,7 +77,7 @@ class ClassLoader
public static function mapClasses(array $classes) public static function mapClasses(array $classes)
{ {
foreach ($classes as $name => $path) { foreach ($classes as $name => $path) {
static::$classes[$name] = $path; ClassLoader::$classes[$name] = $path;
} }
} }
@@ -89,7 +89,7 @@ class ClassLoader
*/ */
public static function directory($path) public static function directory($path)
{ {
static::$directories[] = rtrim($path, '/'); ClassLoader::$directories[] = rtrim($path, '/');
} }
/** /**
@@ -101,7 +101,7 @@ class ClassLoader
*/ */
public static function registerNamespace($namespace, $path) public static function registerNamespace($namespace, $path)
{ {
static::$namespaces[trim($namespace, '\\') . '\\'] = rtrim($path, '/'); ClassLoader::$namespaces[trim($namespace, '\\') . '\\'] = rtrim($path, '/');
} }
/** /**
@@ -113,7 +113,7 @@ class ClassLoader
*/ */
public static function alias($alias, $className) public static function alias($alias, $className)
{ {
static::$aliases[$alias] = $className; ClassLoader::$aliases[$alias] = $className;
} }
/** /**
@@ -136,7 +136,7 @@ class ClassLoader
$classPath .= str_replace('_', '/', $className) . '.php'; $classPath .= str_replace('_', '/', $className) . '.php';
$directories = ($directory === null) ? static::$directories : array($directory); $directories = ($directory === null) ? ClassLoader::$directories : array($directory);
foreach ($directories as $directory) { foreach ($directories as $directory) {
if (file_exists($directory . '/' . $classPath)) { if (file_exists($directory . '/' . $classPath)) {
@@ -164,15 +164,15 @@ class ClassLoader
/** /**
* Try to autoload an aliased class * Try to autoload an aliased class
*/ */
if (isset(static::$aliases[$className])) { if (isset(ClassLoader::$aliases[$className])) {
return class_alias(static::$aliases[$className], $className); return class_alias(ClassLoader::$aliases[$className], $className);
} }
/** /**
* Try to load a mapped class * Try to load a mapped class
*/ */
if (isset(static::$classes[$className]) && file_exists(static::$classes[$className])) { if (isset(ClassLoader::$classes[$className]) && file_exists(ClassLoader::$classes[$className])) {
include static::$classes[$className]; include ClassLoader::$classes[$className];
return true; return true;
} }
@@ -180,9 +180,9 @@ class ClassLoader
/** /**
* Try to load class from a registered namespace * Try to load class from a registered namespace
*/ */
foreach (static::$namespaces as $namespace => $path) { foreach (ClassLoader::$namespaces as $namespace => $path) {
if (strpos($className, $namespace) === 0) { if (strpos($className, $namespace) === 0) {
if (static::loadPSR0(substr($className, strlen($namespace)), $path)) { if (ClassLoader::loadPSR0(substr($className, strlen($namespace)), $path)) {
return true; return true;
} }
} }
@@ -192,7 +192,7 @@ class ClassLoader
* Try to load a PSR-0 compatible class * Try to load a PSR-0 compatible class
* The second call to the loadPSR0 method is used to autoload legacy code * The second call to the loadPSR0 method is used to autoload legacy code
*/ */
if (static::loadPSR0($className) || static::loadPSR0(strtolower($className))) { if (ClassLoader::loadPSR0($className) || ClassLoader::loadPSR0(strtolower($className))) {
return true; return true;
} }