mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/extension-manager] The class loader no longer knows about extensions

Browse Source 
Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.

PHPBB3-10323
This commit is contained in:
Nils Adermann
2011-08-15 21:38:47 -04:00
parent 989bd9cde7
commit 96209e0224
9 changed files with 77 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
phpBB/includes/class_loader.php
View File

@@ -31,25 +31,25 @@ if (!defined('IN_PHPBB'))
*/
class phpbb_class_loader
{
private $core_path;
private $ext_path;
private $prefix;
private $path;
private $php_ext;
private $cache;
private $cached_paths = array();
/**
* Creates a new phpbb_class_loader, which loads files with the given
* file extension from the given core or extension path.
* file extension from the given path.
*
* @param string $core_path phpBB's include directory for core files
* @param string $ext_path phpBB's extension directory
* @param string $php_ext The file extension for PHP files
* @param string $prefix Required class name prefix for files to be loaded
* @param string $path Directory to load files from
* @param string $php_ext The file extension for PHP files
* @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface.
*/
public function __construct($core_path, $ext_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null)
public function __construct($prefix, $path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null)
{
$this->core_path = $core_path;
$this->ext_path = $ext_path;
$this->prefix = $prefix;
$this->path = $path;
$this->php_ext = $php_ext;
$this->set_cache($cache);
@@ -66,7 +66,7 @@ class phpbb_class_loader
{
if ($cache)
{
$this->cached_paths = $cache->get('class_loader');
$this->cached_paths = $cache->get('class_loader_' . $this->prefix);
if ($this->cached_paths === false)
{
@@ -103,32 +103,21 @@ class phpbb_class_loader
*/
public function resolve_path($class)
{
if (substr($class, 6, 4) === 'ext_')
{
$path_prefix = $this->ext_path;
$prefix_length = 10;
}
else
{
$path_prefix = $this->core_path;
$prefix_length = 6;
}
if (isset($this->cached_paths[$class]))
{
return $path_prefix . $this->cached_paths[$class] . $this->php_ext;
return $this->path . $this->cached_paths[$class] . $this->php_ext;
}
if (!preg_match('/phpbb_[a-zA-Z0-9_]+/', $class))
if (!preg_match('/^' . $this->prefix . '[a-zA-Z0-9_]+$/', $class))
{
return false;
}
$parts = explode('_', substr($class, $prefix_length));
$parts = explode('_', substr($class, strlen($this->prefix)));
$dirs = '';
for ($i = 0, $n = sizeof($parts); $i < $n && is_dir($path_prefix . $dirs . $parts[$i]); $i++)
for ($i = 0, $n = sizeof($parts); $i < $n && is_dir($this->path . $dirs . $parts[$i]); $i++)
{
$dirs .= $parts[$i] . '/';
}
@@ -141,7 +130,7 @@ class phpbb_class_loader
$relative_path = $dirs . implode(array_slice($parts, $i, sizeof($parts) - $i), '_');
if (!file_exists($path_prefix . $relative_path . $this->php_ext))
if (!file_exists($this->path . $relative_path . $this->php_ext))
{
return false;
}
@@ -149,10 +138,10 @@ class phpbb_class_loader
if ($this->cache)
{
$this->cached_paths[$class] = $relative_path;
$this->cache->put('class_loader', $this->cached_paths);
$this->cache->put('class_loader_' . $this->prefix, $this->cached_paths);
}
return $path_prefix . $relative_path . $this->php_ext;
return $this->path . $relative_path . $this->php_ext;
}
/**
@@ -162,7 +151,7 @@ class phpbb_class_loader
*/
public function load_class($class)
{
if (substr($class, 0, 6) === 'phpbb_')
if (substr($class, 0, strlen($this->prefix)) === $this->prefix)
{
$path = $this->resolve_path($class);