aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-15 21:38:47 -0400
committerNils Adermann <naderman@naderman.de>2011-09-29 15:42:46 +0200
commit96209e022477d97b581b79cabace4caddd19501b (patch)
tree660134bf3d3bc3a3ab50a222e789aafea5379b4a /phpBB
parent989bd9cde7314024999f5b92fc2ff4572b9ac937 (diff)
downloadforums-96209e022477d97b581b79cabace4caddd19501b.tar
forums-96209e022477d97b581b79cabace4caddd19501b.tar.gz
forums-96209e022477d97b581b79cabace4caddd19501b.tar.bz2
forums-96209e022477d97b581b79cabace4caddd19501b.tar.xz
forums-96209e022477d97b581b79cabace4caddd19501b.zip
[feature/extension-manager] The class loader no longer knows about extensions
Instead the class loader is instantiated twice. Once with the phpbb_ prefix and once with the phpbb_ext_ prefix. PHPBB3-10323
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/common.php9
-rw-r--r--phpBB/download/file.php9
-rw-r--r--phpBB/includes/class_loader.php47
-rw-r--r--phpBB/install/database_update.php9
-rw-r--r--phpBB/install/index.php9
5 files changed, 42 insertions, 41 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index cc33b29a09..61817972f9 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -96,13 +96,16 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Setup class loader first
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
// set up caching
$cache_factory = new phpbb_cache_factory($acm_type);
$cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
// Instantiate some basic classes
$request = new phpbb_request();
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index e13524f922..2a9c472ca7 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -46,13 +46,16 @@ if (isset($_GET['avatar']))
require($phpbb_root_path . 'includes/functions_download' . '.' . $phpEx);
require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
- $class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
- $class_loader->register();
+ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+ $phpbb_class_loader_ext->register();
+ $phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+ $phpbb_class_loader->register();
// set up caching
$cache_factory = new phpbb_cache_factory($acm_type);
$cache = $cache_factory->get_service();
- $class_loader->set_cache($cache->get_driver());
+ $phpbb_class_loader_ext->set_cache($cache->get_driver());
+ $phpbb_class_loader->set_cache($cache->get_driver());
$request = new phpbb_request();
$db = new $sql_db();
diff --git a/phpBB/includes/class_loader.php b/phpBB/includes/class_loader.php
index bcf1ba1650..46a271471a 100644
--- a/phpBB/includes/class_loader.php
+++ b/phpBB/includes/class_loader.php
@@ -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);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1f3c01ee3e..64dea37ef8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -109,13 +109,16 @@ if (!defined('EXT_TABLE'))
define('EXT_TABLE', $table_prefix . 'ext');
}
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
// set up caching
$cache_factory = new phpbb_cache_factory($acm_type);
$cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
$request = new phpbb_request();
$user = new user();
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index fbe8ae63a7..0a46a06664 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -82,13 +82,16 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
// set up caching
$cache_factory = new phpbb_cache_factory('file');
$cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
$request = new phpbb_request();
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-09 16:16:02 +0000