diff --git a/phpBB/common.php b/phpBB/common.php index f6f109c3de..962a1f951f 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -46,7 +46,7 @@ if (!defined('PHPBB_INSTALLED')) $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); // Eliminate . and .. from the path - require($phpbb_root_path . 'includes/filesystem.' . $phpEx); + require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); $phpbb_filesystem = new phpbb_filesystem(); $script_path = $phpbb_filesystem->clean_path($script_path); @@ -71,7 +71,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; // Include files -require($phpbb_root_path . 'includes/class_loader.' . $phpEx); +require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); require($phpbb_root_path . 'includes/functions_content.' . $phpEx); @@ -85,7 +85,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); // Setup class loader first -$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx); $phpbb_class_loader->register(); $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 6618e2c3f9..11a2511aee 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -560,7 +560,7 @@ class acp_search return $finder ->extension_suffix('_backend') ->extension_directory('/search') - ->core_path('includes/search/') + ->core_path('phpbb/search/') ->get_classes(); } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b20ca1e4ea..cd6fb7931b 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -82,7 +82,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; // Include files -require($phpbb_root_path . 'includes/class_loader.' . $phpEx); +require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); require($phpbb_root_path . 'includes/functions_content.' . $phpEx); @@ -95,7 +95,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); // Setup class loader first -$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx); $phpbb_class_loader->register(); // Set up container (must be done here because extensions table may not exist) @@ -217,7 +217,7 @@ $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $finder = $phpbb_extension_manager->get_finder(); $migrations = $finder - ->core_path('includes/db/migration/data/') + ->core_path('phpbb/db/migration/data/') ->get_classes(); $migrator->set_migrations($migrations); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 84a2a023f8..45e5777e36 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -78,7 +78,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; // Include essential scripts -require($phpbb_root_path . 'includes/class_loader.' . $phpEx); +require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); require($phpbb_root_path . 'includes/functions_container.' . $phpEx); @@ -90,7 +90,7 @@ include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx); // Setup class loader first -$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx); $phpbb_class_loader->register(); $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 3d7b6f7c88..ea23c318e3 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1435,7 +1435,7 @@ class install_install extends module $db->sql_return_on_error(true); include_once($phpbb_root_path . 'includes/constants.' . $phpEx); - include_once($phpbb_root_path . 'includes/search/fulltext_native.' . $phpEx); + include_once($phpbb_root_path . 'phpbb/search/fulltext_native.' . $phpEx); // We need to fill the config to let internal functions correctly work $config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE); @@ -1888,7 +1888,7 @@ class install_install extends module /** * Populate migrations for the installation * - * This "installs" all migrations from (root path)/includes/db/migrations/data. + * This "installs" all migrations from (root path)/phpbb/db/migrations/data. * "installs" means it adds all migrations to the migrations table, but does not * perform any of the actions in the migrations. * @@ -1900,7 +1900,7 @@ class install_install extends module $finder = $extension_manager->get_finder(); $migrations = $finder - ->core_path('includes/db/migration/data/') + ->core_path('phpbb/db/migration/data/') ->get_classes(); $migrator->populate_migrations($migrations); } diff --git a/phpBB/includes/auth/auth.php b/phpBB/phpbb/auth/auth.php similarity index 100% rename from phpBB/includes/auth/auth.php rename to phpBB/phpbb/auth/auth.php diff --git a/phpBB/includes/auth/index.htm b/phpBB/phpbb/auth/index.htm similarity index 100% rename from phpBB/includes/auth/index.htm rename to phpBB/phpbb/auth/index.htm diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php similarity index 100% rename from phpBB/includes/auth/provider/apache.php rename to phpBB/phpbb/auth/provider/apache.php diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php similarity index 100% rename from phpBB/includes/auth/provider/base.php rename to phpBB/phpbb/auth/provider/base.php diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php similarity index 100% rename from phpBB/includes/auth/provider/db.php rename to phpBB/phpbb/auth/provider/db.php diff --git a/phpBB/includes/auth/provider/index.htm b/phpBB/phpbb/auth/provider/index.htm similarity index 100% rename from phpBB/includes/auth/provider/index.htm rename to phpBB/phpbb/auth/provider/index.htm diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/phpbb/auth/provider/interface.php similarity index 100% rename from phpBB/includes/auth/provider/interface.php rename to phpBB/phpbb/auth/provider/interface.php diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php similarity index 100% rename from phpBB/includes/auth/provider/ldap.php rename to phpBB/phpbb/auth/provider/ldap.php diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php similarity index 100% rename from phpBB/includes/avatar/driver/driver.php rename to phpBB/phpbb/avatar/driver/driver.php diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php similarity index 100% rename from phpBB/includes/avatar/driver/gravatar.php rename to phpBB/phpbb/avatar/driver/gravatar.php diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/phpbb/avatar/driver/interface.php similarity index 100% rename from phpBB/includes/avatar/driver/interface.php rename to phpBB/phpbb/avatar/driver/interface.php diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php similarity index 100% rename from phpBB/includes/avatar/driver/local.php rename to phpBB/phpbb/avatar/driver/local.php diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php similarity index 100% rename from phpBB/includes/avatar/driver/remote.php rename to phpBB/phpbb/avatar/driver/remote.php diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php similarity index 100% rename from phpBB/includes/avatar/driver/upload.php rename to phpBB/phpbb/avatar/driver/upload.php diff --git a/phpBB/includes/avatar/manager.php b/phpBB/phpbb/avatar/manager.php similarity index 100% rename from phpBB/includes/avatar/manager.php rename to phpBB/phpbb/avatar/manager.php diff --git a/phpBB/includes/cache/driver/apc.php b/phpBB/phpbb/cache/driver/apc.php similarity index 100% rename from phpBB/includes/cache/driver/apc.php rename to phpBB/phpbb/cache/driver/apc.php diff --git a/phpBB/includes/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php similarity index 100% rename from phpBB/includes/cache/driver/base.php rename to phpBB/phpbb/cache/driver/base.php diff --git a/phpBB/includes/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php similarity index 100% rename from phpBB/includes/cache/driver/eaccelerator.php rename to phpBB/phpbb/cache/driver/eaccelerator.php diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php similarity index 100% rename from phpBB/includes/cache/driver/file.php rename to phpBB/phpbb/cache/driver/file.php diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/phpbb/cache/driver/interface.php similarity index 100% rename from phpBB/includes/cache/driver/interface.php rename to phpBB/phpbb/cache/driver/interface.php diff --git a/phpBB/includes/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php similarity index 100% rename from phpBB/includes/cache/driver/memcache.php rename to phpBB/phpbb/cache/driver/memcache.php diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php similarity index 100% rename from phpBB/includes/cache/driver/memory.php rename to phpBB/phpbb/cache/driver/memory.php diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php similarity index 100% rename from phpBB/includes/cache/driver/null.php rename to phpBB/phpbb/cache/driver/null.php diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php similarity index 100% rename from phpBB/includes/cache/driver/redis.php rename to phpBB/phpbb/cache/driver/redis.php diff --git a/phpBB/includes/cache/driver/wincache.php b/phpBB/phpbb/cache/driver/wincache.php similarity index 100% rename from phpBB/includes/cache/driver/wincache.php rename to phpBB/phpbb/cache/driver/wincache.php diff --git a/phpBB/includes/cache/driver/xcache.php b/phpBB/phpbb/cache/driver/xcache.php similarity index 100% rename from phpBB/includes/cache/driver/xcache.php rename to phpBB/phpbb/cache/driver/xcache.php diff --git a/phpBB/includes/cache/service.php b/phpBB/phpbb/cache/service.php similarity index 100% rename from phpBB/includes/cache/service.php rename to phpBB/phpbb/cache/service.php diff --git a/phpBB/includes/class_loader.php b/phpBB/phpbb/class_loader.php similarity index 100% rename from phpBB/includes/class_loader.php rename to phpBB/phpbb/class_loader.php diff --git a/phpBB/includes/config/config.php b/phpBB/phpbb/config/config.php similarity index 100% rename from phpBB/includes/config/config.php rename to phpBB/phpbb/config/config.php diff --git a/phpBB/includes/config/db.php b/phpBB/phpbb/config/db.php similarity index 100% rename from phpBB/includes/config/db.php rename to phpBB/phpbb/config/db.php diff --git a/phpBB/includes/config/db_text.php b/phpBB/phpbb/config/db_text.php similarity index 100% rename from phpBB/includes/config/db_text.php rename to phpBB/phpbb/config/db_text.php diff --git a/phpBB/includes/content_visibility.php b/phpBB/phpbb/content_visibility.php similarity index 100% rename from phpBB/includes/content_visibility.php rename to phpBB/phpbb/content_visibility.php diff --git a/phpBB/includes/controller/exception.php b/phpBB/phpbb/controller/exception.php similarity index 100% rename from phpBB/includes/controller/exception.php rename to phpBB/phpbb/controller/exception.php diff --git a/phpBB/includes/controller/helper.php b/phpBB/phpbb/controller/helper.php similarity index 100% rename from phpBB/includes/controller/helper.php rename to phpBB/phpbb/controller/helper.php diff --git a/phpBB/includes/controller/provider.php b/phpBB/phpbb/controller/provider.php similarity index 100% rename from phpBB/includes/controller/provider.php rename to phpBB/phpbb/controller/provider.php diff --git a/phpBB/includes/controller/resolver.php b/phpBB/phpbb/controller/resolver.php similarity index 100% rename from phpBB/includes/controller/resolver.php rename to phpBB/phpbb/controller/resolver.php diff --git a/phpBB/includes/cron/manager.php b/phpBB/phpbb/cron/manager.php similarity index 100% rename from phpBB/includes/cron/manager.php rename to phpBB/phpbb/cron/manager.php diff --git a/phpBB/includes/cron/task/base.php b/phpBB/phpbb/cron/task/base.php similarity index 100% rename from phpBB/includes/cron/task/base.php rename to phpBB/phpbb/cron/task/base.php diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/phpbb/cron/task/core/prune_all_forums.php similarity index 100% rename from phpBB/includes/cron/task/core/prune_all_forums.php rename to phpBB/phpbb/cron/task/core/prune_all_forums.php diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/phpbb/cron/task/core/prune_forum.php similarity index 100% rename from phpBB/includes/cron/task/core/prune_forum.php rename to phpBB/phpbb/cron/task/core/prune_forum.php diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php similarity index 100% rename from phpBB/includes/cron/task/core/queue.php rename to phpBB/phpbb/cron/task/core/queue.php diff --git a/phpBB/includes/cron/task/core/tidy_cache.php b/phpBB/phpbb/cron/task/core/tidy_cache.php similarity index 100% rename from phpBB/includes/cron/task/core/tidy_cache.php rename to phpBB/phpbb/cron/task/core/tidy_cache.php diff --git a/phpBB/includes/cron/task/core/tidy_database.php b/phpBB/phpbb/cron/task/core/tidy_database.php similarity index 100% rename from phpBB/includes/cron/task/core/tidy_database.php rename to phpBB/phpbb/cron/task/core/tidy_database.php diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php similarity index 90% rename from phpBB/includes/cron/task/core/tidy_search.php rename to phpBB/phpbb/cron/task/core/tidy_search.php index 3ec25aa021..a3d5b7dbd2 100644 --- a/phpBB/includes/cron/task/core/tidy_search.php +++ b/phpBB/phpbb/cron/task/core/tidy_search.php @@ -61,11 +61,6 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base // Select the search method $search_type = basename($this->config['search_type']); - if (!class_exists($search_type)) - { - include($this->phpbb_root_path . "includes/search/$search_type." . $this->php_ext); - } - // We do some additional checks in the module to ensure it can actually be utilised $error = false; $search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user); @@ -90,7 +85,7 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base // Select the search method $search_type = basename($this->config['search_type']); - return file_exists($this->phpbb_root_path . 'includes/search/' . $search_type . '.' . $this->php_ext); + return class_exists($search_type); } /** diff --git a/phpBB/includes/cron/task/core/tidy_sessions.php b/phpBB/phpbb/cron/task/core/tidy_sessions.php similarity index 100% rename from phpBB/includes/cron/task/core/tidy_sessions.php rename to phpBB/phpbb/cron/task/core/tidy_sessions.php diff --git a/phpBB/includes/cron/task/core/tidy_warnings.php b/phpBB/phpbb/cron/task/core/tidy_warnings.php similarity index 100% rename from phpBB/includes/cron/task/core/tidy_warnings.php rename to phpBB/phpbb/cron/task/core/tidy_warnings.php diff --git a/phpBB/includes/cron/task/parametrized.php b/phpBB/phpbb/cron/task/parametrized.php similarity index 100% rename from phpBB/includes/cron/task/parametrized.php rename to phpBB/phpbb/cron/task/parametrized.php diff --git a/phpBB/includes/cron/task/task.php b/phpBB/phpbb/cron/task/task.php similarity index 100% rename from phpBB/includes/cron/task/task.php rename to phpBB/phpbb/cron/task/task.php diff --git a/phpBB/includes/cron/task/wrapper.php b/phpBB/phpbb/cron/task/wrapper.php similarity index 100% rename from phpBB/includes/cron/task/wrapper.php rename to phpBB/phpbb/cron/task/wrapper.php diff --git a/phpBB/includes/datetime.php b/phpBB/phpbb/datetime.php similarity index 100% rename from phpBB/includes/datetime.php rename to phpBB/phpbb/datetime.php diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php similarity index 100% rename from phpBB/includes/db/driver/driver.php rename to phpBB/phpbb/db/driver/driver.php diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php similarity index 100% rename from phpBB/includes/db/driver/firebird.php rename to phpBB/phpbb/db/driver/firebird.php diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php similarity index 100% rename from phpBB/includes/db/driver/mssql.php rename to phpBB/phpbb/db/driver/mssql.php diff --git a/phpBB/includes/db/driver/mssql_base.php b/phpBB/phpbb/db/driver/mssql_base.php similarity index 100% rename from phpBB/includes/db/driver/mssql_base.php rename to phpBB/phpbb/db/driver/mssql_base.php diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php similarity index 100% rename from phpBB/includes/db/driver/mssql_odbc.php rename to phpBB/phpbb/db/driver/mssql_odbc.php diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php similarity index 100% rename from phpBB/includes/db/driver/mssqlnative.php rename to phpBB/phpbb/db/driver/mssqlnative.php diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php similarity index 100% rename from phpBB/includes/db/driver/mysql.php rename to phpBB/phpbb/db/driver/mysql.php diff --git a/phpBB/includes/db/driver/mysql_base.php b/phpBB/phpbb/db/driver/mysql_base.php similarity index 100% rename from phpBB/includes/db/driver/mysql_base.php rename to phpBB/phpbb/db/driver/mysql_base.php diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php similarity index 100% rename from phpBB/includes/db/driver/mysqli.php rename to phpBB/phpbb/db/driver/mysqli.php diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php similarity index 100% rename from phpBB/includes/db/driver/oracle.php rename to phpBB/phpbb/db/driver/oracle.php diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php similarity index 100% rename from phpBB/includes/db/driver/postgres.php rename to phpBB/phpbb/db/driver/postgres.php diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php similarity index 100% rename from phpBB/includes/db/driver/sqlite.php rename to phpBB/phpbb/db/driver/sqlite.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_10.php b/phpBB/phpbb/db/migration/data/30x/3_0_10.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_10.php rename to phpBB/phpbb/db/migration/data/30x/3_0_10.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_10_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_10_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_10_rc3.php rename to phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_11.php b/phpBB/phpbb/db/migration/data/30x/3_0_11.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_11.php rename to phpBB/phpbb/db/migration/data/30x/3_0_11.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_11_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_11_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_12_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_1_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_2_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_2_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_3.php b/phpBB/phpbb/db/migration/data/30x/3_0_3.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_3.php rename to phpBB/phpbb/db/migration/data/30x/3_0_3.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_3_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_4.php b/phpBB/phpbb/db/migration/data/30x/3_0_4.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_4.php rename to phpBB/phpbb/db/migration/data/30x/3_0_4.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_4_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_5.php b/phpBB/phpbb/db/migration/data/30x/3_0_5.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_5.php rename to phpBB/phpbb/db/migration/data/30x/3_0_5.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_5_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_6.php b/phpBB/phpbb/db/migration/data/30x/3_0_6.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_6.php rename to phpBB/phpbb/db/migration/data/30x/3_0_6.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_6_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_6_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_6_rc3.php rename to phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_6_rc4.php rename to phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_7.php b/phpBB/phpbb/db/migration/data/30x/3_0_7.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_7.php rename to phpBB/phpbb/db/migration/data/30x/3_0_7.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_7_pl1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_7_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_7_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_8.php b/phpBB/phpbb/db/migration/data/30x/3_0_8.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_8.php rename to phpBB/phpbb/db/migration/data/30x/3_0_8.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_8_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_9.php b/phpBB/phpbb/db/migration/data/30x/3_0_9.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_9.php rename to phpBB/phpbb/db/migration/data/30x/3_0_9.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_9_rc1.php rename to phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_9_rc2.php rename to phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_9_rc3.php rename to phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/3_0_9_rc4.php rename to phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php diff --git a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php similarity index 100% rename from phpBB/includes/db/migration/data/30x/local_url_bbcode.php rename to phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/phpbb/db/migration/data/310/avatars.php similarity index 100% rename from phpBB/includes/db/migration/data/310/avatars.php rename to phpBB/phpbb/db/migration/data/310/avatars.php diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/phpbb/db/migration/data/310/boardindex.php similarity index 100% rename from phpBB/includes/db/migration/data/310/boardindex.php rename to phpBB/phpbb/db/migration/data/310/boardindex.php diff --git a/phpBB/includes/db/migration/data/310/config_db_text.php b/phpBB/phpbb/db/migration/data/310/config_db_text.php similarity index 100% rename from phpBB/includes/db/migration/data/310/config_db_text.php rename to phpBB/phpbb/db/migration/data/310/config_db_text.php diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/phpbb/db/migration/data/310/dev.php similarity index 100% rename from phpBB/includes/db/migration/data/310/dev.php rename to phpBB/phpbb/db/migration/data/310/dev.php diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/phpbb/db/migration/data/310/extensions.php similarity index 100% rename from phpBB/includes/db/migration/data/310/extensions.php rename to phpBB/phpbb/db/migration/data/310/extensions.php diff --git a/phpBB/includes/db/migration/data/310/forgot_password.php b/phpBB/phpbb/db/migration/data/310/forgot_password.php similarity index 100% rename from phpBB/includes/db/migration/data/310/forgot_password.php rename to phpBB/phpbb/db/migration/data/310/forgot_password.php diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/phpbb/db/migration/data/310/jquery_update.php similarity index 100% rename from phpBB/includes/db/migration/data/310/jquery_update.php rename to phpBB/phpbb/db/migration/data/310/jquery_update.php diff --git a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php similarity index 100% rename from phpBB/includes/db/migration/data/310/notification_options_reconvert.php rename to phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/phpbb/db/migration/data/310/notifications.php similarity index 100% rename from phpBB/includes/db/migration/data/310/notifications.php rename to phpBB/phpbb/db/migration/data/310/notifications.php diff --git a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php similarity index 100% rename from phpBB/includes/db/migration/data/310/notifications_schema_fix.php rename to phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/phpbb/db/migration/data/310/reported_posts_display.php similarity index 100% rename from phpBB/includes/db/migration/data/310/reported_posts_display.php rename to phpBB/phpbb/db/migration/data/310/reported_posts_display.php diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/310/signature_module_auth.php similarity index 100% rename from phpBB/includes/db/migration/data/310/signature_module_auth.php rename to phpBB/phpbb/db/migration/data/310/signature_module_auth.php diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/phpbb/db/migration/data/310/softdelete_p1.php similarity index 100% rename from phpBB/includes/db/migration/data/310/softdelete_p1.php rename to phpBB/phpbb/db/migration/data/310/softdelete_p1.php diff --git a/phpBB/includes/db/migration/data/310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/310/softdelete_p2.php similarity index 100% rename from phpBB/includes/db/migration/data/310/softdelete_p2.php rename to phpBB/phpbb/db/migration/data/310/softdelete_p2.php diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/phpbb/db/migration/data/310/style_update_p1.php similarity index 100% rename from phpBB/includes/db/migration/data/310/style_update_p1.php rename to phpBB/phpbb/db/migration/data/310/style_update_p1.php diff --git a/phpBB/includes/db/migration/data/310/style_update_p2.php b/phpBB/phpbb/db/migration/data/310/style_update_p2.php similarity index 100% rename from phpBB/includes/db/migration/data/310/style_update_p2.php rename to phpBB/phpbb/db/migration/data/310/style_update_p2.php diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/phpbb/db/migration/data/310/teampage.php similarity index 100% rename from phpBB/includes/db/migration/data/310/teampage.php rename to phpBB/phpbb/db/migration/data/310/teampage.php diff --git a/phpBB/includes/db/migration/data/310/timezone.php b/phpBB/phpbb/db/migration/data/310/timezone.php similarity index 100% rename from phpBB/includes/db/migration/data/310/timezone.php rename to phpBB/phpbb/db/migration/data/310/timezone.php diff --git a/phpBB/includes/db/migration/data/310/timezone_p2.php b/phpBB/phpbb/db/migration/data/310/timezone_p2.php similarity index 100% rename from phpBB/includes/db/migration/data/310/timezone_p2.php rename to phpBB/phpbb/db/migration/data/310/timezone_p2.php diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php similarity index 100% rename from phpBB/includes/db/migration/exception.php rename to phpBB/phpbb/db/migration/exception.php diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php similarity index 100% rename from phpBB/includes/db/migration/migration.php rename to phpBB/phpbb/db/migration/migration.php diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php similarity index 100% rename from phpBB/includes/db/migration/tool/config.php rename to phpBB/phpbb/db/migration/tool/config.php diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/phpbb/db/migration/tool/interface.php similarity index 100% rename from phpBB/includes/db/migration/tool/interface.php rename to phpBB/phpbb/db/migration/tool/interface.php diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php similarity index 100% rename from phpBB/includes/db/migration/tool/module.php rename to phpBB/phpbb/db/migration/tool/module.php diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php similarity index 100% rename from phpBB/includes/db/migration/tool/permission.php rename to phpBB/phpbb/db/migration/tool/permission.php diff --git a/phpBB/includes/db/migrator.php b/phpBB/phpbb/db/migrator.php similarity index 100% rename from phpBB/includes/db/migrator.php rename to phpBB/phpbb/db/migrator.php diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/phpbb/db/sql_insert_buffer.php similarity index 100% rename from phpBB/includes/db/sql_insert_buffer.php rename to phpBB/phpbb/db/sql_insert_buffer.php diff --git a/phpBB/includes/di/extension/config.php b/phpBB/phpbb/di/extension/config.php similarity index 100% rename from phpBB/includes/di/extension/config.php rename to phpBB/phpbb/di/extension/config.php diff --git a/phpBB/includes/di/extension/core.php b/phpBB/phpbb/di/extension/core.php similarity index 100% rename from phpBB/includes/di/extension/core.php rename to phpBB/phpbb/di/extension/core.php diff --git a/phpBB/includes/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php similarity index 100% rename from phpBB/includes/di/extension/ext.php rename to phpBB/phpbb/di/extension/ext.php diff --git a/phpBB/includes/di/pass/collection_pass.php b/phpBB/phpbb/di/pass/collection_pass.php similarity index 100% rename from phpBB/includes/di/pass/collection_pass.php rename to phpBB/phpbb/di/pass/collection_pass.php diff --git a/phpBB/includes/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php similarity index 100% rename from phpBB/includes/di/pass/kernel_pass.php rename to phpBB/phpbb/di/pass/kernel_pass.php diff --git a/phpBB/includes/di/service_collection.php b/phpBB/phpbb/di/service_collection.php similarity index 100% rename from phpBB/includes/di/service_collection.php rename to phpBB/phpbb/di/service_collection.php diff --git a/phpBB/includes/error_collector.php b/phpBB/phpbb/error_collector.php similarity index 100% rename from phpBB/includes/error_collector.php rename to phpBB/phpbb/error_collector.php diff --git a/phpBB/includes/event/data.php b/phpBB/phpbb/event/data.php similarity index 100% rename from phpBB/includes/event/data.php rename to phpBB/phpbb/event/data.php diff --git a/phpBB/includes/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php similarity index 100% rename from phpBB/includes/event/dispatcher.php rename to phpBB/phpbb/event/dispatcher.php diff --git a/phpBB/includes/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php similarity index 100% rename from phpBB/includes/event/extension_subscriber_loader.php rename to phpBB/phpbb/event/extension_subscriber_loader.php diff --git a/phpBB/includes/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php similarity index 100% rename from phpBB/includes/event/kernel_exception_subscriber.php rename to phpBB/phpbb/event/kernel_exception_subscriber.php diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php similarity index 100% rename from phpBB/includes/event/kernel_request_subscriber.php rename to phpBB/phpbb/event/kernel_request_subscriber.php diff --git a/phpBB/includes/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php similarity index 100% rename from phpBB/includes/event/kernel_terminate_subscriber.php rename to phpBB/phpbb/event/kernel_terminate_subscriber.php diff --git a/phpBB/includes/extension/base.php b/phpBB/phpbb/extension/base.php similarity index 100% rename from phpBB/includes/extension/base.php rename to phpBB/phpbb/extension/base.php diff --git a/phpBB/includes/extension/exception.php b/phpBB/phpbb/extension/exception.php similarity index 100% rename from phpBB/includes/extension/exception.php rename to phpBB/phpbb/extension/exception.php diff --git a/phpBB/includes/extension/finder.php b/phpBB/phpbb/extension/finder.php similarity index 99% rename from phpBB/includes/extension/finder.php rename to phpBB/phpbb/extension/finder.php index 49bb2a514f..155a41cda5 100644 --- a/phpBB/includes/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -275,7 +275,7 @@ class phpbb_extension_finder $classes = array(); foreach ($files as $file => $ext_name) { - $file = preg_replace('#^includes/#', '', $file); + $file = preg_replace('#^(phpbb|includes)/#', '', $file); $classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext))); } @@ -377,7 +377,7 @@ class phpbb_extension_finder return $files; } - + /** * Finds all file system entries matching the configured options for one * specific extension diff --git a/phpBB/includes/extension/interface.php b/phpBB/phpbb/extension/interface.php similarity index 100% rename from phpBB/includes/extension/interface.php rename to phpBB/phpbb/extension/interface.php diff --git a/phpBB/includes/extension/manager.php b/phpBB/phpbb/extension/manager.php similarity index 100% rename from phpBB/includes/extension/manager.php rename to phpBB/phpbb/extension/manager.php diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php similarity index 100% rename from phpBB/includes/extension/metadata_manager.php rename to phpBB/phpbb/extension/metadata_manager.php diff --git a/phpBB/includes/extension/provider.php b/phpBB/phpbb/extension/provider.php similarity index 100% rename from phpBB/includes/extension/provider.php rename to phpBB/phpbb/extension/provider.php diff --git a/phpBB/includes/feed/base.php b/phpBB/phpbb/feed/base.php similarity index 100% rename from phpBB/includes/feed/base.php rename to phpBB/phpbb/feed/base.php diff --git a/phpBB/includes/feed/factory.php b/phpBB/phpbb/feed/factory.php similarity index 100% rename from phpBB/includes/feed/factory.php rename to phpBB/phpbb/feed/factory.php diff --git a/phpBB/includes/feed/forum.php b/phpBB/phpbb/feed/forum.php similarity index 100% rename from phpBB/includes/feed/forum.php rename to phpBB/phpbb/feed/forum.php diff --git a/phpBB/includes/feed/forums.php b/phpBB/phpbb/feed/forums.php similarity index 100% rename from phpBB/includes/feed/forums.php rename to phpBB/phpbb/feed/forums.php diff --git a/phpBB/includes/feed/helper.php b/phpBB/phpbb/feed/helper.php similarity index 100% rename from phpBB/includes/feed/helper.php rename to phpBB/phpbb/feed/helper.php diff --git a/phpBB/includes/feed/news.php b/phpBB/phpbb/feed/news.php similarity index 100% rename from phpBB/includes/feed/news.php rename to phpBB/phpbb/feed/news.php diff --git a/phpBB/includes/feed/overall.php b/phpBB/phpbb/feed/overall.php similarity index 100% rename from phpBB/includes/feed/overall.php rename to phpBB/phpbb/feed/overall.php diff --git a/phpBB/includes/feed/post_base.php b/phpBB/phpbb/feed/post_base.php similarity index 100% rename from phpBB/includes/feed/post_base.php rename to phpBB/phpbb/feed/post_base.php diff --git a/phpBB/includes/feed/topic.php b/phpBB/phpbb/feed/topic.php similarity index 100% rename from phpBB/includes/feed/topic.php rename to phpBB/phpbb/feed/topic.php diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php similarity index 100% rename from phpBB/includes/feed/topic_base.php rename to phpBB/phpbb/feed/topic_base.php diff --git a/phpBB/includes/feed/topics.php b/phpBB/phpbb/feed/topics.php similarity index 100% rename from phpBB/includes/feed/topics.php rename to phpBB/phpbb/feed/topics.php diff --git a/phpBB/includes/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php similarity index 100% rename from phpBB/includes/feed/topics_active.php rename to phpBB/phpbb/feed/topics_active.php diff --git a/phpBB/includes/filesystem.php b/phpBB/phpbb/filesystem.php similarity index 100% rename from phpBB/includes/filesystem.php rename to phpBB/phpbb/filesystem.php diff --git a/phpBB/includes/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php similarity index 100% rename from phpBB/includes/groupposition/exception.php rename to phpBB/phpbb/groupposition/exception.php diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/phpbb/groupposition/interface.php similarity index 100% rename from phpBB/includes/groupposition/interface.php rename to phpBB/phpbb/groupposition/interface.php diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php similarity index 100% rename from phpBB/includes/groupposition/legend.php rename to phpBB/phpbb/groupposition/legend.php diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php similarity index 100% rename from phpBB/includes/groupposition/teampage.php rename to phpBB/phpbb/groupposition/teampage.php diff --git a/phpBB/includes/hook/finder.php b/phpBB/phpbb/hook/finder.php similarity index 100% rename from phpBB/includes/hook/finder.php rename to phpBB/phpbb/hook/finder.php diff --git a/phpBB/includes/json_response.php b/phpBB/phpbb/json_response.php similarity index 100% rename from phpBB/includes/json_response.php rename to phpBB/phpbb/json_response.php diff --git a/phpBB/includes/lock/db.php b/phpBB/phpbb/lock/db.php similarity index 100% rename from phpBB/includes/lock/db.php rename to phpBB/phpbb/lock/db.php diff --git a/phpBB/includes/lock/flock.php b/phpBB/phpbb/lock/flock.php similarity index 100% rename from phpBB/includes/lock/flock.php rename to phpBB/phpbb/lock/flock.php diff --git a/phpBB/includes/log/interface.php b/phpBB/phpbb/log/interface.php similarity index 100% rename from phpBB/includes/log/interface.php rename to phpBB/phpbb/log/interface.php diff --git a/phpBB/includes/log/log.php b/phpBB/phpbb/log/log.php similarity index 100% rename from phpBB/includes/log/log.php rename to phpBB/phpbb/log/log.php diff --git a/phpBB/includes/notification/exception.php b/phpBB/phpbb/notification/exception.php similarity index 100% rename from phpBB/includes/notification/exception.php rename to phpBB/phpbb/notification/exception.php diff --git a/phpBB/includes/notification/manager.php b/phpBB/phpbb/notification/manager.php similarity index 100% rename from phpBB/includes/notification/manager.php rename to phpBB/phpbb/notification/manager.php diff --git a/phpBB/includes/notification/method/base.php b/phpBB/phpbb/notification/method/base.php similarity index 100% rename from phpBB/includes/notification/method/base.php rename to phpBB/phpbb/notification/method/base.php diff --git a/phpBB/includes/notification/method/email.php b/phpBB/phpbb/notification/method/email.php similarity index 100% rename from phpBB/includes/notification/method/email.php rename to phpBB/phpbb/notification/method/email.php diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/phpbb/notification/method/interface.php similarity index 100% rename from phpBB/includes/notification/method/interface.php rename to phpBB/phpbb/notification/method/interface.php diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php similarity index 100% rename from phpBB/includes/notification/method/jabber.php rename to phpBB/phpbb/notification/method/jabber.php diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php similarity index 100% rename from phpBB/includes/notification/method/messenger_base.php rename to phpBB/phpbb/notification/method/messenger_base.php diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php similarity index 100% rename from phpBB/includes/notification/type/approve_post.php rename to phpBB/phpbb/notification/type/approve_post.php diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php similarity index 100% rename from phpBB/includes/notification/type/approve_topic.php rename to phpBB/phpbb/notification/type/approve_topic.php diff --git a/phpBB/includes/notification/type/base.php b/phpBB/phpbb/notification/type/base.php similarity index 100% rename from phpBB/includes/notification/type/base.php rename to phpBB/phpbb/notification/type/base.php diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php similarity index 100% rename from phpBB/includes/notification/type/bookmark.php rename to phpBB/phpbb/notification/type/bookmark.php diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php similarity index 100% rename from phpBB/includes/notification/type/disapprove_post.php rename to phpBB/phpbb/notification/type/disapprove_post.php diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php similarity index 100% rename from phpBB/includes/notification/type/disapprove_topic.php rename to phpBB/phpbb/notification/type/disapprove_topic.php diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/phpbb/notification/type/interface.php similarity index 100% rename from phpBB/includes/notification/type/interface.php rename to phpBB/phpbb/notification/type/interface.php diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php similarity index 100% rename from phpBB/includes/notification/type/pm.php rename to phpBB/phpbb/notification/type/pm.php diff --git a/phpBB/includes/notification/type/post.php b/phpBB/phpbb/notification/type/post.php similarity index 100% rename from phpBB/includes/notification/type/post.php rename to phpBB/phpbb/notification/type/post.php diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php similarity index 100% rename from phpBB/includes/notification/type/post_in_queue.php rename to phpBB/phpbb/notification/type/post_in_queue.php diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php similarity index 100% rename from phpBB/includes/notification/type/quote.php rename to phpBB/phpbb/notification/type/quote.php diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php similarity index 100% rename from phpBB/includes/notification/type/report_pm.php rename to phpBB/phpbb/notification/type/report_pm.php diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php similarity index 100% rename from phpBB/includes/notification/type/report_pm_closed.php rename to phpBB/phpbb/notification/type/report_pm_closed.php diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php similarity index 100% rename from phpBB/includes/notification/type/report_post.php rename to phpBB/phpbb/notification/type/report_post.php diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php similarity index 100% rename from phpBB/includes/notification/type/report_post_closed.php rename to phpBB/phpbb/notification/type/report_post_closed.php diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php similarity index 100% rename from phpBB/includes/notification/type/topic.php rename to phpBB/phpbb/notification/type/topic.php diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php similarity index 100% rename from phpBB/includes/notification/type/topic_in_queue.php rename to phpBB/phpbb/notification/type/topic_in_queue.php diff --git a/phpBB/includes/php/ini.php b/phpBB/phpbb/php/ini.php similarity index 100% rename from phpBB/includes/php/ini.php rename to phpBB/phpbb/php/ini.php diff --git a/phpBB/includes/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php similarity index 100% rename from phpBB/includes/request/deactivated_super_global.php rename to phpBB/phpbb/request/deactivated_super_global.php diff --git a/phpBB/includes/request/interface.php b/phpBB/phpbb/request/interface.php similarity index 100% rename from phpBB/includes/request/interface.php rename to phpBB/phpbb/request/interface.php diff --git a/phpBB/includes/request/request.php b/phpBB/phpbb/request/request.php similarity index 100% rename from phpBB/includes/request/request.php rename to phpBB/phpbb/request/request.php diff --git a/phpBB/includes/request/type_cast_helper.php b/phpBB/phpbb/request/type_cast_helper.php similarity index 100% rename from phpBB/includes/request/type_cast_helper.php rename to phpBB/phpbb/request/type_cast_helper.php diff --git a/phpBB/includes/request/type_cast_helper_interface.php b/phpBB/phpbb/request/type_cast_helper_interface.php similarity index 100% rename from phpBB/includes/request/type_cast_helper_interface.php rename to phpBB/phpbb/request/type_cast_helper_interface.php diff --git a/phpBB/includes/search/base.php b/phpBB/phpbb/search/base.php similarity index 100% rename from phpBB/includes/search/base.php rename to phpBB/phpbb/search/base.php diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php similarity index 100% rename from phpBB/includes/search/fulltext_mysql.php rename to phpBB/phpbb/search/fulltext_mysql.php diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php similarity index 100% rename from phpBB/includes/search/fulltext_native.php rename to phpBB/phpbb/search/fulltext_native.php diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php similarity index 100% rename from phpBB/includes/search/fulltext_postgres.php rename to phpBB/phpbb/search/fulltext_postgres.php diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php similarity index 100% rename from phpBB/includes/search/fulltext_sphinx.php rename to phpBB/phpbb/search/fulltext_sphinx.php diff --git a/phpBB/includes/search/index.htm b/phpBB/phpbb/search/index.htm similarity index 100% rename from phpBB/includes/search/index.htm rename to phpBB/phpbb/search/index.htm diff --git a/phpBB/includes/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php similarity index 100% rename from phpBB/includes/search/sphinx/config.php rename to phpBB/phpbb/search/sphinx/config.php diff --git a/phpBB/includes/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php similarity index 100% rename from phpBB/includes/search/sphinx/config_comment.php rename to phpBB/phpbb/search/sphinx/config_comment.php diff --git a/phpBB/includes/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php similarity index 100% rename from phpBB/includes/search/sphinx/config_section.php rename to phpBB/phpbb/search/sphinx/config_section.php diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/phpbb/search/sphinx/config_variable.php similarity index 100% rename from phpBB/includes/search/sphinx/config_variable.php rename to phpBB/phpbb/search/sphinx/config_variable.php diff --git a/phpBB/includes/session.php b/phpBB/phpbb/session.php similarity index 100% rename from phpBB/includes/session.php rename to phpBB/phpbb/session.php diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/phpbb/style/extension_path_provider.php similarity index 100% rename from phpBB/includes/style/extension_path_provider.php rename to phpBB/phpbb/style/extension_path_provider.php diff --git a/phpBB/includes/style/path_provider.php b/phpBB/phpbb/style/path_provider.php similarity index 100% rename from phpBB/includes/style/path_provider.php rename to phpBB/phpbb/style/path_provider.php diff --git a/phpBB/includes/style/path_provider_interface.php b/phpBB/phpbb/style/path_provider_interface.php similarity index 100% rename from phpBB/includes/style/path_provider_interface.php rename to phpBB/phpbb/style/path_provider_interface.php diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/phpbb/style/resource_locator.php similarity index 100% rename from phpBB/includes/style/resource_locator.php rename to phpBB/phpbb/style/resource_locator.php diff --git a/phpBB/includes/style/style.php b/phpBB/phpbb/style/style.php similarity index 100% rename from phpBB/includes/style/style.php rename to phpBB/phpbb/style/style.php diff --git a/phpBB/includes/template/asset.php b/phpBB/phpbb/template/asset.php similarity index 100% rename from phpBB/includes/template/asset.php rename to phpBB/phpbb/template/asset.php diff --git a/phpBB/includes/template/context.php b/phpBB/phpbb/template/context.php similarity index 100% rename from phpBB/includes/template/context.php rename to phpBB/phpbb/template/context.php diff --git a/phpBB/includes/template/locator.php b/phpBB/phpbb/template/locator.php similarity index 100% rename from phpBB/includes/template/locator.php rename to phpBB/phpbb/template/locator.php diff --git a/phpBB/includes/template/template.php b/phpBB/phpbb/template/template.php similarity index 100% rename from phpBB/includes/template/template.php rename to phpBB/phpbb/template/template.php diff --git a/phpBB/includes/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php similarity index 100% rename from phpBB/includes/template/twig/definition.php rename to phpBB/phpbb/template/twig/definition.php diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php similarity index 100% rename from phpBB/includes/template/twig/environment.php rename to phpBB/phpbb/template/twig/environment.php diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php similarity index 100% rename from phpBB/includes/template/twig/extension.php rename to phpBB/phpbb/template/twig/extension.php diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php similarity index 100% rename from phpBB/includes/template/twig/lexer.php rename to phpBB/phpbb/template/twig/lexer.php diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/define.php similarity index 100% rename from phpBB/includes/template/twig/node/define.php rename to phpBB/phpbb/template/twig/node/define.php diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php similarity index 100% rename from phpBB/includes/template/twig/node/event.php rename to phpBB/phpbb/template/twig/node/event.php diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php similarity index 100% rename from phpBB/includes/template/twig/node/expression/binary/equalequal.php rename to phpBB/phpbb/template/twig/node/expression/binary/equalequal.php diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php similarity index 100% rename from phpBB/includes/template/twig/node/expression/binary/notequalequal.php rename to phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/include.php similarity index 100% rename from phpBB/includes/template/twig/node/include.php rename to phpBB/phpbb/template/twig/node/include.php diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php similarity index 100% rename from phpBB/includes/template/twig/node/includeasset.php rename to phpBB/phpbb/template/twig/node/includeasset.php diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php similarity index 100% rename from phpBB/includes/template/twig/node/includecss.php rename to phpBB/phpbb/template/twig/node/includecss.php diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php similarity index 100% rename from phpBB/includes/template/twig/node/includejs.php rename to phpBB/phpbb/template/twig/node/includejs.php diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php similarity index 100% rename from phpBB/includes/template/twig/node/includephp.php rename to phpBB/phpbb/template/twig/node/includephp.php diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php similarity index 100% rename from phpBB/includes/template/twig/node/php.php rename to phpBB/phpbb/template/twig/node/php.php diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/phpbb/template/twig/tokenparser/define.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/define.php rename to phpBB/phpbb/template/twig/tokenparser/define.php diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/event.php rename to phpBB/phpbb/template/twig/tokenparser/event.php diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/phpbb/template/twig/tokenparser/include.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/include.php rename to phpBB/phpbb/template/twig/tokenparser/include.php diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/includecss.php rename to phpBB/phpbb/template/twig/tokenparser/includecss.php diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/includejs.php rename to phpBB/phpbb/template/twig/tokenparser/includejs.php diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/includephp.php rename to phpBB/phpbb/template/twig/tokenparser/includephp.php diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php similarity index 100% rename from phpBB/includes/template/twig/tokenparser/php.php rename to phpBB/phpbb/template/twig/tokenparser/php.php diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php similarity index 100% rename from phpBB/includes/template/twig/twig.php rename to phpBB/phpbb/template/twig/twig.php diff --git a/phpBB/includes/tree/interface.php b/phpBB/phpbb/tree/interface.php similarity index 100% rename from phpBB/includes/tree/interface.php rename to phpBB/phpbb/tree/interface.php diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php similarity index 100% rename from phpBB/includes/tree/nestedset.php rename to phpBB/phpbb/tree/nestedset.php diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php similarity index 100% rename from phpBB/includes/tree/nestedset_forum.php rename to phpBB/phpbb/tree/nestedset_forum.php diff --git a/phpBB/includes/user.php b/phpBB/phpbb/user.php similarity index 100% rename from phpBB/includes/user.php rename to phpBB/phpbb/user.php diff --git a/phpBB/includes/user_loader.php b/phpBB/phpbb/user_loader.php similarity index 100% rename from phpBB/includes/user_loader.php rename to phpBB/phpbb/user_loader.php diff --git a/phpunit.xml.all b/phpunit.xml.all index d47864e104..d18518d3e3 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -27,9 +27,10 @@ ./phpBB/includes/ + ./phpBB/phpbb/ - ./phpBB/includes/search/fulltext_native.php - ./phpBB/includes/search/fulltext_mysql.php + ./phpBB/phpbb/search/fulltext_native.php + ./phpBB/phpbb/search/fulltext_mysql.php ./phpBB/includes/captcha/ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ac45597b45..c852f91b50 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -34,9 +34,10 @@ ./phpBB/includes/ + ./phpBB/phpbb/ - ./phpBB/includes/search/fulltext_native.php - ./phpBB/includes/search/fulltext_mysql.php + ./phpBB/phpbb/search/fulltext_native.php + ./phpBB/phpbb/search/fulltext_mysql.php ./phpBB/includes/captcha/ diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 3a3d653b47..cd9cc8771f 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -33,9 +33,10 @@ ./phpBB/includes/ + ./phpBB/phpbb/ - ./phpBB/includes/search/fulltext_native.php - ./phpBB/includes/search/fulltext_mysql.php + ./phpBB/phpbb/search/fulltext_native.php + ./phpBB/phpbb/search/fulltext_mysql.php ./phpBB/includes/captcha/ diff --git a/tests/bootstrap.php b/tests/bootstrap.php index a38740c82d..68cbb64c03 100644 --- a/tests/bootstrap.php +++ b/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'; diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index bf27c7c217..2b55c1ff8d 100644 --- a/tests/class_loader/class_loader_test.php +++ b/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', diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/phpbb/class_name.php similarity index 100% rename from tests/class_loader/includes/class_name.php rename to tests/class_loader/phpbb/class_name.php diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/phpbb/dir.php similarity index 100% rename from tests/class_loader/includes/dir.php rename to tests/class_loader/phpbb/dir.php diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php similarity index 100% rename from tests/class_loader/includes/dir/class_name.php rename to tests/class_loader/phpbb/dir/class_name.php diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php similarity index 100% rename from tests/class_loader/includes/dir/subdir/class_name.php rename to tests/class_loader/phpbb/dir/subdir/class_name.php diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php similarity index 100% rename from tests/class_loader/includes/dir2/dir2.php rename to tests/class_loader/phpbb/dir2/dir2.php diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index c06bf7d548..dfc4f80469 100644 --- a/tests/controller/controller_test.php +++ b/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); diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/phpbb/controller/foo.php similarity index 100% rename from tests/controller/includes/controller/foo.php rename to tests/controller/phpbb/controller/foo.php diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index c28925272e..2d97672878 100644 --- a/tests/datetime/from_format_test.php +++ b/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 diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 1e40c9c6d6..07eb666e93 100644 --- a/tests/dbal/migrator_test.php +++ b/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'; diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php index 7d582f230b..b82d1ef48d 100644 --- a/tests/dbal/migrator_tool_config_test.php +++ b/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() diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index 3303086b26..828fb76c65 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/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 { diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php index 438ab2b28e..79d9db66da 100644 --- a/tests/dbal/migrator_tool_permission_test.php +++ b/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 { diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php index d67dea3719..fceb8aa3d8 100644 --- a/tests/error_collector_test.php +++ b/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 { diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 6f3cebbd7c..3bf2c42573 100644 --- a/tests/extension/finder_test.php +++ b/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', diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/phpbb/default/implementation.php similarity index 100% rename from tests/extension/includes/default/implementation.php rename to tests/extension/phpbb/default/implementation.php diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 1ab9488568..6827aaa1b6 100644 --- a/tests/log/function_view_log_test.php +++ b/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'; diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index 1665c493be..8b9df33a63 100644 --- a/tests/upload/fileupload_test.php +++ b/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 {