[ticket/11698] Moving all autoloadable files to phpbb/

PHPBB3-11698

tests/bootstrap.php

@@ -14,13 +14,13 @@ require_once $phpbb_root_path . 'includes/startup.php';
 
 $table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
-require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
+require_once $phpbb_root_path . 'phpbb/class_loader.' . $phpEx;
 
 $phpbb_class_loader_mock = new phpbb_class_loader('phpbb_mock_', $phpbb_root_path . '../tests/mock/', "php");
 $phpbb_class_loader_mock->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 = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'phpbb/', "php");
 $phpbb_class_loader->register();
 
 require_once 'test_framework/phpbb_test_case_helpers.php';

tests/class_loader/class_loader_test.php

@@ -30,9 +30,9 @@ 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 . 'includes/');
+		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/');
 
-		$prefix .= 'includes/';
+		$prefix .= 'phpbb/';
 
 		$this->assertEquals(
 			'',
@@ -71,10 +71,10 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 		$cache = new phpbb_mock_cache($cache_map);
 
 		$prefix = dirname(__FILE__) . '/';
-		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache);
-		$class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', '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 .= 'includes/';
+		$prefix .= 'phpbb/';
 
 		$this->assertEquals(
 			$prefix . 'dir/class_name.php',

tests/controller/controller_test.php

@@ -59,7 +59,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
 		}
 		if (!class_exists('phpbb_controller_foo'))
 		{
-			include(__DIR__.'/includes/controller/foo.php');
+			include(__DIR__.'/phpbb/controller/foo.php');
 		}
 
 		$resolver = new phpbb_controller_resolver(new phpbb_user, $container);

tests/datetime/from_format_test.php

@@ -7,9 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/user.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/datetime.php';
 require_once dirname(__FILE__) . '/../mock/lang.php';
 
 class phpbb_datetime_from_format_test extends phpbb_test_case

tests/dbal/migrator_test.php

@@ -8,8 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migrator.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/migration.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 require_once dirname(__FILE__) . '/migration/dummy.php';

tests/dbal/migrator_tool_config_test.php

@@ -7,9 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/config.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
-
 class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case
 {
 	public function setup()

tests/dbal/migrator_tool_module_test.php

@@ -8,8 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/module.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
 
 class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 {

tests/dbal/migrator_tool_permission_test.php

@@ -8,8 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/permission.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
 
 class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
 {

tests/error_collector_test.php

@@ -8,7 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
 
 class phpbb_error_collector_test extends phpbb_test_case
 {

tests/extension/finder_test.php

@@ -36,7 +36,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_suffix_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_suffix('_class')
 			->get_classes();
 
@@ -81,7 +81,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_prefix_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_prefix('hidden_')
 			->get_classes();
 
@@ -98,7 +98,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_directory_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_directory('type')
 			->get_classes();
 
@@ -209,7 +209,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_cached_get_files()
 	{
 		$query = array(
-			'core_path' => 'includes/foo',
+			'core_path' => 'phpbb/foo',
 			'core_suffix' => false,
 			'core_prefix' => false,
 			'core_directory' => 'bar',

tests/log/function_view_log_test.php

@@ -11,7 +11,6 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 require_once dirname(__FILE__) . '/../mock/user.php';
 require_once dirname(__FILE__) . '/../mock/cache.php';
 

tests/upload/fileupload_test.php

@@ -10,6 +10,7 @@
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+require_once __DIR__ . '/../mock/filespec.php';
 
 class phpbb_fileupload_test extends phpbb_test_case
 {