makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11700] Fix class loader tests for namespaces

Browse source 
PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-09-10 15:12:43 +02:00
parent 97012dd851
commit 76dfe153fc
6 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/class_loader/class_loader_test.php
View file

@ -30,74 +30,68 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
public function test_resolve_path() public function test_resolve_path()
{ {
$prefix = dirname(__FILE__) . '/'; $prefix = dirname(__FILE__) . '/';
$class_loader = new \phpbb\class_loader('phpbb_', $prefix . 'phpbb/'); $class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/');
$prefix .= 'phpbb/'; $prefix .= 'phpbb/';
$this->assertEquals(
'',
$class_loader->resolve_path('phpbb_dir'),
'Class with same name as a directory is unloadable'
);
$this->assertEquals( $this->assertEquals(
$prefix . 'class_name.php', $prefix . 'class_name.php',
$class_loader->resolve_path('phpbb_class_name'), $class_loader->resolve_path('phpbb\\class_name'),
'Top level class' 'Top level class'
); );
$this->assertEquals( $this->assertEquals(
$prefix . 'dir/class_name.php', $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' 'Class in a directory'
); );
$this->assertEquals( $this->assertEquals(
$prefix . 'dir/subdir/class_name.php', $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' 'Class in a sub-directory'
); );
$this->assertEquals( $this->assertEquals(
$prefix . 'dir2/dir2.php', $prefix . 'dir2/dir2.php',
$class_loader->resolve_path('phpbb_dir2'), $class_loader->resolve_path('phpbb\\dir2\\dir2'),
'Class with name of dir within dir (short class name)' 'Class with name of dir within dir'
); );
} }
public function test_resolve_cached() public function test_resolve_cached()
{ {
$cache_map = array( $cache_map = array(
'class_loader_phpbb_' => array('phpbb_a_cached_name' => 'a/cached_name'), 'class_loader_phpbb__' => array('phpbb\\a\\cached_name' => 'a/cached_name'),
'class_loader_phpbb_ext_' => array('phpbb_ext_foo' => 'foo'), 'class_loader_phpbb__ext__' => array('phpbb\\ext\\foo' => 'foo'),
); );
$cache = new phpbb_mock_cache($cache_map); $cache = new phpbb_mock_cache($cache_map);
$prefix = dirname(__FILE__) . '/'; $prefix = dirname(__FILE__) . '/';
$class_loader = new \phpbb\class_loader('phpbb_', $prefix . 'phpbb/', 'php', $cache); $class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/', 'php', $cache);
$class_loader_ext = new \phpbb\class_loader('phpbb_ext_', $prefix . 'phpbb/', 'php', $cache); $class_loader_ext = new \phpbb\class_loader('phpbb\\ext\\', $prefix . 'phpbb/', 'php', $cache);
$prefix .= 'phpbb/'; $prefix .= 'phpbb/';
$this->assertEquals( $this->assertEquals(
$prefix . 'dir/class_name.php', $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' 'Class in a directory'
); );
$this->assertFalse($class_loader->resolve_path('phpbb_ext_foo')); $this->assertFalse($class_loader->resolve_path('phpbb\\ext\\foo'));
$this->assertFalse($class_loader_ext->resolve_path('phpbb_a_cached_name')); $this->assertFalse($class_loader_ext->resolve_path('phpbb\\a\\cached_name'));
$this->assertEquals( $this->assertEquals(
$prefix . 'a/cached_name.php', $prefix . 'a/cached_name.php',
$class_loader->resolve_path('phpbb_a_cached_name'), $class_loader->resolve_path('phpbb\\a\\cached_name'),
'Cached class found' 'Cached class found'
); );
$this->assertEquals( $this->assertEquals(
$prefix . 'foo.php', $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' '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); $cache->check($this, $cache_map);
} }
} }

4
tests/class_loader/phpbb/class_name.php
View file

@ -1,6 +1,8 @@
<?php <?php
class phpbb_class_name namespace phpbb;
class class_name
{ {
} }

6
tests/class_loader/phpbb/dir.php
View file

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

4
tests/class_loader/phpbb/dir/class_name.php
View file

@ -1,6 +1,8 @@
<?php <?php
class phpbb_dir_class_name namespace phpbb\dir;
class class_name
{ {
} }

4
tests/class_loader/phpbb/dir/subdir/class_name.php
View file

@ -1,6 +1,8 @@
<?php <?php
class phpbb_dir_subdir_class_name namespace phpbb\dir\subdir;
class class_name
{ {
} }

4
tests/class_loader/phpbb/dir2/dir2.php
View file

@ -1,6 +1,8 @@
<?php <?php
class phpbb_dir2 namespace phpbb;
class dir2
{ {
} }