[ticket/11700] Fix class loader tests for namespaces

PHPBB3-11700

6 files changed, 28 insertions, 32 deletions

diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index 19f9280ec1..eb50ac1ecd 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -30,74 +30,68 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 	public function test_resolve_path()
 	{
 		$prefix = dirname(__FILE__) . '/';
-		$class_loader = new \phpbb\class_loader('phpbb_', $prefix . 'phpbb/');
+		$class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/');
 
 		$prefix .= 'phpbb/';
 
 		$this->assertEquals(
-			'',
-			$class_loader->resolve_path('phpbb_dir'),
-			'Class with same name as a directory is unloadable'
-		);
-
-		$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'),
-			'Class with name of dir within dir (short class name)'
+			$class_loader->resolve_path('phpbb\\dir2\\dir2'),
+			'Class with name of dir within dir'
 		);
 	}
 
 	public function test_resolve_cached()
 	{
 		$cache_map = array(
-			'class_loader_phpbb_' => array('phpbb_a_cached_name' => 'a/cached_name'),
-			'class_loader_phpbb_ext_' => array('phpbb_ext_foo' => 'foo'),
+			'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('phpbb_', $prefix . 'phpbb/', 'php', $cache);
-		$class_loader_ext = new \phpbb\class_loader('phpbb_ext_', $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);
 
 		$prefix .= 'phpbb/';
 
 		$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);
 	}
 }
diff --git a/tests/class_loader/phpbb/class_name.php b/tests/class_loader/phpbb/class_name.php
index e941173cdd..64a3fa646e 100644
--- a/tests/class_loader/phpbb/class_name.php
+++ b/tests/class_loader/phpbb/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_class_name
+namespace phpbb;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir.php b/tests/class_loader/phpbb/dir.php
deleted file mode 100644
index 1c8930d8e7..0000000000
--- a/tests/class_loader/phpbb/dir.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir
-{
-}
-
diff --git a/tests/class_loader/phpbb/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php
index 0675aa8fc5..1cd39a1181 100644
--- a/tests/class_loader/phpbb/dir/class_name.php
+++ b/tests/class_loader/phpbb/dir/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir_class_name
+namespace phpbb\dir;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php
index 7321a609cc..89affbc847 100644
--- a/tests/class_loader/phpbb/dir/subdir/class_name.php
+++ b/tests/class_loader/phpbb/dir/subdir/class_name.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir_subdir_class_name
+namespace phpbb\dir\subdir;
+
+class class_name
 {
 }
 
diff --git a/tests/class_loader/phpbb/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php
index 01cf4086ff..b273511fcd 100644
--- a/tests/class_loader/phpbb/dir2/dir2.php
+++ b/tests/class_loader/phpbb/dir2/dir2.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_dir2
+namespace phpbb;
+
+class dir2
 {
 }