Merge remote-tracking branch 'naderman/feature/extension-manager' into develop

* naderman/feature/extension-manager: (67 commits)
  [feature/extension-manager] Removing now unused acp_search code
  [feature/extension-manager] Split disabling extensions up into steps as well
  [feature/extension-manager] Add documentation on caching in ext finder
  [feature/extension-manager] Reference correct new module basenames in install
  [feature/extension-manager] Rename default methods to core methods on finder.
  [feature/extension-manager] Document what the class loader stores in cache
  [feature/extension-manager] Add docblock to cached paths map in class loader
  [feature/extension-manager] Clear up docs of extension related template changes
  [feature/extension-manager] Use "core files" instead of "global files" in docs
  [feature/extension-manager] Add docblocks to new search backend methods
  [feature/extension-manager] Add docblocks to new methods in functions_module
  [feature/extension-manager] Clarify comment on ext meta class instantiator
  [feature/extension-manager] Add more info on suffixes in extension finder
  [feature/extension-manager] Clarify is_dir parameter description
  [feature/extension-manager] Clarify class finding method docblock
  [feature/extension-manager] Correct default path comment & remove double strlen
  [feature/extension-manager] Fix "disbale" typo in comment
  [feature/extension-manager] Properly remove old ACP language loading code
  [feature/extension-manager] Support extensions in subdirectories of ext/
  [feature/extension-manager] Add prefix to extension meta data / install classes
  ...

1 files changed, 30 insertions, 11 deletions

diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index 0c7fe3f97a..9744a1c703 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -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);
+		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/');
 
 		$prefix .= 'includes/';
 
@@ -60,11 +66,15 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 
 	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, '.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/';
 
@@ -74,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'
+		);
+
+		$this->assertEquals(
+			$prefix . 'foo.php',
+			$class_loader_ext->resolve_path('phpbb_ext_foo'),
+			'Cached class found in alternative loader'
 		);
 
-		$cacheMap['class_loader']['phpbb_dir_class_name'] = 'dir/class_name';
-		$cache->check($this, $cacheMap);
+		$cache_map['class_loader_phpbb_']['phpbb_dir_class_name'] = 'dir/class_name';
+		$cache->check($this, $cache_map);
 	}
 }