mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/11700] Fix extension loading with namespaces

Browse Source 
class loader now expects all classes to be prefixed with a backslash
when resolving paths

PHPBB3-11700
This commit is contained in:
Nils Adermann
2013-09-19 18:29:08 +02:00
parent f205c4fad4
commit fe36375a36
23 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/class_loader/class_loader_test.php
View File

@@ -36,22 +36,22 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$this->assertEquals(
$prefix . 'class_name.php',
$class_loader->resolve_path('phpbb\\class_name'),
$class_loader->resolve_path('\\phpbb\\class_name'),
'Top level class'
);
$this->assertEquals(
$prefix . 'dir/class_name.php',
$class_loader->resolve_path('phpbb\\dir\\class_name'),
$class_loader->resolve_path('\\phpbb\\dir\\class_name'),
'Class in a directory'
);
$this->assertEquals(
$prefix . 'dir/subdir/class_name.php',
$class_loader->resolve_path('phpbb\\dir\\subdir\\class_name'),
$class_loader->resolve_path('\\phpbb\\dir\\subdir\\class_name'),
'Class in a sub-directory'
);
$this->assertEquals(
$prefix . 'dir2/dir2.php',
$class_loader->resolve_path('phpbb\\dir2\\dir2'),
$class_loader->resolve_path('\\phpbb\\dir2\\dir2'),
'Class with name of dir within dir'
);
}
@@ -59,8 +59,8 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
public function test_resolve_cached()
{
$cache_map = array(
'class_loader_phpbb__' => array('phpbb\\a\\cached_name' => 'a/cached_name'),
'class_loader___' => array('phpbb\\ext\\foo' => 'foo'),
'class_loader___phpbb__' => array('\\phpbb\\a\\cached_name' => 'a/cached_name'),
'class_loader___' => array('\\phpbb\\ext\\foo' => 'foo'),
);
$cache = new phpbb_mock_cache($cache_map);
@@ -72,26 +72,26 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$this->assertEquals(
$prefix . 'dir/class_name.php',
$class_loader->resolve_path('phpbb\\dir\\class_name'),
$class_loader->resolve_path('\\phpbb\\dir\\class_name'),
'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->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_loader->resolve_path('\\phpbb\\a\\cached_name'),
'Cached class found'
);
$this->assertEquals(
$prefix . 'foo.php',
$class_loader_ext->resolve_path('phpbb\\ext\\foo'),
$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_map['class_loader___phpbb__']['\\phpbb\\dir\\class_name'] = 'dir/class_name';
$cache->check($this, $cache_map);
}
}