mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +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

6
tests/bootstrap.php
View File

@@ -32,8 +32,10 @@ else
require_once $phpbb_root_path . 'includes/constants.php';
require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.php');
$class_loader->register();
$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".php");
$phpbb_class_loader_ext->register();
$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".php");
$phpbb_class_loader->register();
require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php';

46
tests/class_loader/class_loader_test.php
View File

@@ -13,20 +13,26 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
global $class_loader;
$class_loader->unregister();
global $phpbb_class_loader;
$phpbb_class_loader->unregister();
global $phpbb_class_loader_ext;
$phpbb_class_loader_ext->unregister();
}
public function tearDown()
{
global $class_loader;
$class_loader->register();
global $phpbb_class_loader_ext;
$phpbb_class_loader_ext->register();
global $phpbb_class_loader;
$phpbb_class_loader->register();
}
public function test_resolve_path()
{
$prefix = dirname(__FILE__) . '/';
$class_loader = new phpbb_class_loader($prefix . 'includes/', $prefix . 'ext/');
$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/');
$prefix .= 'includes/';
@@ -56,20 +62,19 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$class_loader->resolve_path('phpbb_dir2'),
'Class with name of dir within dir (short class name)'
);
$this->assertEquals(
dirname(__FILE__) . '/ext/foo/class.php',
$class_loader->resolve_path('phpbb_ext_foo_class'),
'Extension class'
);
}
public function test_resolve_cached()
{
$cacheMap = array('class_loader' => array('phpbb_a_cached_name' => 'a/cached_name'));
$cache = new phpbb_mock_cache($cacheMap);
$cache_map = array(
'class_loader_phpbb_' => array('phpbb_a_cached_name' => 'a/cached_name'),
'class_loader_phpbb_ext_' => array('phpbb_ext_foo' => 'foo'),
);
$cache = new phpbb_mock_cache($cache_map);
$prefix = dirname(__FILE__) . '/';
$class_loader = new phpbb_class_loader($prefix . 'includes/', $prefix . 'ext/', '.php', $cache);
$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', '.php', $cache);
$class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', '.php', $cache);
$prefix .= 'includes/';
@@ -79,13 +84,22 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
'Class in a directory'
);
$this->assertFalse($class_loader->resolve_path('phpbb_ext_foo'));
$this->assertFalse($class_loader_ext->resolve_path('phpbb_a_cached_name'));
$this->assertEquals(
$prefix . 'a/cached_name.php',
$class_loader->resolve_path('phpbb_a_cached_name'),
'Class in a directory'
'Cached class found'
);
$cacheMap['class_loader']['phpbb_dir_class_name'] = 'dir/class_name';
$cache->check($this, $cacheMap);
$this->assertEquals(
$prefix . 'foo.php',
$class_loader_ext->resolve_path('phpbb_ext_foo'),
'Cached class found in alternative loader'
);
$cache_map['class_loader_phpbb_']['phpbb_dir_class_name'] = 'dir/class_name';
$cache->check($this, $cache_map);
}
}

6
tests/class_loader/ext/foo/class.php
View File

@@ -1,6 +0,0 @@
<?php
class phpbb_ext_foo_class
{
}

17
tests/extension/manager_test.php
View File

@@ -23,30 +23,15 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
{
parent::setUp();
// disable the regular class loader to replace it with one that loads
// test extensions
global $class_loader;
$class_loader->unregister();
$prefix = dirname(__FILE__) . '/';
$this->class_loader = new phpbb_class_loader($prefix . '../../phpBB/includes/', $prefix . 'ext/');
$this->class_loader->register();
$this->extension_manager = new phpbb_extension_manager(
$this->new_dbal(),
'phpbb_ext',
$prefix,
dirname(__FILE__) . '/',
'.php',
new phpbb_mock_cache
);
}
protected function tearDown()
{
global $class_loader;
$class_loader->register();
}
public function test_available()
{
$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_available()));