|
@@ -58,8 +58,8 @@ class UniversalClassLoader
|
|
{
|
|
{
|
|
private $namespaces = array();
|
|
private $namespaces = array();
|
|
private $prefixes = array();
|
|
private $prefixes = array();
|
|
- private $namespaceFallback = array();
|
|
|
|
- private $prefixFallback = array();
|
|
|
|
|
|
+ private $namespaceFallbacks = array();
|
|
|
|
+ private $prefixFallbacks = array();
|
|
|
|
|
|
/**
|
|
/**
|
|
* Gets the configured namespaces.
|
|
* Gets the configured namespaces.
|
|
@@ -86,9 +86,9 @@ class UniversalClassLoader
|
|
*
|
|
*
|
|
* @return array An array of directories
|
|
* @return array An array of directories
|
|
*/
|
|
*/
|
|
- public function getNamespaceFallback()
|
|
|
|
|
|
+ public function getNamespaceFallbacks()
|
|
{
|
|
{
|
|
- return $this->namespaceFallback;
|
|
|
|
|
|
+ return $this->namespaceFallbacks;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -96,33 +96,33 @@ class UniversalClassLoader
|
|
*
|
|
*
|
|
* @return array An array of directories
|
|
* @return array An array of directories
|
|
*/
|
|
*/
|
|
- public function getPrefixFallback()
|
|
|
|
|
|
+ public function getPrefixFallbacks()
|
|
{
|
|
{
|
|
- return $this->prefixFallback;
|
|
|
|
|
|
+ return $this->prefixFallbacks;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* Registers the directory to use as a fallback for namespaces.
|
|
* Registers the directory to use as a fallback for namespaces.
|
|
*
|
|
*
|
|
- * @param string|array $dirs A directory path or an array of directories
|
|
|
|
|
|
+ * @param array $dirs An array of directories
|
|
*
|
|
*
|
|
* @api
|
|
* @api
|
|
*/
|
|
*/
|
|
- public function registerNamespaceFallback($dirs)
|
|
|
|
|
|
+ public function registerNamespaceFallbacks(array $dirs)
|
|
{
|
|
{
|
|
- $this->namespaceFallback = (array) $dirs;
|
|
|
|
|
|
+ $this->namespaceFallbacks = $dirs;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* Registers the directory to use as a fallback for class prefixes.
|
|
* Registers the directory to use as a fallback for class prefixes.
|
|
*
|
|
*
|
|
- * @param string|array $dirs A directory path or an array of directories
|
|
|
|
|
|
+ * @param array $dirs An array of directories
|
|
*
|
|
*
|
|
* @api
|
|
* @api
|
|
*/
|
|
*/
|
|
- public function registerPrefixFallback($dirs)
|
|
|
|
|
|
+ public function registerPrefixFallbacks(array $dirs)
|
|
{
|
|
{
|
|
- $this->prefixFallback = (array) $dirs;
|
|
|
|
|
|
+ $this->prefixFallbacks = $dirs;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -231,7 +231,7 @@ class UniversalClassLoader
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- foreach ($this->namespaceFallback as $dir) {
|
|
|
|
|
|
+ foreach ($this->namespaceFallbacks as $dir) {
|
|
$file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
|
|
$file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
|
|
if (file_exists($file)) {
|
|
if (file_exists($file)) {
|
|
return $file;
|
|
return $file;
|
|
@@ -250,7 +250,7 @@ class UniversalClassLoader
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- foreach ($this->prefixFallback as $dir) {
|
|
|
|
|
|
+ foreach ($this->prefixFallbacks as $dir) {
|
|
$file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
|
|
$file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
|
|
if (file_exists($file)) {
|
|
if (file_exists($file)) {
|
|
return $file;
|
|
return $file;
|