From 49c12ef4be229bf2223139298766ef441b075fbc Mon Sep 17 00:00:00 2001 From: Fred Sauer Date: Tue, 11 Jun 2013 11:18:19 -0700 Subject: [PATCH 001/102] [ticket/11606] remove preg_replace() /e modifier in make_clickable() PHPBB3-11606 --- phpBB/includes/functions_content.php | 49 ++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c54cc25f34..9b8ba98bec 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -727,37 +727,58 @@ function make_clickable($text, $server_url = false, $class = 'postlink') $server_url = generate_board_url(); } - static $magic_url_match; - static $magic_url_replace; static $static_class; + static $magic_url_match_args; - if (!is_array($magic_url_match) || $static_class != $class) + if (!is_array($magic_url_match_args) || $static_class != $class) { $static_class = $class; $class = ($static_class) ? ' class="' . $static_class . '"' : ''; $local_class = ($static_class) ? ' class="' . $static_class . '-local"' : ''; - $magic_url_match = $magic_url_replace = array(); - // Be sure to not let the matches cross over. ;) + $magic_url_match_args = array(); // relative urls for this board - $magic_url_match[] = '#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')"; + $magic_url_match_args[] = array( + '#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#i', + MAGIC_URL_LOCAL, + $local_class, + ); // matches a xxxx://aaaaa.bbb.cccc. ... - $magic_url_match[] = '#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')"; + $magic_url_match_args[] = array( + '#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#i', + MAGIC_URL_FULL, + $class, + ); // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing - $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')"; + $magic_url_match_args[] = array( + '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#i', + MAGIC_URL_WWW, + $class, + ); // matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode. - $magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')"; + $magic_url_match_args[] = array( + '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/i', + MAGIC_URL_EMAIL, + '', + ); } - return preg_replace($magic_url_match, $magic_url_replace, $text); + foreach ($magic_url_match_args as $magic_args) + { + if (preg_match($magic_args[0], $text, $matches)) + { + $text = preg_replace_callback($magic_args[0], function($matches) use ($magic_args) + { + return make_clickable_callback($magic_args[1], $matches[1], $matches[2], $matches[3], $magic_args[2]); + }, $text); + } + } + + return $text; } /** From b81613e5e57fd208e832637b6886abf9ec806c4b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 12:25:28 -0400 Subject: [PATCH 002/102] [ticket/11700] With namespaces interface will no longer be a valid classname PHPBB3-11700 --- .../auth/provider/{interface.php => provider_interface.php} | 4 ++-- .../avatar/driver/{interface.php => driver_interface.php} | 2 +- .../cache/driver/{interface.php => driver_interface.php} | 2 +- .../db/migration/tool/{interface.php => tool_interface.php} | 2 +- .../extension/{interface.php => extension_interface.php} | 2 +- .../{interface.php => groupposition_interface.php} | 4 ++-- phpBB/phpbb/log/{interface.php => log_interface.php} | 2 +- .../method/{interface.php => method_interface.php} | 2 +- .../notification/type/{interface.php => type_interface.php} | 4 ++-- phpBB/phpbb/request/{interface.php => request_interface.php} | 2 +- phpBB/phpbb/tree/{interface.php => tree_interface.php} | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename phpBB/phpbb/auth/provider/{interface.php => provider_interface.php} (98%) rename phpBB/phpbb/avatar/driver/{interface.php => driver_interface.php} (98%) rename phpBB/phpbb/cache/driver/{interface.php => driver_interface.php} (98%) rename phpBB/phpbb/db/migration/tool/{interface.php => tool_interface.php} (92%) rename phpBB/phpbb/extension/{interface.php => extension_interface.php} (97%) rename phpBB/phpbb/groupposition/{interface.php => groupposition_interface.php} (95%) rename phpBB/phpbb/log/{interface.php => log_interface.php} (98%) rename phpBB/phpbb/notification/method/{interface.php => method_interface.php} (93%) rename phpBB/phpbb/notification/type/{interface.php => type_interface.php} (98%) rename phpBB/phpbb/request/{interface.php => request_interface.php} (99%) rename phpBB/phpbb/tree/{interface.php => tree_interface.php} (99%) diff --git a/phpBB/phpbb/auth/provider/interface.php b/phpBB/phpbb/auth/provider/provider_interface.php similarity index 98% rename from phpBB/phpbb/auth/provider/interface.php rename to phpBB/phpbb/auth/provider/provider_interface.php index 47043bc107..baf55c7a86 100644 --- a/phpBB/phpbb/auth/provider/interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -interface phpbb_auth_provider_interface +interface phpbb_auth_provider_provider_interface { /** * Checks whether the user is currently identified to the authentication @@ -98,7 +98,7 @@ interface phpbb_auth_provider_interface * into phpBB. * * @param array $user - * @return boolean true if the given user is authenticated, false if the + * @return boolean true if the given user is authenticated, false if the * session should be closed, or null if not implemented. */ public function validate_session($user); diff --git a/phpBB/phpbb/avatar/driver/interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php similarity index 98% rename from phpBB/phpbb/avatar/driver/interface.php rename to phpBB/phpbb/avatar/driver/driver_interface.php index 3d62969aef..0a44a7a1fe 100644 --- a/phpBB/phpbb/avatar/driver/interface.php +++ b/phpBB/phpbb/avatar/driver/driver_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Interface for avatar drivers * @package phpBB3 */ -interface phpbb_avatar_driver_interface +interface phpbb_avatar_driver_driver_interface { /** * Returns the name of the driver. diff --git a/phpBB/phpbb/cache/driver/interface.php b/phpBB/phpbb/cache/driver/driver_interface.php similarity index 98% rename from phpBB/phpbb/cache/driver/interface.php rename to phpBB/phpbb/cache/driver/driver_interface.php index 53f684d1c8..34028b82e2 100644 --- a/phpBB/phpbb/cache/driver/interface.php +++ b/phpBB/phpbb/cache/driver/driver_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package acm */ -interface phpbb_cache_driver_interface +interface phpbb_cache_driver_driver_interface { /** * Load global cache diff --git a/phpBB/phpbb/db/migration/tool/interface.php b/phpBB/phpbb/db/migration/tool/tool_interface.php similarity index 92% rename from phpBB/phpbb/db/migration/tool/interface.php rename to phpBB/phpbb/db/migration/tool/tool_interface.php index ced53b2023..72344d50d2 100644 --- a/phpBB/phpbb/db/migration/tool/interface.php +++ b/phpBB/phpbb/db/migration/tool/tool_interface.php @@ -12,7 +12,7 @@ * * @package db */ -interface phpbb_db_migration_tool_interface +interface phpbb_db_migration_tool_tool_interface { /** * Retrieve a short name used for commands in migrations. diff --git a/phpBB/phpbb/extension/interface.php b/phpBB/phpbb/extension/extension_interface.php similarity index 97% rename from phpBB/phpbb/extension/interface.php rename to phpBB/phpbb/extension/extension_interface.php index 7b36a12bf6..b922499738 100644 --- a/phpBB/phpbb/extension/interface.php +++ b/phpBB/phpbb/extension/extension_interface.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package extension */ -interface phpbb_extension_interface +interface phpbb_extension_extension_interface { /** * enable_step is executed on enabling an extension until it returns false. diff --git a/phpBB/phpbb/groupposition/interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php similarity index 95% rename from phpBB/phpbb/groupposition/interface.php rename to phpBB/phpbb/groupposition/groupposition_interface.php index eacc04e1a4..0f29984588 100644 --- a/phpBB/phpbb/groupposition/interface.php +++ b/phpBB/phpbb/groupposition/groupposition_interface.php @@ -22,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_groupposition_interface +interface phpbb_groupposition_groupposition_interface { /** * Returns the value for a given group, if the group exists. @@ -32,7 +32,7 @@ interface phpbb_groupposition_interface public function get_group_value($group_id); /** - * Get number of groups displayed + * Get number of groups displayed * * @return int value of the last item displayed */ diff --git a/phpBB/phpbb/log/interface.php b/phpBB/phpbb/log/log_interface.php similarity index 98% rename from phpBB/phpbb/log/interface.php rename to phpBB/phpbb/log/log_interface.php index 3b459c9bdf..2d41c9994f 100644 --- a/phpBB/phpbb/log/interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_log */ -interface phpbb_log_interface +interface phpbb_log_log_interface { /** * This function returns the state of the log system. diff --git a/phpBB/phpbb/notification/method/interface.php b/phpBB/phpbb/notification/method/method_interface.php similarity index 93% rename from phpBB/phpbb/notification/method/interface.php rename to phpBB/phpbb/notification/method/method_interface.php index ef875942cc..b3ca757d5f 100644 --- a/phpBB/phpbb/notification/method/interface.php +++ b/phpBB/phpbb/notification/method/method_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications method interface * @package notifications */ -interface phpbb_notification_method_interface +interface phpbb_notification_method_method_interface { /** * Get notification method name diff --git a/phpBB/phpbb/notification/type/interface.php b/phpBB/phpbb/notification/type/type_interface.php similarity index 98% rename from phpBB/phpbb/notification/type/interface.php rename to phpBB/phpbb/notification/type/type_interface.php index a40fdafd09..f9c65f7286 100644 --- a/phpBB/phpbb/notification/type/interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications interface * @package notifications */ -interface phpbb_notification_type_interface +interface phpbb_notification_type_type_interface { /** * Get notification type name @@ -27,7 +27,7 @@ interface phpbb_notification_type_interface * @return string */ public function get_type(); - + /** * Set initial data from the database * diff --git a/phpBB/phpbb/request/interface.php b/phpBB/phpbb/request/request_interface.php similarity index 99% rename from phpBB/phpbb/request/interface.php rename to phpBB/phpbb/request/request_interface.php index 741db35917..482f0f1287 100644 --- a/phpBB/phpbb/request/interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -interface phpbb_request_interface +interface phpbb_request_request_interface { /**#@+ * Constant identifying the super global with the same name. diff --git a/phpBB/phpbb/tree/interface.php b/phpBB/phpbb/tree/tree_interface.php similarity index 99% rename from phpBB/phpbb/tree/interface.php rename to phpBB/phpbb/tree/tree_interface.php index cc8aab2115..80d3c4377c 100644 --- a/phpBB/phpbb/tree/interface.php +++ b/phpBB/phpbb/tree/tree_interface.php @@ -15,7 +15,7 @@ if (!defined('IN_PHPBB')) exit; } -interface phpbb_tree_interface +interface phpbb_tree_tree_interface { /** * Inserts an item into the database table and into the tree. From da2752e4004b296ae5acdd08b7c0a758d8f61e9d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 13:30:52 -0400 Subject: [PATCH 003/102] [ticket/11700] Modify all code to use the new interface names PHPBB3-11700 --- phpBB/includes/acp/acp_attachments.php | 2 +- phpBB/includes/acp/acp_board.php | 2 +- phpBB/includes/acp/acp_icons.php | 4 +- phpBB/includes/acp/acp_language.php | 4 +- phpBB/includes/acp/acp_logs.php | 4 +- phpBB/includes/acp/acp_permissions.php | 8 +-- phpBB/includes/acp/acp_profile.php | 4 +- phpBB/includes/functions.php | 44 +++++++-------- phpBB/includes/functions_admin.php | 2 +- phpBB/includes/functions_display.php | 10 ++-- phpBB/includes/functions_upload.php | 2 +- phpBB/includes/mcp/mcp_forum.php | 4 +- phpBB/includes/mcp/mcp_main.php | 8 +-- phpBB/includes/mcp/mcp_queue.php | 6 +- phpBB/includes/message_parser.php | 2 +- phpBB/includes/ucp/ucp_groups.php | 4 +- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/includes/ucp/ucp_profile.php | 6 +- phpBB/install/install_update.php | 4 +- phpBB/mcp.php | 2 +- phpBB/memberlist.php | 2 +- phpBB/phpbb/auth/provider/apache.php | 8 +-- phpBB/phpbb/auth/provider/base.php | 2 +- phpBB/phpbb/avatar/driver/driver.php | 8 +-- phpBB/phpbb/cache/driver/base.php | 2 +- phpBB/phpbb/cache/service.php | 12 ++-- phpBB/phpbb/class_loader.php | 8 +-- phpBB/phpbb/config/db.php | 6 +- phpBB/phpbb/cron/task/core/prune_forum.php | 6 +- phpBB/phpbb/cron/task/core/tidy_cache.php | 4 +- phpBB/phpbb/cron/task/parametrized.php | 6 +- phpBB/phpbb/db/migration/tool/config.php | 2 +- phpBB/phpbb/db/migration/tool/module.php | 2 +- phpBB/phpbb/db/migration/tool/permission.php | 2 +- phpBB/phpbb/extension/base.php | 2 +- phpBB/phpbb/extension/finder.php | 4 +- phpBB/phpbb/extension/manager.php | 6 +- phpBB/phpbb/feed/base.php | 6 +- phpBB/phpbb/groupposition/legend.php | 2 +- phpBB/phpbb/groupposition/teampage.php | 8 +-- phpBB/phpbb/hook/finder.php | 4 +- phpBB/phpbb/log/log.php | 2 +- phpBB/phpbb/notification/manager.php | 4 +- phpBB/phpbb/notification/method/base.php | 12 ++-- .../notification/method/method_interface.php | 4 +- phpBB/phpbb/notification/type/base.php | 8 +-- .../request/deactivated_super_global.php | 10 ++-- phpBB/phpbb/request/request.php | 56 +++++++++---------- phpBB/phpbb/request/request_interface.php | 22 ++++---- phpBB/phpbb/session.php | 6 +- phpBB/phpbb/tree/nestedset.php | 2 +- phpBB/posting.php | 2 +- phpBB/search.php | 2 +- phpBB/ucp.php | 4 +- phpBB/viewtopic.php | 4 +- tests/auth/provider_apache_test.php | 8 +-- tests/avatar/manager_test.php | 2 +- tests/mock/cache.php | 2 +- tests/mock/request.php | 32 +++++------ .../request/deactivated_super_global_test.php | 2 +- tests/security/extract_current_page_test.php | 4 +- 61 files changed, 207 insertions(+), 207 deletions(-) diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index d0e8ff3882..f7b3a166dd 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1472,7 +1472,7 @@ class acp_attachments $ip_list = array_unique(explode("\n", $ips)); $ip_list_log = implode(', ', $ip_list); - $ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_interface::POST); + $ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_request_interface::POST); $iplist = array(); $hostlist = array(); diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 12e2a1bf72..2a0d517307 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -679,7 +679,7 @@ class acp_board foreach ($auth_providers as $key => $value) { - if (!($value instanceof phpbb_auth_provider_interface)) + if (!($value instanceof phpbb_auth_provider_provider_interface)) { continue; } diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index db4b4263b0..f72ac82f6a 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -338,7 +338,7 @@ class acp_icons $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); // Ok, add the relevant bits if we are adding new codes to existing emoticons... - if ($request->variable('add_additional_code', false, false, phpbb_request_interface::POST)) + if ($request->variable('add_additional_code', false, false, phpbb_request_request_interface::POST)) { $add_image = request_var('add_image', ''); $add_code = utf8_normalize_nfc(request_var('add_code', '', true)); @@ -354,7 +354,7 @@ class acp_icons $image_width[$add_image] = request_var('add_width', 0); $image_height[$add_image] = request_var('add_height', 0); - if ($request->variable('add_display_on_posting', false, false, phpbb_request_interface::POST)) + if ($request->variable('add_display_on_posting', false, false, phpbb_request_request_interface::POST)) { $image_display_on_posting[$add_image] = 1; } diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 2be1ccfc41..9d3532244f 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -161,7 +161,7 @@ class acp_language 'method' => $method) ); - $hidden_data .= build_hidden_fields(array('entry' => $request->variable('entry', $request_default, true, phpbb_request_interface::POST))); + $hidden_data .= build_hidden_fields(array('entry' => $request->variable('entry', $request_default, true, phpbb_request_request_interface::POST))); $template->assign_vars(array( 'S_UPLOAD' => true, @@ -218,7 +218,7 @@ class acp_language trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); } - $entry_value = $request->variable('entry', $request_default, true, phpbb_request_interface::POST); + $entry_value = $request->variable('entry', $request_default, true, phpbb_request_request_interface::POST); if (!$lang_id || !$entry_value) { diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index d86521532c..2120f67675 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -35,8 +35,8 @@ class acp_logs $forum_id = request_var('f', 0); $topic_id = request_var('t', 0); $start = request_var('start', 0); - $deletemark = $request->variable('delmarked', false, false, phpbb_request_interface::POST); - $deleteall = $request->variable('delall', false, false, phpbb_request_interface::POST); + $deletemark = $request->variable('delmarked', false, false, phpbb_request_request_interface::POST); + $deleteall = $request->variable('delall', false, false, phpbb_request_request_interface::POST); $marked = request_var('mark', array(0)); // Sort keys diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index a64765f4f5..57e14c4787 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -676,7 +676,7 @@ class acp_permissions list($ug_id, ) = each($psubmit); list($forum_id, ) = each($psubmit[$ug_id]); - $settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_interface::POST); + $settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_request_interface::POST); if (empty($settings) || empty($settings[$ug_id]) || empty($settings[$ug_id][$forum_id])) { trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING); @@ -685,7 +685,7 @@ class acp_permissions $auth_settings = $settings[$ug_id][$forum_id]; // Do we have a role we want to set? - $roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_interface::POST); + $roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_request_interface::POST); $assigned_role = (isset($roles[$ug_id][$forum_id])) ? (int) $roles[$ug_id][$forum_id] : 0; // Do the admin want to set these permissions to other items too? @@ -757,8 +757,8 @@ class acp_permissions trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $auth_settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_interface::POST); - $auth_roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_interface::POST); + $auth_settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_request_interface::POST); + $auth_roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_request_interface::POST); $ug_ids = $forum_ids = array(); // We need to go through the auth settings diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 849160f1fa..09a88d4311 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -510,7 +510,7 @@ class acp_profile $cp->vars['field_default_value_month'] = $now['mon']; $cp->vars['field_default_value_year'] = $now['year']; $var = 'now'; - $request->overwrite('field_default_value', $var, phpbb_request_interface::POST); + $request->overwrite('field_default_value', $var, phpbb_request_request_interface::POST); } else { @@ -520,7 +520,7 @@ class acp_profile $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); $var = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); - $request->overwrite('field_default_value', $var, phpbb_request_interface::POST); + $request->overwrite('field_default_value', $var, phpbb_request_request_interface::POST); } else { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 49f2e469bc..174ba712ba 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -32,7 +32,7 @@ function set_var(&$result, $var, $type, $multibyte = false) /** * Wrapper function of phpbb_request::variable which exists for backwards compatability. -* See {@link phpbb_request_interface::variable phpbb_request_interface::variable} for +* See {@link phpbb_request_request_interface::variable phpbb_request_request_interface::variable} for * documentation of this function's use. * * @deprecated @@ -40,20 +40,20 @@ function set_var(&$result, $var, $type, $multibyte = false) * If the value is an array this may be an array of indizes which will give * direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a") * then specifying array("var", 1) as the name will return "a". -* If you pass an instance of {@link phpbb_request_interface phpbb_request_interface} +* If you pass an instance of {@link phpbb_request_request_interface phpbb_request_interface} * as this parameter it will overwrite the current request class instance. If you do * not do so, it will create its own instance (but leave superglobals enabled). * @param mixed $default A default value that is returned if the variable was not set. * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks -* @param bool $cookie This param is mapped to phpbb_request_interface::COOKIE as the last param for -* phpbb_request_interface::variable for backwards compatability reasons. -* @param phpbb_request_interface|null|false If an instance of phpbb_request_interface is given the instance is stored in +* @param bool $cookie This param is mapped to phpbb_request_request_interface::COOKIE as the last param for +* phpbb_request_request_interface::variable for backwards compatability reasons. +* @param phpbb_request_request_interface|null|false If an instance of phpbb_request_request_interface is given the instance is stored in * a static variable and used for all further calls where this parameters is null. Until * the function is called with an instance it automatically creates a new phpbb_request * instance on every call. By passing false this per-call instantiation can be restored -* after having passed in a phpbb_request_interface instance. +* after having passed in a phpbb_request_request_interface instance. * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. @@ -64,7 +64,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ // the only real code is the function call which maps this function to a method. static $static_request = null; - if ($request instanceof phpbb_request_interface) + if ($request instanceof phpbb_request_request_interface) { $static_request = $request; @@ -93,7 +93,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ $tmp_request = new phpbb_request(new phpbb_request_type_cast_helper(), false); } - return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? phpbb_request_interface::COOKIE : phpbb_request_interface::REQUEST); + return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? phpbb_request_request_interface::COOKIE : phpbb_request_request_interface::REQUEST); } /** @@ -1391,7 +1391,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); unset($tracking_topics['tf']); @@ -1400,7 +1400,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ $tracking_topics['l'] = base_convert($post_time - $config['board_startdate'], 10, 36); $user->set_cookie('track', tracking_serialize($tracking_topics), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking_topics), phpbb_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking_topics), phpbb_request_request_interface::COOKIE); unset($tracking_topics); @@ -1503,7 +1503,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking = ($tracking) ? tracking_unserialize($tracking) : array(); foreach ($forum_id as $f_id) @@ -1534,7 +1534,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } $user->set_cookie('track', tracking_serialize($tracking), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_request_interface::COOKIE); unset($tracking); } @@ -1591,7 +1591,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking = ($tracking) ? tracking_unserialize($tracking) : array(); $topic_id36 = base_convert($topic_id, 10, 36); @@ -1605,7 +1605,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ // If the cookie grows larger than 10000 characters we will remove the smallest value // This can result in old topics being unread - but most of the time it should be accurate... - if (strlen($request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE)) > 10000) + if (strlen($request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE)) > 10000) { //echo 'Cookie grown too large' . print_r($tracking, true); @@ -1650,7 +1650,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } $user->set_cookie('track', tracking_serialize($tracking), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_request_interface::COOKIE); } return; @@ -1788,7 +1788,7 @@ function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_lis if (!isset($tracking_topics) || !sizeof($tracking_topics)) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } @@ -1985,7 +1985,7 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); if (!$user->data['is_registered']) @@ -3094,7 +3094,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo return false; } - $confirm = ($user->lang['YES'] === $request->variable('confirm', '', true, phpbb_request_interface::POST)); + $confirm = ($user->lang['YES'] === $request->variable('confirm', '', true, phpbb_request_request_interface::POST)); if ($check && $confirm) { @@ -4896,7 +4896,7 @@ function phpbb_http_login($param) $username = null; foreach ($username_keys as $k) { - if ($request->is_set($k, phpbb_request_interface::SERVER)) + if ($request->is_set($k, phpbb_request_request_interface::SERVER)) { $username = htmlspecialchars_decode($request->server($k)); break; @@ -4906,7 +4906,7 @@ function phpbb_http_login($param) $password = null; foreach ($password_keys as $k) { - if ($request->is_set($k, phpbb_request_interface::SERVER)) + if ($request->is_set($k, phpbb_request_request_interface::SERVER)) { $password = htmlspecialchars_decode($request->server($k)); break; @@ -5013,7 +5013,7 @@ function phpbb_quoteattr($data, $entities = null) */ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) { - $names = $request->variable_names(phpbb_request_interface::GET); + $names = $request->variable_names(phpbb_request_request_interface::GET); $hidden = ''; foreach ($names as $name) { @@ -5035,7 +5035,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) // here. To avoid exposing cookies, skip variables that are // overwritten somewhere other than GET entirely. $value = $request->variable($name, '', true); - $get_value = $request->variable($name, '', true, phpbb_request_interface::GET); + $get_value = $request->variable($name, '', true, phpbb_request_request_interface::GET); if ($value === $get_value) { $escaped_value = phpbb_quoteattr($value); diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index fc29492ac1..fada0b52be 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2349,7 +2349,7 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr * must be carried through for the moderators table. * * @param phpbb_db_driver $db Database connection -* @param phpbb_cache_driver_interface Cache driver +* @param phpbb_cache_driver_driver_interface Cache driver * @param phpbb_auth $auth Authentication object * @return null */ diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index b1dac64bec..f05c88419a 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -104,7 +104,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); if (!$user->data['is_registered']) @@ -1164,7 +1164,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true)) { - if ($uid != $user_id || $request->variable('unwatch', '', false, phpbb_request_interface::GET) != $mode) + if ($uid != $user_id || $request->variable('unwatch', '', false, phpbb_request_request_interface::GET) != $mode) { $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); $message = $user->lang['ERR_UNWATCHING'] . '

' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); @@ -1229,7 +1229,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true)) { - if ($uid != $user_id || $request->variable('watch', '', false, phpbb_request_interface::GET) != $mode) + if ($uid != $user_id || $request->variable('watch', '', false, phpbb_request_request_interface::GET) != $mode) { $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); $message = $user->lang['ERR_WATCHING'] . '

' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); @@ -1272,8 +1272,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, } else { - if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', false, phpbb_request_interface::GET) == $mode) || - (isset($_GET['watch']) && $request->variable('watch', '', false, phpbb_request_interface::GET) == $mode)) + if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', false, phpbb_request_request_interface::GET) == $mode) || + (isset($_GET['watch']) && $request->variable('watch', '', false, phpbb_request_request_interface::GET) == $mode)) { login_box(); } diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 4f31a85e83..6261231c09 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -713,7 +713,7 @@ class fileupload } $this->common_checks($file); - $request->overwrite('local', $upload, phpbb_request_interface::FILES); + $request->overwrite('local', $upload, phpbb_request_request_interface::FILES); return $file; } diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 841a0afddb..5439aba232 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -36,8 +36,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info) // Fixes a "bug" that makes forum_view use the same ordering as topic_view $request->overwrite('sk', null); $request->overwrite('sd', null); - $request->overwrite('sk', null, phpbb_request_interface::POST); - $request->overwrite('sd', null, phpbb_request_interface::POST); + $request->overwrite('sk', null, phpbb_request_request_interface::POST); + $request->overwrite('sd', null, phpbb_request_request_interface::POST); } $forum_id = $forum_info['forum_id']; diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 275edbe55a..989419cc49 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -462,7 +462,7 @@ function mcp_move_topic($topic_ids) if (!$to_forum_id || $additional_msg) { - $request->overwrite('confirm', null, phpbb_request_interface::POST); + $request->overwrite('confirm', null, phpbb_request_request_interface::POST); $request->overwrite('confirm_key', null); } @@ -694,7 +694,7 @@ function mcp_restore_topic($topic_ids) } $topic_id = $request->variable('t', 0); - if (!$request->is_set('quickmod', phpbb_request_interface::REQUEST)) + if (!$request->is_set('quickmod', phpbb_request_request_interface::REQUEST)) { $redirect = $request->variable('redirect', "index.$phpEx"); $redirect = reapply_sid($redirect); @@ -823,7 +823,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '' } $topic_id = $request->variable('t', 0); - if (!$request->is_set('quickmod', phpbb_request_interface::REQUEST)) + if (!$request->is_set('quickmod', phpbb_request_request_interface::REQUEST)) { $redirect = $request->variable('redirect', "index.$phpEx"); $redirect = reapply_sid($redirect); @@ -1136,7 +1136,7 @@ function mcp_fork_topic($topic_ids) if ($additional_msg) { - $request->overwrite('confirm', null, phpbb_request_interface::POST); + $request->overwrite('confirm', null, phpbb_request_request_interface::POST); $request->overwrite('confirm_key', null); } diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 8a9390212f..aa0725efff 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -946,9 +946,9 @@ class mcp_queue { $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; - $request->overwrite('confirm', null, phpbb_request_interface::POST); - $request->overwrite('confirm_key', null, phpbb_request_interface::POST); - $request->overwrite('confirm_key', null, phpbb_request_interface::REQUEST); + $request->overwrite('confirm', null, phpbb_request_request_interface::POST); + $request->overwrite('confirm_key', null, phpbb_request_request_interface::POST); + $request->overwrite('confirm_key', null, phpbb_request_request_interface::REQUEST); } else { diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 44960dd78d..6971b786fb 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1545,7 +1545,7 @@ class parse_message extends bbcode_firstpass global $request; $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); - $attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, phpbb_request_interface::POST); + $attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, phpbb_request_request_interface::POST); $this->attachment_data = array(); $check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id; diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 8620e33e47..03d3de3337 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -34,8 +34,8 @@ class ucp_groups $return_page = '

' . sprintf($user->lang['RETURN_PAGE'], '', ''); $mark_ary = request_var('mark', array(0)); - $submit = $request->variable('submit', false, false, phpbb_request_interface::POST); - $delete = $request->variable('delete', false, false, phpbb_request_interface::POST); + $submit = $request->variable('submit', false, false, phpbb_request_request_interface::POST); + $delete = $request->variable('delete', false, false, phpbb_request_request_interface::POST); $error = $data = array(); switch ($mode) diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 615b567134..c2b48e7bc6 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -296,7 +296,7 @@ class ucp_main } else { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 55df5f610c..ff1e3d1a95 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -34,9 +34,9 @@ class ucp_profile $user->add_lang('posting'); - $preview = $request->variable('preview', false, false, phpbb_request_interface::POST); - $submit = $request->variable('submit', false, false, phpbb_request_interface::POST); - $delete = $request->variable('delete', false, false, phpbb_request_interface::POST); + $preview = $request->variable('preview', false, false, phpbb_request_request_interface::POST); + $submit = $request->variable('submit', false, false, phpbb_request_request_interface::POST); + $delete = $request->variable('delete', false, false, phpbb_request_request_interface::POST); $error = $data = array(); $s_hidden_fields = ''; diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index df9b6c1c7e..2d165b551a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -248,7 +248,7 @@ class install_update extends module $this->include_file('includes/diff/renderer.' . $phpEx); // Make sure we stay at the file check if checking the files again - if ($request->variable('check_again', false, false, phpbb_request_interface::POST)) + if ($request->variable('check_again', false, false, phpbb_request_request_interface::POST)) { $sub = $this->p_master->sub = 'file_check'; } @@ -355,7 +355,7 @@ class install_update extends module $action = request_var('action', ''); // We are directly within an update. To make sure our update list is correct we check its status. - $update_list = ($request->variable('check_again', false, false, phpbb_request_interface::POST)) ? false : $cache->get('_update_list'); + $update_list = ($request->variable('check_again', false, false, phpbb_request_request_interface::POST)) ? false : $cache->get('_update_list'); $modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0; // Make sure the list is up-to-date diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 5beea45c7d..1ab9ec2fb6 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -49,7 +49,7 @@ $action = request_var('action', ''); $action_ary = request_var('action', array('' => 0)); $forum_action = request_var('forum_action', ''); -if ($forum_action !== '' && $request->variable('sort', false, false, phpbb_request_interface::POST)) +if ($forum_action !== '' && $request->variable('sort', false, false, phpbb_request_request_interface::POST)) { $action = $forum_action; } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 46136dbdd4..e4cd5e7daa 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1058,7 +1058,7 @@ switch ($mode) // We validate form and field here, only id/class allowed $form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; $field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field; - if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) + if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(phpbb_request_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) { $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index 2e80436f78..a7148c634a 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -47,7 +47,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base */ public function init() { - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'))) + if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'))) { return $this->user->lang['APACHE_SETUP_BEFORE_USE']; } @@ -78,7 +78,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base ); } - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) + if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) { return array( 'status' => LOGIN_ERROR_EXTERNAL_AUTH, @@ -149,7 +149,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base */ public function autologin() { - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) + if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) { return array(); } @@ -241,7 +241,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base public function validate_session($user) { // Check if PHP_AUTH_USER is set and handle this case - if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER)) + if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) { $php_auth_user = $this->request->server('PHP_AUTH_USER'); diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php index 7eaf8bb2d3..626ad8478f 100644 --- a/phpBB/phpbb/auth/provider/base.php +++ b/phpBB/phpbb/auth/provider/base.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface +abstract class phpbb_auth_provider_base implements phpbb_auth_provider_provider_interface { /** * {@inheritdoc} diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index 29c58d4e62..a125759e3f 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base class for avatar drivers * @package phpBB3 */ -abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface +abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interface { /** * Avatar driver name @@ -47,7 +47,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface /** * Cache driver - * @var phpbb_cache_driver_interface + * @var phpbb_cache_driver_driver_interface */ protected $cache; @@ -73,9 +73,9 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface * @param phpbb_request $request Request object * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension - * @param phpbb_cache_driver_interface $cache Cache driver + * @param phpbb_cache_driver_driver_interface $cache Cache driver */ - public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null) + public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext, phpbb_cache_driver_driver_interface $cache = null) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php index 32e04f813a..7ee7e82ad5 100644 --- a/phpBB/phpbb/cache/driver/base.php +++ b/phpBB/phpbb/cache/driver/base.php @@ -18,6 +18,6 @@ if (!defined('IN_PHPBB')) /** * @package acm */ -abstract class phpbb_cache_driver_base implements phpbb_cache_driver_interface +abstract class phpbb_cache_driver_base implements phpbb_cache_driver_driver_interface { } diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php index 69c5e0fdd0..02dd3d48a9 100644 --- a/phpBB/phpbb/cache/service.php +++ b/phpBB/phpbb/cache/service.php @@ -24,7 +24,7 @@ class phpbb_cache_service /** * Cache driver. * - * @var phpbb_cache_driver_interface + * @var phpbb_cache_driver_driver_interface */ protected $driver; @@ -59,13 +59,13 @@ class phpbb_cache_service /** * Creates a cache service around a cache driver * - * @param phpbb_cache_driver_interface $driver The cache driver + * @param phpbb_cache_driver_driver_interface $driver The cache driver * @param phpbb_config $config The config * @param phpbb_db_driver $db Database connection * @param string $phpbb_root_path Root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_cache_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext) + public function __construct(phpbb_cache_driver_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext) { $this->set_driver($driver); $this->config = $config; @@ -77,7 +77,7 @@ class phpbb_cache_service /** * Returns the cache driver used by this cache service. * - * @return phpbb_cache_driver_interface The cache driver + * @return phpbb_cache_driver_driver_interface The cache driver */ public function get_driver() { @@ -87,9 +87,9 @@ class phpbb_cache_service /** * Replaces the cache driver used by this cache service. * - * @param phpbb_cache_driver_interface $driver The cache driver + * @param phpbb_cache_driver_driver_interface $driver The cache driver */ - public function set_driver(phpbb_cache_driver_interface $driver) + public function set_driver(phpbb_cache_driver_driver_interface $driver) { $this->driver = $driver; } diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 02a2d584dc..78467a044c 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -50,9 +50,9 @@ class phpbb_class_loader * @param string $prefix Required class name prefix for files to be loaded * @param string $path Directory to load files from * @param string $php_ext The file extension for PHP files - * @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface. + * @param phpbb_cache_driver_driver_interface $cache An implementation of the phpBB cache interface. */ - public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null) + public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_driver_interface $cache = null) { $this->prefix = $prefix; $this->path = $path; @@ -66,9 +66,9 @@ class phpbb_class_loader * the class loader will resolve paths by checking for the existance of every * directory in the class name every time. * - * @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface. + * @param phpbb_cache_driver_driver_interface $cache An implementation of the phpBB cache interface. */ - public function set_cache(phpbb_cache_driver_interface $cache = null) + public function set_cache(phpbb_cache_driver_driver_interface $cache = null) { if ($cache) { diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php index b18369a479..25647e1d0b 100644 --- a/phpBB/phpbb/config/db.php +++ b/phpBB/phpbb/config/db.php @@ -23,7 +23,7 @@ class phpbb_config_db extends phpbb_config { /** * Cache instance - * @var phpbb_cache_driver_interface + * @var phpbb_cache_driver_driver_interface */ protected $cache; @@ -43,10 +43,10 @@ class phpbb_config_db extends phpbb_config * Creates a configuration container with a default set of values * * @param phpbb_db_driver $db Database connection - * @param phpbb_cache_driver_interface $cache Cache instance + * @param phpbb_cache_driver_driver_interface $cache Cache instance * @param string $table Configuration table name */ - public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table) + public function __construct(phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $table) { $this->db = $db; $this->cache = $cache; diff --git a/phpBB/phpbb/cron/task/core/prune_forum.php b/phpBB/phpbb/cron/task/core/prune_forum.php index e3c497f072..0e4c75c77f 100644 --- a/phpBB/phpbb/cron/task/core/prune_forum.php +++ b/phpBB/phpbb/cron/task/core/prune_forum.php @@ -132,15 +132,15 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p /** * Parses parameters found in $request, which is an instance of - * phpbb_request_interface. + * phpbb_request_request_interface. * * It is expected to have a key f whose value is id of the forum to be pruned. * - * @param phpbb_request_interface $request Request object. + * @param phpbb_request_request_interface $request Request object. * * @return null */ - public function parse_parameters(phpbb_request_interface $request) + public function parse_parameters(phpbb_request_request_interface $request) { $this->forum_data = null; if ($request->is_set('f')) diff --git a/phpBB/phpbb/cron/task/core/tidy_cache.php b/phpBB/phpbb/cron/task/core/tidy_cache.php index 16a45dae7c..4618e8200e 100644 --- a/phpBB/phpbb/cron/task/core/tidy_cache.php +++ b/phpBB/phpbb/cron/task/core/tidy_cache.php @@ -29,9 +29,9 @@ class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base * Constructor. * * @param phpbb_config $config The config - * @param phpbb_cache_driver_interface $cache The cache driver + * @param phpbb_cache_driver_driver_interface $cache The cache driver */ - public function __construct(phpbb_config $config, phpbb_cache_driver_interface $cache) + public function __construct(phpbb_config $config, phpbb_cache_driver_driver_interface $cache) { $this->config = $config; $this->cache = $cache; diff --git a/phpBB/phpbb/cron/task/parametrized.php b/phpBB/phpbb/cron/task/parametrized.php index 5f0e46eafc..9a6a55c6bc 100644 --- a/phpBB/phpbb/cron/task/parametrized.php +++ b/phpBB/phpbb/cron/task/parametrized.php @@ -39,14 +39,14 @@ interface phpbb_cron_task_parametrized extends phpbb_cron_task /** * Parses parameters found in $request, which is an instance of - * phpbb_request_interface. + * phpbb_request_request_interface. * * $request contains user input and must not be trusted. * Cron task must validate all data before using it. * - * @param phpbb_request_interface $request Request object. + * @param phpbb_request_request_interface $request Request object. * * @return null */ - public function parse_parameters(phpbb_request_interface $request); + public function parse_parameters(phpbb_request_request_interface $request); } diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php index 0b626bf455..5dd47cfa60 100644 --- a/phpBB/phpbb/db/migration/tool/config.php +++ b/phpBB/phpbb/db/migration/tool/config.php @@ -12,7 +12,7 @@ * * @package db */ -class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interface +class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_tool_interface { /** @var phpbb_config */ protected $config; diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index ac4d2c9bd7..8ed2a933ff 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -12,7 +12,7 @@ * * @package db */ -class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interface +class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_interface { /** @var phpbb_cache_service */ protected $cache; diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 2f09c0ac72..f1140d0759 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -12,7 +12,7 @@ * * @package db */ -class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_interface +class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool_interface { /** @var phpbb_auth */ protected $auth; diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index c4462b64d8..de18998106 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @package extension */ -class phpbb_extension_base implements phpbb_extension_interface +class phpbb_extension_base implements phpbb_extension_extension_interface { /** @var ContainerInterface */ protected $container; diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index 155a41cda5..1569c90eb8 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -57,12 +57,12 @@ class phpbb_extension_finder * extensions and their locations * @param phpbb_filesystem $filesystem Filesystem instance * @param string $phpbb_root_path Path to the phpbb root directory - * @param phpbb_cache_driver_interface $cache A cache instance or null + * @param phpbb_cache_driver_driver_interface $cache A cache instance or null * @param string $php_ext php file extension * @param string $cache_name The name of the cache variable, defaults to * _ext_finder */ - public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder') + public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder') { $this->extension_manager = $extension_manager; $this->filesystem = $filesystem; diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index 4451049d04..f9f722f773 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -46,10 +46,10 @@ class phpbb_extension_manager * @param string $extension_table The name of the table holding extensions * @param string $phpbb_root_path Path to the phpbb includes directory. * @param string $php_ext php file extension - * @param phpbb_cache_driver_interface $cache A cache instance or null + * @param phpbb_cache_driver_driver_interface $cache A cache instance or null * @param string $cache_name The name of the cache variable, defaults to _ext */ - public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') + public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_driver_interface $cache = null, $cache_name = '_ext') { $this->container = $container; $this->phpbb_root_path = $phpbb_root_path; @@ -126,7 +126,7 @@ class phpbb_extension_manager * Instantiates the extension meta class for the extension with the given name * * @param string $name The extension name - * @return phpbb_extension_interface Instance of the extension meta class or + * @return phpbb_extension_extension_interface Instance of the extension meta class or * phpbb_extension_base if the class does not exist */ public function get_extension($name) diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php index 296d830932..9a38e604a3 100644 --- a/phpBB/phpbb/feed/base.php +++ b/phpBB/phpbb/feed/base.php @@ -34,7 +34,7 @@ abstract class phpbb_feed_base /** @var phpbb_db_driver */ protected $db; - /** @var phpbb_cache_driver_interface */ + /** @var phpbb_cache_driver_driver_interface */ protected $cache; /** @var phpbb_user */ @@ -77,14 +77,14 @@ abstract class phpbb_feed_base * @param phpbb_feed_helper $helper Feed helper * @param phpbb_config $config Config object * @param phpbb_db_driver $db Database connection - * @param phpbb_cache_driver_interface $cache Cache object + * @param phpbb_cache_driver_driver_interface $cache Cache object * @param phpbb_user $user User object * @param phpbb_auth $auth Auth object * @param phpbb_content_visibility $content_visibility Auth object * @param string $phpEx php file extension * @return null */ - function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx) + function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx) { $this->config = $config; $this->helper = $helper; diff --git a/phpBB/phpbb/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php index 7fddadde99..5cbc26f528 100644 --- a/phpBB/phpbb/groupposition/legend.php +++ b/phpBB/phpbb/groupposition/legend.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_groupposition_legend implements phpbb_groupposition_interface +class phpbb_groupposition_legend implements phpbb_groupposition_groupposition_interface { /** * Group is not displayed diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index 7c758199e7..6a0601da63 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -22,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_groupposition_teampage implements phpbb_groupposition_interface +class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_interface { /** * Group is not displayed @@ -48,7 +48,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface /** * Cache object - * @var phpbb_cache_driver_interface + * @var phpbb_cache_driver_driver_interface */ protected $cache; @@ -57,9 +57,9 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface * * @param phpbb_db_driver $db Database object * @param phpbb_user $user User object - * @param phpbb_cache_driver_interface $cache Cache object + * @param phpbb_cache_driver_driver_interface $cache Cache object */ - public function __construct(phpbb_db_driver $db, phpbb_user $user, phpbb_cache_driver_interface $cache) + public function __construct(phpbb_db_driver $db, phpbb_user $user, phpbb_cache_driver_driver_interface $cache) { $this->db = $db; $this->user = $user; diff --git a/phpBB/phpbb/hook/finder.php b/phpBB/phpbb/hook/finder.php index 7b0412f733..3f9758211d 100644 --- a/phpBB/phpbb/hook/finder.php +++ b/phpBB/phpbb/hook/finder.php @@ -31,9 +31,9 @@ class phpbb_hook_finder * * @param string $phpbb_root_path Path to the phpbb root directory * @param string $php_ext php file extension - * @param phpbb_cache_driver_interface $cache A cache instance or null + * @param phpbb_cache_driver_driver_interface $cache A cache instance or null */ - public function __construct($phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null) + public function __construct($phpbb_root_path, $php_ext, phpbb_cache_driver_driver_interface $cache = null) { $this->phpbb_root_path = $phpbb_root_path; $this->cache = $cache; diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 7a26858348..0a755b5c78 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_log */ -class phpbb_log implements phpbb_log_interface +class phpbb_log implements phpbb_log_log_interface { /** * If set, administrative user profile links will be returned and messages diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index 97833710c0..32e0ef50bc 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -525,7 +525,7 @@ class phpbb_notification_manager { $type = $this->get_item_type_class($type_name); - if ($type instanceof phpbb_notification_type_interface && $type->is_available()) + if ($type instanceof phpbb_notification_type_type_interface && $type->is_available()) { $options = array_merge(array( 'id' => $type->get_type(), @@ -561,7 +561,7 @@ class phpbb_notification_manager { $method = $this->get_method_class($method_name); - if ($method instanceof phpbb_notification_method_interface && $method->is_available()) + if ($method instanceof phpbb_notification_method_method_interface && $method->is_available()) { $subscription_methods[$method_name] = array( 'id' => $method->get_type(), diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php index b633956d01..fbff75b59f 100644 --- a/phpBB/phpbb/notification/method/base.php +++ b/phpBB/phpbb/notification/method/base.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications method class * @package notifications */ -abstract class phpbb_notification_method_base implements phpbb_notification_method_interface +abstract class phpbb_notification_method_base implements phpbb_notification_method_method_interface { /** @var phpbb_notification_manager */ protected $notification_manager; @@ -30,7 +30,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth /** @var phpbb_db_driver */ protected $db; - /** @var phpbb_cache_driver_interface */ + /** @var phpbb_cache_driver_driver_interface */ protected $cache; /** @var phpbb_template */ @@ -66,7 +66,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth * * @param phpbb_user_loader $user_loader * @param phpbb_db_driver $db - * @param phpbb_cache_driver_interface $cache + * @param phpbb_cache_driver_driver_interface $cache * @param phpbb_user $user * @param phpbb_auth $auth * @param phpbb_config $config @@ -74,7 +74,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth * @param string $php_ext * @return phpbb_notification_method_base */ - public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext) + public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext) { $this->user_loader = $user_loader; $this->db = $db; @@ -99,9 +99,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth /** * Add a notification to the queue * - * @param phpbb_notification_type_interface $notification + * @param phpbb_notification_type_type_interface $notification */ - public function add_to_queue(phpbb_notification_type_interface $notification) + public function add_to_queue(phpbb_notification_type_type_interface $notification) { $this->queue[] = $notification; } diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php index b3ca757d5f..bd21d924e4 100644 --- a/phpBB/phpbb/notification/method/method_interface.php +++ b/phpBB/phpbb/notification/method/method_interface.php @@ -37,9 +37,9 @@ interface phpbb_notification_method_method_interface /** * Add a notification to the queue * - * @param phpbb_notification_type_interface $notification + * @param phpbb_notification_type_type_interface $notification */ - public function add_to_queue(phpbb_notification_type_interface $notification); + public function add_to_queue(phpbb_notification_type_type_interface $notification); /** * Parse the queue and notify the users diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 46517f1c9b..a7434fc9a7 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications class * @package notifications */ -abstract class phpbb_notification_type_base implements phpbb_notification_type_interface +abstract class phpbb_notification_type_base implements phpbb_notification_type_type_interface { /** @var phpbb_notification_manager */ protected $notification_manager; @@ -30,7 +30,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i /** @var phpbb_db_driver */ protected $db; - /** @var phpbb_cache_driver_interface */ + /** @var phpbb_cache_driver_driver_interface */ protected $cache; /** @var phpbb_template */ @@ -96,7 +96,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i * * @param phpbb_user_loader $user_loader * @param phpbb_db_driver $db - * @param phpbb_cache_driver_interface $cache + * @param phpbb_cache_driver_driver_interface $cache * @param phpbb_user $user * @param phpbb_auth $auth * @param phpbb_config $config @@ -107,7 +107,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i * @param string $user_notifications_table * @return phpbb_notification_type_base */ - public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) + public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) { $this->user_loader = $user_loader; $this->db = $db; diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php index cc05847ec7..9ca0f462b4 100644 --- a/phpBB/phpbb/request/deactivated_super_global.php +++ b/phpBB/phpbb/request/deactivated_super_global.php @@ -29,23 +29,23 @@ class phpbb_request_deactivated_super_global implements ArrayAccess, Countable, private $name; /** - * @var phpbb_request_interface::POST|GET|REQUEST|COOKIE Super global constant. + * @var phpbb_request_request_interface::POST|GET|REQUEST|COOKIE Super global constant. */ private $super_global; /** - * @var phpbb_request_interface The request class instance holding the actual request data. + * @var phpbb_request_request_interface The request class instance holding the actual request data. */ private $request; /** * Constructor generates an error message fitting the super global to be used within the other functions. * - * @param phpbb_request_interface $request A request class instance holding the real super global data. + * @param phpbb_request_request_interface $request A request class instance holding the real super global data. * @param string $name Name of the super global this is a replacement for - e.g. '_GET'. - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global The variable's super global constant. + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global The variable's super global constant. */ - public function __construct(phpbb_request_interface $request, $name, $super_global) + public function __construct(phpbb_request_request_interface $request, $name, $super_global) { $this->request = $request; $this->name = $name; diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index ae3c526d89..8c5bc12d96 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -23,18 +23,18 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -class phpbb_request implements phpbb_request_interface +class phpbb_request implements phpbb_request_request_interface { /** * @var array The names of super global variables that this class should protect if super globals are disabled. */ protected $super_globals = array( - phpbb_request_interface::POST => '_POST', - phpbb_request_interface::GET => '_GET', - phpbb_request_interface::REQUEST => '_REQUEST', - phpbb_request_interface::COOKIE => '_COOKIE', - phpbb_request_interface::SERVER => '_SERVER', - phpbb_request_interface::FILES => '_FILES', + phpbb_request_request_interface::POST => '_POST', + phpbb_request_request_interface::GET => '_GET', + phpbb_request_request_interface::REQUEST => '_REQUEST', + phpbb_request_request_interface::COOKIE => '_COOKIE', + phpbb_request_request_interface::SERVER => '_SERVER', + phpbb_request_request_interface::FILES => '_FILES', ); /** @@ -78,8 +78,8 @@ class phpbb_request implements phpbb_request_interface } // simulate request_order = GP - $this->original_request = $this->input[phpbb_request_interface::REQUEST]; - $this->input[phpbb_request_interface::REQUEST] = $this->input[phpbb_request_interface::POST] + $this->input[phpbb_request_interface::GET]; + $this->original_request = $this->input[phpbb_request_request_interface::REQUEST]; + $this->input[phpbb_request_request_interface::REQUEST] = $this->input[phpbb_request_request_interface::POST] + $this->input[phpbb_request_request_interface::GET]; if ($disable_super_globals) { @@ -144,10 +144,10 @@ class phpbb_request implements phpbb_request_interface * @param string $var_name The name of the variable that shall be overwritten * @param mixed $value The value which the variable shall contain. * If this is null the variable will be unset. - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global shall be changed */ - public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST) + public function overwrite($var_name, $value, $super_global = phpbb_request_request_interface::REQUEST) { if (!isset($this->super_globals[$super_global])) { @@ -193,13 +193,13 @@ class phpbb_request implements phpbb_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST) + public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST) { return $this->_variable($var_name, $default, $multibyte, $super_global, true); } @@ -217,13 +217,13 @@ class phpbb_request implements phpbb_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST) + public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_request_interface::REQUEST) { return $this->_variable($var_name, $default, $multibyte, $super_global, false); } @@ -234,8 +234,8 @@ class phpbb_request implements phpbb_request_interface * Also fall back to getenv(), some CGI setups may need it (probably not, but * whatever). * - * @param string|array $var_name See phpbb_request_interface::variable - * @param mixed $Default See phpbb_request_interface::variable + * @param string|array $var_name See phpbb_request_request_interface::variable + * @param mixed $Default See phpbb_request_request_interface::variable * * @return mixed The server variable value. */ @@ -243,9 +243,9 @@ class phpbb_request implements phpbb_request_interface { $multibyte = true; - if ($this->is_set($var_name, phpbb_request_interface::SERVER)) + if ($this->is_set($var_name, phpbb_request_request_interface::SERVER)) { - return $this->variable($var_name, $default, $multibyte, phpbb_request_interface::SERVER); + return $this->variable($var_name, $default, $multibyte, phpbb_request_request_interface::SERVER); } else { @@ -259,7 +259,7 @@ class phpbb_request implements phpbb_request_interface * Shortcut method to retrieve the value of client HTTP headers. * * @param string|array $header_name The name of the header to retrieve. - * @param mixed $default See phpbb_request_interface::variable + * @param mixed $default See phpbb_request_request_interface::variable * * @return mixed The header value. */ @@ -279,7 +279,7 @@ class phpbb_request implements phpbb_request_interface */ public function file($form_name) { - return $this->variable($form_name, array('name' => 'none'), false, phpbb_request_interface::FILES); + return $this->variable($form_name, array('name' => 'none'), false, phpbb_request_request_interface::FILES); } /** @@ -294,7 +294,7 @@ class phpbb_request implements phpbb_request_interface */ public function is_set_post($name) { - return $this->is_set($name, phpbb_request_interface::POST); + return $this->is_set($name, phpbb_request_request_interface::POST); } /** @@ -302,12 +302,12 @@ class phpbb_request implements phpbb_request_interface * arrays. * * @param string $var Name of the variable - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies the super global which shall be checked * * @return bool True if the variable was sent as input */ - public function is_set($var, $super_global = phpbb_request_interface::REQUEST) + public function is_set($var, $super_global = phpbb_request_request_interface::REQUEST) { return isset($this->input[$super_global][$var]); } @@ -335,13 +335,13 @@ class phpbb_request implements phpbb_request_interface /** * Returns all variable names for a given super global * - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * The super global from which names shall be taken * * @return array All variable names that are set for the super global. * Pay attention when using these, they are unsanitised! */ - public function variable_names($super_global = phpbb_request_interface::REQUEST) + public function variable_names($super_global = phpbb_request_request_interface::REQUEST) { if (!isset($this->input[$super_global])) { @@ -362,14 +362,14 @@ class phpbb_request implements phpbb_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * @param bool $trim Indicates whether trim() should be applied to string values. * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - protected function _variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST, $trim = true) + protected function _variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST, $trim = true) { $path = false; diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php index 482f0f1287..2c804cd7fd 100644 --- a/phpBB/phpbb/request/request_interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -43,10 +43,10 @@ interface phpbb_request_request_interface * @param string $var_name The name of the variable that shall be overwritten * @param mixed $value The value which the variable shall contain. * If this is null the variable will be unset. - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global shall be changed */ - public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST); + public function overwrite($var_name, $value, $super_global = phpbb_request_request_interface::REQUEST); /** * Central type safe input handling function. @@ -60,19 +60,19 @@ interface phpbb_request_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST); + public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST); /** * Shortcut method to retrieve SERVER variables. * - * @param string|array $var_name See phpbb_request_interface::variable - * @param mixed $default See phpbb_request_interface::variable + * @param string|array $var_name See phpbb_request_request_interface::variable + * @param mixed $default See phpbb_request_request_interface::variable * * @return mixed The server variable value. */ @@ -82,7 +82,7 @@ interface phpbb_request_request_interface * Shortcut method to retrieve the value of client HTTP headers. * * @param string|array $header_name The name of the header to retrieve. - * @param mixed $default See phpbb_request_interface::variable + * @param mixed $default See phpbb_request_request_interface::variable * * @return mixed The header value. */ @@ -105,12 +105,12 @@ interface phpbb_request_request_interface * arrays. * * @param string $var Name of the variable - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies the super global which shall be checked * * @return bool True if the variable was sent as input */ - public function is_set($var, $super_global = phpbb_request_interface::REQUEST); + public function is_set($var, $super_global = phpbb_request_request_interface::REQUEST); /** * Checks whether the current request is an AJAX request (XMLHttpRequest) @@ -129,11 +129,11 @@ interface phpbb_request_request_interface /** * Returns all variable names for a given super global * - * @param phpbb_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global * The super global from which names shall be taken * * @return array All variable names that are set for the super global. * Pay attention when using these, they are unsanitised! */ - public function variable_names($super_global = phpbb_request_interface::REQUEST); + public function variable_names($super_global = phpbb_request_request_interface::REQUEST); } diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index e0585b1523..3bff91e275 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -243,7 +243,7 @@ class phpbb_session $this->forwarded_for = ''; } - if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_interface::COOKIE)) + if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_request_interface::COOKIE)) { $this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true); $this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true); @@ -405,9 +405,9 @@ class phpbb_session $provider = $phpbb_container->get('auth.provider.' . $method); - if (!($provider instanceof phpbb_auth_provider_interface)) + if (!($provider instanceof phpbb_auth_provider_provider_interface)) { - throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface'); + throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_provider_interface'); } $ret = $provider->validate_session($this->data); diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php index 4d851a87a8..79853eeaa1 100644 --- a/phpBB/phpbb/tree/nestedset.php +++ b/phpBB/phpbb/tree/nestedset.php @@ -15,7 +15,7 @@ if (!defined('IN_PHPBB')) exit; } -abstract class phpbb_tree_nestedset implements phpbb_tree_interface +abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface { /** @var phpbb_db_driver */ protected $db; diff --git a/phpBB/posting.php b/phpBB/posting.php index ac459197b3..f9d5295320 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -697,7 +697,7 @@ if ($submit || $preview || $refresh) $message_parser->message = utf8_normalize_nfc(request_var('message', '', true)); $post_data['username'] = utf8_normalize_nfc(request_var('username', $post_data['username'], true)); - $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, phpbb_request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc(request_var('edit_reason', '', true)) : ''; + $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, phpbb_request_request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc(request_var('edit_reason', '', true)) : ''; $post_data['orig_topic_type'] = $post_data['topic_type']; $post_data['topic_type'] = request_var('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL)); diff --git a/phpBB/search.php b/phpBB/search.php index 2429c81dae..6da74b954f 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -683,7 +683,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($config['load_anon_lastread'] || ($user->data['is_registered'] && !$config['load_db_lastread'])) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7180c54de6..b1e576fee8 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -139,9 +139,9 @@ switch ($mode) { $set_time = time() - 31536000; - foreach ($request->variable_names(phpbb_request_interface::COOKIE) as $cookie_name) + foreach ($request->variable_names(phpbb_request_request_interface::COOKIE) as $cookie_name) { - $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_interface::COOKIE); + $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_request_interface::COOKIE); // Only delete board cookies, no other ones... if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1e444f47ad..fb4fcf42bf 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -716,9 +716,9 @@ if (!empty($topic_data['poll_start'])) // Cookie based guest tracking ... I don't like this but hum ho // it's oft requested. This relies on "nice" users who don't feel // the need to delete cookies to mess with results. - if ($request->is_set($config['cookie_name'] . '_poll_' . $topic_id, phpbb_request_interface::COOKIE)) + if ($request->is_set($config['cookie_name'] . '_poll_' . $topic_id, phpbb_request_request_interface::COOKIE)) { - $cur_voted_id = explode(',', $request->variable($config['cookie_name'] . '_poll_' . $topic_id, '', true, phpbb_request_interface::COOKIE)); + $cur_voted_id = explode(',', $request->variable($config['cookie_name'] . '_poll_' . $topic_id, '', true, phpbb_request_request_interface::COOKIE)); $cur_voted_id = array_map('intval', $cur_voted_id); } } diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 0ca6ef763e..9aa5f676d1 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -43,7 +43,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_interface::SERVER) + phpbb_request_request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->once()) ->method('server') @@ -61,7 +61,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_interface::SERVER) + phpbb_request_request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->at(1)) ->method('server') @@ -93,7 +93,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_interface::SERVER) + phpbb_request_request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->at(1)) ->method('server') @@ -194,7 +194,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_interface::SERVER) + phpbb_request_request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->once()) ->method('server') diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 4ebe79c9cd..71a58ffea9 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -24,7 +24,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase // Prepare dependencies for avatar manager and driver $config = new phpbb_config(array()); $request = $this->getMock('phpbb_request'); - $cache = $this->getMock('phpbb_cache_driver_interface'); + $cache = $this->getMock('phpbb_cache_driver_driver_interface'); // $this->avatar_foobar will be needed later on $this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); diff --git a/tests/mock/cache.php b/tests/mock/cache.php index 440592665a..3e45a1730b 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -7,7 +7,7 @@ * */ -class phpbb_mock_cache implements phpbb_cache_driver_interface +class phpbb_mock_cache implements phpbb_cache_driver_driver_interface { protected $data; diff --git a/tests/mock/request.php b/tests/mock/request.php index 2a272fc03b..04803594de 100644 --- a/tests/mock/request.php +++ b/tests/mock/request.php @@ -7,33 +7,33 @@ * */ -class phpbb_mock_request implements phpbb_request_interface +class phpbb_mock_request implements phpbb_request_request_interface { protected $data; public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array()) { - $this->data[phpbb_request_interface::GET] = $get; - $this->data[phpbb_request_interface::POST] = $post; - $this->data[phpbb_request_interface::COOKIE] = $cookie; - $this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request; - $this->data[phpbb_request_interface::SERVER] = $server; - $this->data[phpbb_request_interface::FILES] = $files; + $this->data[phpbb_request_request_interface::GET] = $get; + $this->data[phpbb_request_request_interface::POST] = $post; + $this->data[phpbb_request_request_interface::COOKIE] = $cookie; + $this->data[phpbb_request_request_interface::REQUEST] = ($request === false) ? $post + $get : $request; + $this->data[phpbb_request_request_interface::SERVER] = $server; + $this->data[phpbb_request_request_interface::FILES] = $files; } - public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST) + public function overwrite($var_name, $value, $super_global = phpbb_request_request_interface::REQUEST) { $this->data[$super_global][$var_name] = $value; } - public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST) + public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST) { return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; } public function server($var_name, $default = '') { - $super_global = phpbb_request_interface::SERVER; + $super_global = phpbb_request_request_interface::SERVER; return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; } @@ -45,16 +45,16 @@ class phpbb_mock_request implements phpbb_request_interface public function file($form_name) { - $super_global = phpbb_request_interface::FILES; + $super_global = phpbb_request_request_interface::FILES; return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array(); } public function is_set_post($name) { - return $this->is_set($name, phpbb_request_interface::POST); + return $this->is_set($name, phpbb_request_request_interface::POST); } - public function is_set($var, $super_global = phpbb_request_interface::REQUEST) + public function is_set($var, $super_global = phpbb_request_request_interface::REQUEST) { return isset($this->data[$super_global][$var]); } @@ -69,7 +69,7 @@ class phpbb_mock_request implements phpbb_request_interface return false; } - public function variable_names($super_global = phpbb_request_interface::REQUEST) + public function variable_names($super_global = phpbb_request_request_interface::REQUEST) { return array_keys($this->data[$super_global]); } @@ -79,10 +79,10 @@ class phpbb_mock_request implements phpbb_request_interface public function set_header($header_name, $value) { $var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name)); - $this->data[phpbb_request_interface::SERVER][$var_name] = $value; + $this->data[phpbb_request_request_interface::SERVER][$var_name] = $value; } - public function merge($super_global = phpbb_request_interface::REQUEST, $values) + public function merge($super_global = phpbb_request_request_interface::REQUEST, $values) { $this->data[$super_global] = array_merge($this->data[$super_global], $values); } diff --git a/tests/request/deactivated_super_global_test.php b/tests/request/deactivated_super_global_test.php index 2e19928a5a..28ba285468 100644 --- a/tests/request/deactivated_super_global_test.php +++ b/tests/request/deactivated_super_global_test.php @@ -16,7 +16,7 @@ class phpbb_deactivated_super_global_test extends phpbb_test_case public function test_write_triggers_error() { $this->setExpectedTriggerError(E_USER_ERROR); - $obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_interface'), 'obj', phpbb_request_interface::POST); + $obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_request_interface'), 'obj', phpbb_request_request_interface::POST); $obj->offsetSet(0, 0); } } diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index d77cbbcaf3..1bf471d04f 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -28,7 +28,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_interface::SERVER, array( + $request->merge(phpbb_request_request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); @@ -46,7 +46,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_interface::SERVER, array( + $request->merge(phpbb_request_request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); From d4d3d311b926cf3d0df4b3c6ccc4731a0345ca18 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 13:54:56 -0400 Subject: [PATCH 004/102] [ticket/11700] Implement namespace loading in the class loader PHPBB3-11700 --- phpBB/phpbb/class_loader.php | 49 +++++++++++++----------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 78467a044c..bcd05e5853 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -28,9 +30,9 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_class_loader +class class_loader { - private $prefix; + private $namespace; private $path; private $php_ext; private $cache; @@ -44,17 +46,17 @@ class phpbb_class_loader private $cached_paths = array(); /** - * Creates a new phpbb_class_loader, which loads files with the given + * Creates a new \phpbb\class_loader, which loads files with the given * file extension from the given path. * - * @param string $prefix Required class name prefix for files to be loaded + * @param string $namespace Required namespace for files to be loaded * @param string $path Directory to load files from * @param string $php_ext The file extension for PHP files - * @param phpbb_cache_driver_driver_interface $cache An implementation of the phpBB cache interface. + * @param \phpbb\cache\driver\driver_interface $cache An implementation of the phpBB cache interface. */ - public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_driver_interface $cache = null) + public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null) { - $this->prefix = $prefix; + $this->namespace = $namespace; $this->path = $path; $this->php_ext = $php_ext; @@ -66,13 +68,13 @@ class phpbb_class_loader * the class loader will resolve paths by checking for the existance of every * directory in the class name every time. * - * @param phpbb_cache_driver_driver_interface $cache An implementation of the phpBB cache interface. + * @param \phpbb\cache\driver\driver_interface $cache An implementation of the phpBB cache interface. */ - public function set_cache(phpbb_cache_driver_driver_interface $cache = null) + public function set_cache(\phpbb\cache\driver\driver_interface $cache = null) { if ($cache) { - $this->cached_paths = $cache->get('class_loader_' . $this->prefix); + $this->cached_paths = $cache->get('class_loader_' . str_replace('\\', '__', $this->namespace)); if ($this->cached_paths === false) { @@ -102,8 +104,8 @@ class phpbb_class_loader /** * Resolves a phpBB class name to a relative path which can be included. * - * @param string $class The class name to resolve, must have a phpbb_ - * prefix + * @param string $class The class name to resolve, must be in the + * namespace the loader was constructed with * @return string|bool A relative path to the file containing the * class or false if looking it up failed. */ @@ -114,27 +116,12 @@ class phpbb_class_loader return $this->path . $this->cached_paths[$class] . '.' . $this->php_ext; } - if (!preg_match('/^' . $this->prefix . '[a-zA-Z0-9_]+$/', $class)) + if (!preg_match('/^' . preg_quote($this->namespace, '/') . '[a-zA-Z0-9_\\\\]+$/', $class)) { return false; } - $parts = explode('_', substr($class, strlen($this->prefix))); - - $dirs = ''; - - for ($i = 0, $n = sizeof($parts); $i < $n && is_dir($this->path . $dirs . $parts[$i]); $i++) - { - $dirs .= $parts[$i] . '/'; - } - - // no file name left => use last dir name as file name - if ($i == sizeof($parts)) - { - $parts[] = $parts[$i - 1]; - } - - $relative_path = $dirs . implode(array_slice($parts, $i, sizeof($parts) - $i), '_'); + $relative_path = str_replace('\\', '/', substr($class, strlen($this->namespace))); if (!file_exists($this->path . $relative_path . '.' . $this->php_ext)) { @@ -144,7 +131,7 @@ class phpbb_class_loader if ($this->cache) { $this->cached_paths[$class] = $relative_path; - $this->cache->put('class_loader_' . $this->prefix, $this->cached_paths); + $this->cache->put('class_loader_' . str_replace('\\', '__', $this->namespace), $this->cached_paths); } return $this->path . $relative_path . '.' . $this->php_ext; @@ -157,7 +144,7 @@ class phpbb_class_loader */ public function load_class($class) { - if (substr($class, 0, strlen($this->prefix)) === $this->prefix) + if (substr($class, 0, strlen($this->namespace)) === $this->namespace) { $path = $this->resolve_path($class); From 4311cd65e30b994c5ecd07baf0a508f40d51f155 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 14:29:11 -0400 Subject: [PATCH 005/102] [ticket/11700] Instantiate the class loader with namespace rather than prefix PHPBB3-11700 --- phpBB/common.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/common.php b/phpBB/common.php index 962a1f951f..41d367d43c 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -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}phpbb/", $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/database_update.php b/phpBB/install/database_update.php index cd6fb7931b..19db0a9fc1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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}phpbb/", $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) diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 45e5777e36..65f33766b5 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -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}phpbb/", $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(); From 62b33968c2ef7c5bf264f8af2a39eac2183148f7 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 15:38:04 -0400 Subject: [PATCH 006/102] [ticket/11700] include and define are not valid class names PHPBB3-11700 --- phpBB/phpbb/template/twig/extension.php | 4 ++-- phpBB/phpbb/template/twig/node/{define.php => definenode.php} | 2 +- .../phpbb/template/twig/node/{include.php => includenode.php} | 2 +- .../twig/tokenparser/{define.php => defineparser.php} | 4 ++-- .../twig/tokenparser/{include.php => includeparser.php} | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename phpBB/phpbb/template/twig/node/{define.php => definenode.php} (95%) rename phpBB/phpbb/template/twig/node/{include.php => includenode.php} (94%) rename phpBB/phpbb/template/twig/tokenparser/{define.php => defineparser.php} (87%) rename phpBB/phpbb/template/twig/tokenparser/{include.php => includeparser.php} (78%) diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index c279726434..2adee07c8c 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -54,8 +54,8 @@ class phpbb_template_twig_extension extends Twig_Extension public function getTokenParsers() { return array( - new phpbb_template_twig_tokenparser_define, - new phpbb_template_twig_tokenparser_include, + new phpbb_template_twig_tokenparser_defineparser, + new phpbb_template_twig_tokenparser_includeparser, new phpbb_template_twig_tokenparser_includejs, new phpbb_template_twig_tokenparser_includecss, new phpbb_template_twig_tokenparser_event, diff --git a/phpBB/phpbb/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/definenode.php similarity index 95% rename from phpBB/phpbb/template/twig/node/define.php rename to phpBB/phpbb/template/twig/node/definenode.php index fcb19cc773..247b908337 100644 --- a/phpBB/phpbb/template/twig/node/define.php +++ b/phpBB/phpbb/template/twig/node/definenode.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_define extends Twig_Node +class phpbb_template_twig_node_definenode extends Twig_Node { public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null) { diff --git a/phpBB/phpbb/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/includenode.php similarity index 94% rename from phpBB/phpbb/template/twig/node/include.php rename to phpBB/phpbb/template/twig/node/includenode.php index 5c6ae1bbcf..c5d1c6be51 100644 --- a/phpBB/phpbb/template/twig/node/include.php +++ b/phpBB/phpbb/template/twig/node/includenode.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_include extends Twig_Node_Include +class phpbb_template_twig_node_includenode extends Twig_Node_Include { /** * Compiles the node to PHP. diff --git a/phpBB/phpbb/template/twig/tokenparser/define.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php similarity index 87% rename from phpBB/phpbb/template/twig/tokenparser/define.php rename to phpBB/phpbb/template/twig/tokenparser/defineparser.php index 4ea15388c4..db023c67bf 100644 --- a/phpBB/phpbb/template/twig/tokenparser/define.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_define extends Twig_TokenParser +class phpbb_template_twig_tokenparser_defineparser extends Twig_TokenParser { /** * Parses a token and returns a node. @@ -46,7 +46,7 @@ class phpbb_template_twig_tokenparser_define extends Twig_TokenParser $stream->expect(Twig_Token::BLOCK_END_TYPE); } - return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag()); + return new phpbb_template_twig_node_definenode($capture, $name, $value, $lineno, $this->getTag()); } public function decideBlockEnd(Twig_Token $token) diff --git a/phpBB/phpbb/template/twig/tokenparser/include.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php similarity index 78% rename from phpBB/phpbb/template/twig/tokenparser/include.php rename to phpBB/phpbb/template/twig/tokenparser/includeparser.php index 520f9fd1a0..79c53630d0 100644 --- a/phpBB/phpbb/template/twig/tokenparser/include.php +++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include +class phpbb_template_twig_tokenparser_includeparser extends Twig_TokenParser_Include { /** * Parses a token and returns a node. @@ -31,7 +31,7 @@ class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include list($variables, $only, $ignoreMissing) = $this->parseArguments(); - return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); + return new phpbb_template_twig_node_includenode($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); } /** From 3d45f695729da78badb38744cb96be88bed31d55 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 16:21:59 -0400 Subject: [PATCH 007/102] [ticket/11700] Load namespaced classes in tests PHPBB3-11700 --- tests/bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 68cbb64c03..43efecce3b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -16,11 +16,11 @@ $table_prefix = 'phpbb_'; require_once $phpbb_root_path . 'includes/constants.php'; 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 = 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 = 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 . 'phpbb/', "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'; From adc58ba0848a23555044dd76d0b03b9055c81f40 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 16:28:30 -0400 Subject: [PATCH 008/102] [ticket/11700] Use a new style constructor for the error collector PHPBB3-11700 --- phpBB/phpbb/error_collector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/error_collector.php b/phpBB/phpbb/error_collector.php index 358da747b8..0a6462d046 100644 --- a/phpBB/phpbb/error_collector.php +++ b/phpBB/phpbb/error_collector.php @@ -19,7 +19,7 @@ class phpbb_error_collector { var $errors; - function phpbb_error_collector() + function __construct() { $this->errors = array(); } From b3e8734a490084d1cb05af97b50748e777663a07 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 16:35:04 -0400 Subject: [PATCH 009/102] [ticket/11700] Load the dbms with namespaces PHPBB3-11700 --- phpBB/includes/functions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 174ba712ba..f0681c9687 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5647,24 +5647,24 @@ function phpbb_convert_30_dbms_to_31($dbms) // true for mysqli class. // However, per the docblock any valid 3.1 driver name should be // recognized by this function, and have priority over 3.0 dbms. - if (class_exists('phpbb_db_driver_' . $dbms)) + if (class_exists('\phpbb\db\driver\\' . $dbms)) { - return 'phpbb_db_driver_' . $dbms; + return '\phpbb\db\driver\\' . $dbms; } if (class_exists($dbms)) { - // Additionally we could check that $dbms extends phpbb_db_driver. + // Additionally we could check that $dbms extends phpbb\db\driver\driver. // http://php.net/manual/en/class.reflectionclass.php // Beware of possible performance issues: // http://stackoverflow.com/questions/294582/php-5-reflection-api-performance // We could check for interface implementation in all paths or - // only when we do not prepend phpbb_db_driver_. + // only when we do not prepend phpbb\db\driver\. /* $reflection = new \ReflectionClass($dbms); - if ($reflection->isSubclassOf('phpbb_db_driver')) + if ($reflection->isSubclassOf('phpbb\db\driver\driver')) { return $dbms; } From 7c5675942b1a53190843ad1becb6ba067a8dd5eb Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sun, 15 Sep 2013 21:22:06 +0300 Subject: [PATCH 010/102] [ticket/11846] Replace empty p with margin-top PHPBB3-11846 --- phpBB/styles/prosilver/template/jumpbox.html | 8 ++++---- phpBB/styles/prosilver/theme/common.css | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index dd793fbadc..201b2dece2 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,12 +1,12 @@ -

{L_RETURN_TO} {FORUM_NAME}

+

{L_RETURN_TO} {FORUM_NAME}

-

{L_RETURN_TO} {L_INDEX}

+

{L_RETURN_TO} {L_INDEX}

-

{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}

+

{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}

-

{L_RETURN_TO_SEARCH_ADV}

+

{L_RETURN_TO_SEARCH_ADV}

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 4a77dc78d0..9021c157a3 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -134,6 +134,10 @@ p.right { text-align: right; } +p.jumpbox-return { + margin-top: 1em; +} + b, strong { font-weight: bold; } From 196e1813cd37c47965eb6f254ce6a55210a1b751 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 13:59:17 +0200 Subject: [PATCH 011/102] [ticket/11700] Add develop scripts to use namespaces and rename interfaces PHPBB3-11700 --- phpBB/develop/namespacify.php | 174 ++++++++++++++++++++++++++++ phpBB/develop/rename_interfaces.php | 36 ++++++ 2 files changed, 210 insertions(+) create mode 100644 phpBB/develop/namespacify.php create mode 100644 phpBB/develop/rename_interfaces.php diff --git a/phpBB/develop/namespacify.php b/phpBB/develop/namespacify.php new file mode 100644 index 0000000000..1995a01594 --- /dev/null +++ b/phpBB/develop/namespacify.php @@ -0,0 +1,174 @@ + $part) + { + if (empty($part)) + { + return null; + } + + if (!$in_name) + { + $new_dir = array_merge($cur_dir, array($part)); + $path = $code_dir . '/' . implode('/', $new_dir); + + if (file_exists($path) && is_dir($path)) + { + $cur_dir = $new_dir; + } + else + { + $in_name = true; + $cur_name[] = $part; + } + } + else + { + $cur_name[] = $part; + } + } + + if (empty($cur_name) && !empty($cur_dir)) + { + $cur_name[] = $cur_dir[count($cur_dir) - 1]; + } + + if (file_exists($code_dir . '/' . implode('/', $cur_dir) . '/' . implode('_', $cur_name) . '.php')) + { + return implode('\\', $cur_dir) . '\\' . implode('_', $cur_name); + } + + return null; +} + +$iterator = new \AppendIterator(); +$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir))); +$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir))); +$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($config_dir))); + +foreach ($iterator as $file) +{ + if (substr($file->getPath(), 0, 6) === 'vendor') + { + continue; + } + + if ($file->getExtension() == 'php') + { + $code = file_get_contents($file->getPathname()); + $namespaced_file = false; + + if (preg_match('#^' . preg_quote($namespace_dir, '#') . '#', $file->getPath())) + { + if (preg_match('#^(?:interface|(?:abstract )?class) (phpbb_[a-z0-9_]+)#m', $code, $matches)) + { + $old_class_name = $matches[1]; + $dirs = explode(DIRECTORY_SEPARATOR, preg_replace('#^' . preg_quote(dirname($namespace_dir) . DIRECTORY_SEPARATOR, '#') . '#', '', $file->getPath())); + + $namespace = implode('\\', $dirs); + + if ($dirs[count($dirs) - 1] == substr($file->getFilename(), 0, -4)) + { + $class_name = preg_replace('#^' . preg_quote(implode('_', $dirs), '#') . '#', $dirs[count($dirs) - 1], $old_class_name); + } + else + { + $class_name = preg_replace('#^' . preg_quote(implode('_', $dirs), '#') . '_#', '', $old_class_name); + } + + $code = preg_replace("#^\*/$#m", "*/\n\nnamespace $namespace;", $code, 1, $count); + if ($count != 1) + { + die("Incorrect replacement count for namespace of $old_class_name"); + } + $code = preg_replace("#^(interface|(?:abstract )?class) $old_class_name#m", "\\1 $class_name", $code, -1, $count); + if ($count != 1) + { + die("Incorrect replacement count for $old_class_name"); + } + + $namespaced_file = true; + } + } + + if (preg_match_all('#[^a-z0-9_$](phpbb_[a-z0-9_]+)#', $code, $matches)) + { + foreach ($matches[1] as $old_class_name) + { + $class_name = map_class_name($old_class_name, $code_dir); + if ($class_name) + { + $code = preg_replace("#([^a-z0-9_\$>])$old_class_name([^a-z0-9_])#", '\\1\\\\' . $class_name . '\\2', $code); + } + } + } + + if ($namespaced_file) + { + $code = preg_replace('#new ([a-zA-Z0-9_][a-zA-Z0-9_\\\\]+)#', 'new \\\\\\1', $code); + $code = preg_replace('#([^a-zA-Z0-9_\\\\$])([a-zA-Z0-9_][a-zA-Z0-9_\\\\]+)::#', '\\1\\\\\\2::', $code); + $code = preg_replace('#catch \(([a-zA-Z0-9_][a-zA-Z0-9_\\\\]+)#', 'catch (\\\\\\1', $code); + $code = preg_replace('#(\(|, )([a-zA-Z0-9_][a-zA-Z0-9_\\\\]+)(\s\$)#', '\\1\\\\\\2\\3', $code); + $code = preg_replace('#(implements |extends )([a-zA-Z0-9_][a-zA-Z0-9_\\\\]+)(?=\s*(?:,|\n))#', '\\1\\\\\\2', $code); + $abs_classes = array( + 'Countable', + 'IteratorAggregate', + 'ArrayAccess', + ); + $code = preg_replace('#(\s+)(' . implode('|', $abs_classes) . ')#', '\\1\\\\\\2', $code); + $rel_classes = array( + 'ContainerBuilder', + 'YamlFileLoader', + 'FileLocator', + 'Extension', + 'CompilerPassInterface', + 'EventSubscriberInterface', + 'EventDispatcherInterface', + 'ContainerAwareEventDispatcher', + 'ContainerInterface', + 'KernelEvents', + 'RouteCollection', + 'ControllerResolverInterface', + 'Request', + 'include', + 'array', + 'parent', + 'self', + ); + $code = preg_replace('#([^a-zA-Z0-9_])\\\\((?:' . implode('|', $rel_classes) . ')(?:\s|\(|::|;))#', '\\1\\2', $code); + } + + file_put_contents($file->getPathname(), $code); + } + + if ($file->getExtension() == 'yml') + { + $code = file_get_contents($file->getPathname()); + + if (preg_match_all('#\s*class:\s*(phpbb_[a-z0-9_]+)\s+#', $code, $matches)) + { + foreach ($matches[1] as $old_class_name) + { + $class_name = map_class_name($old_class_name, $code_dir); + if ($class_name) + { + $code = preg_replace("#(\s*class:\s*)$old_class_name(\s+)#", "\\1$class_name\\2", $code); + } + } + } + + file_put_contents($file->getPathname(), $code); + } +} + diff --git a/phpBB/develop/rename_interfaces.php b/phpBB/develop/rename_interfaces.php new file mode 100644 index 0000000000..b27f93e340 --- /dev/null +++ b/phpBB/develop/rename_interfaces.php @@ -0,0 +1,36 @@ +append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir))); +$iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir))); + +$map = array( + 'phpbb\request\request_interface' => 'phpbb\request\request_interface', + 'phpbb\auth\provider\provider_interface' => 'phpbb\auth\provider\provider_interface', + 'phpbb\avatar\driver\driver_interface' => 'phpbb\avatar\driver\driver_interface', + 'phpbb\cache\driver\driver_interface' => 'phpbb\cache\driver\driver_interface', + 'phpbb\db\migration\tool\tool_interface' => 'phpbb\db\migration\tool\tool_interface', + 'phpbb\extension\extension_interface' => 'phpbb\extension\extension_interface', + 'phpbb\groupposition\groupposition_interface' => 'phpbb\groupposition\groupposition_interface', + 'phpbb\log\log_interface' => 'phpbb\log\log_interface', + 'phpbb\notification\method\method_interface' => 'phpbb\notification\method\method_interface', + 'phpbb\notification\type\type_interface' => 'phpbb\notification\type\type_interface', + 'phpbb\request\request_interface' => 'phpbb\request\request_interface', + 'phpbb\tree\tree_interface' => 'phpbb\tree\tree_interface', +); + +foreach ($iterator as $file) +{ + if ($file->getExtension() == 'php') + { + $code = file_get_contents($file->getPathname()); + + foreach ($map as $orig => $new) + { + $code = preg_replace("#([^a-z0-9_\$])$orig([^a-z0-9_])#i", '\\1' . $new . '\\2', $code); + } + file_put_contents($file->getPathname(), $code); + } +} From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:01:09 +0200 Subject: [PATCH 012/102] [ticket/11700] Move all recent code to namespaces PHPBB3-11700 --- phpBB/cache/index.htm | 10 --- phpBB/common.php | 8 +- phpBB/config/auth_providers.yml | 8 +- phpBB/config/avatars.yml | 10 +-- phpBB/config/cron_tasks.yml | 16 ++-- phpBB/config/feed.yml | 18 ++-- phpBB/config/migrator.yml | 10 +-- phpBB/config/notifications.yml | 38 ++++----- phpBB/config/services.yml | 74 ++++++++--------- phpBB/develop/create_schema_files.php | 4 +- phpBB/develop/mysql_upgrader.php | 4 +- phpBB/download/file.php | 4 +- phpBB/includes/acp/acp_attachments.php | 2 +- phpBB/includes/acp/acp_bbcodes.php | 2 +- phpBB/includes/acp/acp_board.php | 2 +- phpBB/includes/acp/acp_bots.php | 2 +- phpBB/includes/acp/acp_database.php | 2 +- phpBB/includes/acp/acp_extensions.php | 20 ++--- phpBB/includes/acp/acp_forums.php | 2 +- phpBB/includes/acp/acp_groups.php | 12 +-- phpBB/includes/acp/acp_icons.php | 6 +- phpBB/includes/acp/acp_language.php | 4 +- phpBB/includes/acp/acp_logs.php | 4 +- phpBB/includes/acp/acp_modules.php | 2 +- phpBB/includes/acp/acp_permissions.php | 10 +-- phpBB/includes/acp/acp_profile.php | 8 +- phpBB/includes/acp/acp_ranks.php | 2 +- phpBB/includes/acp/acp_users.php | 4 +- phpBB/includes/acp/auth.php | 4 +- phpBB/includes/bbcode.php | 8 +- .../plugins/phpbb_captcha_gd_plugin.php | 2 +- .../plugins/phpbb_captcha_qa_plugin.php | 4 +- phpBB/includes/functions.php | 82 +++++++++---------- phpBB/includes/functions_admin.php | 10 +-- phpBB/includes/functions_container.php | 14 ++-- phpBB/includes/functions_database_helper.php | 8 +- phpBB/includes/functions_display.php | 20 ++--- phpBB/includes/functions_download.php | 12 +-- phpBB/includes/functions_install.php | 54 ++++++------ phpBB/includes/functions_messenger.php | 18 ++-- phpBB/includes/functions_privmsgs.php | 2 +- phpBB/includes/functions_upload.php | 2 +- phpBB/includes/functions_url_matcher.php | 16 ++-- phpBB/includes/functions_user.php | 32 ++++---- phpBB/includes/mcp/mcp_forum.php | 4 +- phpBB/includes/mcp/mcp_main.php | 8 +- phpBB/includes/mcp/mcp_queue.php | 12 +-- phpBB/includes/mcp/mcp_warn.php | 4 +- phpBB/includes/message_parser.php | 2 +- phpBB/includes/ucp/ucp_groups.php | 6 +- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/includes/ucp/ucp_notifications.php | 16 ++-- phpBB/includes/ucp/ucp_profile.php | 8 +- phpBB/includes/ucp/ucp_remind.php | 2 +- phpBB/includes/ucp/ucp_zebra.php | 2 +- phpBB/install/database_update.php | 12 +-- phpBB/install/index.php | 18 ++-- phpBB/install/install_convert.php | 8 +- phpBB/install/install_install.php | 14 ++-- phpBB/install/install_update.php | 6 +- phpBB/mcp.php | 2 +- phpBB/memberlist.php | 2 +- phpBB/phpbb/auth/auth.php | 8 +- phpBB/phpbb/auth/provider/apache.php | 26 +++--- phpBB/phpbb/auth/provider/base.php | 4 +- phpBB/phpbb/auth/provider/db.php | 20 +++-- phpBB/phpbb/auth/provider/ldap.php | 12 +-- .../auth/provider/provider_interface.php | 10 ++- phpBB/phpbb/avatar/driver/driver.php | 16 ++-- .../phpbb/avatar/driver/driver_interface.php | 30 +++---- phpBB/phpbb/avatar/driver/gravatar.php | 4 +- phpBB/phpbb/avatar/driver/local.php | 8 +- phpBB/phpbb/avatar/driver/remote.php | 8 +- phpBB/phpbb/avatar/driver/upload.php | 6 +- phpBB/phpbb/avatar/manager.php | 16 ++-- phpBB/phpbb/cache/driver/apc.php | 4 +- phpBB/phpbb/cache/driver/base.php | 4 +- phpBB/phpbb/cache/driver/driver_interface.php | 12 +-- phpBB/phpbb/cache/driver/eaccelerator.php | 4 +- phpBB/phpbb/cache/driver/file.php | 8 +- phpBB/phpbb/cache/driver/memcache.php | 6 +- phpBB/phpbb/cache/driver/memory.php | 6 +- phpBB/phpbb/cache/driver/null.php | 6 +- phpBB/phpbb/cache/driver/redis.php | 10 ++- phpBB/phpbb/cache/driver/wincache.php | 4 +- phpBB/phpbb/cache/driver/xcache.php | 4 +- phpBB/phpbb/cache/service.php | 24 +++--- phpBB/phpbb/config/config.php | 8 +- phpBB/phpbb/config/db.php | 16 ++-- phpBB/phpbb/config/db_text.php | 12 +-- phpBB/phpbb/content_visibility.php | 18 ++-- phpBB/phpbb/controller/exception.php | 4 +- phpBB/phpbb/controller/helper.php | 16 ++-- phpBB/phpbb/controller/provider.php | 6 +- phpBB/phpbb/controller/resolver.php | 30 +++---- phpBB/phpbb/cron/manager.php | 24 +++--- phpBB/phpbb/cron/task/base.php | 4 +- .../phpbb/cron/task/core/prune_all_forums.php | 10 ++- phpBB/phpbb/cron/task/core/prune_forum.php | 16 ++-- phpBB/phpbb/cron/task/core/queue.php | 10 ++- phpBB/phpbb/cron/task/core/tidy_cache.php | 10 ++- phpBB/phpbb/cron/task/core/tidy_database.php | 8 +- phpBB/phpbb/cron/task/core/tidy_search.php | 14 ++-- phpBB/phpbb/cron/task/core/tidy_sessions.php | 10 ++- phpBB/phpbb/cron/task/core/tidy_warnings.php | 8 +- phpBB/phpbb/cron/task/parametrized.php | 10 ++- phpBB/phpbb/cron/task/task.php | 4 +- phpBB/phpbb/cron/task/wrapper.php | 10 ++- phpBB/phpbb/datetime.php | 8 +- phpBB/phpbb/db/driver/driver.php | 8 +- phpBB/phpbb/db/driver/firebird.php | 4 +- phpBB/phpbb/db/driver/mssql.php | 4 +- phpBB/phpbb/db/driver/mssql_base.php | 4 +- phpBB/phpbb/db/driver/mssql_odbc.php | 4 +- phpBB/phpbb/db/driver/mssqlnative.php | 6 +- phpBB/phpbb/db/driver/mysql.php | 4 +- phpBB/phpbb/db/driver/mysql_base.php | 4 +- phpBB/phpbb/db/driver/mysqli.php | 4 +- phpBB/phpbb/db/driver/oracle.php | 4 +- phpBB/phpbb/db/driver/postgres.php | 8 +- phpBB/phpbb/db/driver/sqlite.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_1.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_10.php | 4 +- .../db/migration/data/30x/3_0_10_rc1.php | 4 +- .../db/migration/data/30x/3_0_10_rc2.php | 4 +- .../db/migration/data/30x/3_0_10_rc3.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_11.php | 4 +- .../db/migration/data/30x/3_0_11_rc1.php | 4 +- .../db/migration/data/30x/3_0_11_rc2.php | 4 +- .../db/migration/data/30x/3_0_12_rc1.php | 4 +- .../phpbb/db/migration/data/30x/3_0_1_rc1.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_2.php | 4 +- .../phpbb/db/migration/data/30x/3_0_2_rc1.php | 4 +- .../phpbb/db/migration/data/30x/3_0_2_rc2.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_3.php | 4 +- .../phpbb/db/migration/data/30x/3_0_3_rc1.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_4.php | 4 +- .../phpbb/db/migration/data/30x/3_0_4_rc1.php | 6 +- phpBB/phpbb/db/migration/data/30x/3_0_5.php | 4 +- .../phpbb/db/migration/data/30x/3_0_5_rc1.php | 4 +- .../db/migration/data/30x/3_0_5_rc1part2.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_6.php | 4 +- .../phpbb/db/migration/data/30x/3_0_6_rc1.php | 14 ++-- .../phpbb/db/migration/data/30x/3_0_6_rc2.php | 4 +- .../phpbb/db/migration/data/30x/3_0_6_rc3.php | 6 +- .../phpbb/db/migration/data/30x/3_0_6_rc4.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_7.php | 4 +- .../phpbb/db/migration/data/30x/3_0_7_pl1.php | 4 +- .../phpbb/db/migration/data/30x/3_0_7_rc1.php | 4 +- .../phpbb/db/migration/data/30x/3_0_7_rc2.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_8.php | 4 +- .../phpbb/db/migration/data/30x/3_0_8_rc1.php | 4 +- phpBB/phpbb/db/migration/data/30x/3_0_9.php | 4 +- .../phpbb/db/migration/data/30x/3_0_9_rc1.php | 4 +- .../phpbb/db/migration/data/30x/3_0_9_rc2.php | 4 +- .../phpbb/db/migration/data/30x/3_0_9_rc3.php | 4 +- .../phpbb/db/migration/data/30x/3_0_9_rc4.php | 4 +- .../migration/data/30x/local_url_bbcode.php | 6 +- phpBB/phpbb/db/migration/data/310/avatars.php | 4 +- .../db/migration/data/310/boardindex.php | 4 +- .../db/migration/data/310/config_db_text.php | 4 +- phpBB/phpbb/db/migration/data/310/dev.php | 16 ++-- .../db/migration/data/310/extensions.php | 4 +- .../db/migration/data/310/forgot_password.php | 4 +- .../db/migration/data/310/jquery_update.php | 6 +- .../310/notification_options_reconvert.php | 16 ++-- .../db/migration/data/310/notifications.php | 6 +- .../data/310/notifications_schema_fix.php | 6 +- .../data/310/reported_posts_display.php | 4 +- .../data/310/signature_module_auth.php | 4 +- .../db/migration/data/310/softdelete_p1.php | 6 +- .../db/migration/data/310/softdelete_p2.php | 8 +- .../db/migration/data/310/style_update_p1.php | 6 +- .../db/migration/data/310/style_update_p2.php | 6 +- .../phpbb/db/migration/data/310/teampage.php | 6 +- .../phpbb/db/migration/data/310/timezone.php | 8 +- .../db/migration/data/310/timezone_p2.php | 6 +- phpBB/phpbb/db/migration/exception.php | 12 +-- phpBB/phpbb/db/migration/migration.php | 18 ++-- phpBB/phpbb/db/migration/tool/config.php | 16 ++-- phpBB/phpbb/db/migration/tool/module.php | 36 ++++---- phpBB/phpbb/db/migration/tool/permission.php | 32 ++++---- .../db/migration/tool/tool_interface.php | 4 +- phpBB/phpbb/db/migrator.php | 40 ++++----- phpBB/phpbb/db/sql_insert_buffer.php | 12 +-- phpBB/phpbb/db/tools.php | 26 +++--- phpBB/phpbb/di/extension/config.php | 4 +- phpBB/phpbb/di/extension/core.php | 4 +- phpBB/phpbb/di/extension/ext.php | 4 +- phpBB/phpbb/di/pass/collection_pass.php | 4 +- phpBB/phpbb/di/pass/kernel_pass.php | 12 +-- phpBB/phpbb/di/service_collection.php | 4 +- phpBB/phpbb/error_collector.php | 4 +- phpBB/phpbb/event/data.php | 4 +- phpBB/phpbb/event/dispatcher.php | 6 +- .../event/extension_subscriber_loader.php | 6 +- .../event/kernel_exception_subscriber.php | 18 ++-- .../phpbb/event/kernel_request_subscriber.php | 16 ++-- .../event/kernel_terminate_subscriber.php | 6 +- phpBB/phpbb/extension/base.php | 12 +-- phpBB/phpbb/extension/exception.php | 4 +- phpBB/phpbb/extension/extension_interface.php | 4 +- phpBB/phpbb/extension/finder.php | 36 ++++---- phpBB/phpbb/extension/manager.php | 38 +++++---- phpBB/phpbb/extension/metadata_manager.php | 34 ++++---- phpBB/phpbb/extension/provider.php | 12 +-- phpBB/phpbb/feed/base.php | 32 ++++---- phpBB/phpbb/feed/factory.php | 14 ++-- phpBB/phpbb/feed/forum.php | 6 +- phpBB/phpbb/feed/forums.php | 4 +- phpBB/phpbb/feed/helper.php | 14 ++-- phpBB/phpbb/feed/news.php | 4 +- phpBB/phpbb/feed/overall.php | 4 +- phpBB/phpbb/feed/post_base.php | 4 +- phpBB/phpbb/feed/topic.php | 6 +- phpBB/phpbb/feed/topic_base.php | 4 +- phpBB/phpbb/feed/topics.php | 4 +- phpBB/phpbb/feed/topics_active.php | 4 +- phpBB/phpbb/filesystem.php | 4 +- phpBB/phpbb/groupposition/exception.php | 4 +- .../groupposition/groupposition_interface.php | 4 +- phpBB/phpbb/groupposition/legend.php | 16 ++-- phpBB/phpbb/groupposition/teampage.php | 32 ++++---- phpBB/phpbb/hook/finder.php | 10 ++- phpBB/phpbb/json_response.php | 4 +- phpBB/phpbb/lock/db.php | 12 +-- phpBB/phpbb/lock/flock.php | 4 +- phpBB/phpbb/log/log.php | 22 ++--- phpBB/phpbb/log/log_interface.php | 8 +- phpBB/phpbb/notification/exception.php | 4 +- phpBB/phpbb/notification/manager.php | 34 ++++---- phpBB/phpbb/notification/method/base.php | 46 ++++++----- phpBB/phpbb/notification/method/email.php | 4 +- phpBB/phpbb/notification/method/jabber.php | 4 +- .../notification/method/messenger_base.php | 6 +- .../notification/method/method_interface.php | 8 +- .../phpbb/notification/type/approve_post.php | 4 +- .../phpbb/notification/type/approve_topic.php | 4 +- phpBB/phpbb/notification/type/base.php | 46 ++++++----- phpBB/phpbb/notification/type/bookmark.php | 6 +- .../notification/type/disapprove_post.php | 4 +- .../notification/type/disapprove_topic.php | 4 +- phpBB/phpbb/notification/type/pm.php | 4 +- phpBB/phpbb/notification/type/post.php | 6 +- .../phpbb/notification/type/post_in_queue.php | 4 +- phpBB/phpbb/notification/type/quote.php | 8 +- phpBB/phpbb/notification/type/report_pm.php | 4 +- .../notification/type/report_pm_closed.php | 4 +- phpBB/phpbb/notification/type/report_post.php | 4 +- .../notification/type/report_post_closed.php | 4 +- phpBB/phpbb/notification/type/topic.php | 6 +- .../notification/type/topic_in_queue.php | 4 +- .../notification/type/type_interface.php | 4 +- phpBB/phpbb/php/ini.php | 4 +- .../request/deactivated_super_global.php | 24 +++--- phpBB/phpbb/request/request.php | 74 +++++++++-------- phpBB/phpbb/request/request_interface.php | 30 +++---- phpBB/phpbb/request/type_cast_helper.php | 8 +- .../request/type_cast_helper_interface.php | 8 +- phpBB/phpbb/search/base.php | 8 +- phpBB/phpbb/search/fulltext_mysql.php | 16 ++-- phpBB/phpbb/search/fulltext_native.php | 22 ++--- phpBB/phpbb/search/fulltext_postgres.php | 16 ++-- phpBB/phpbb/search/fulltext_sphinx.php | 26 +++--- phpBB/phpbb/search/sphinx/config.php | 34 ++++---- phpBB/phpbb/search/sphinx/config_comment.php | 8 +- phpBB/phpbb/search/sphinx/config_section.php | 26 +++--- phpBB/phpbb/search/sphinx/config_variable.php | 8 +- phpBB/phpbb/session.php | 26 +++--- phpBB/phpbb/style/extension_path_provider.php | 12 +-- phpBB/phpbb/style/path_provider.php | 6 +- phpBB/phpbb/style/path_provider_interface.php | 4 +- phpBB/phpbb/style/resource_locator.php | 4 +- phpBB/phpbb/style/style.php | 22 ++--- phpBB/phpbb/template/asset.php | 4 +- phpBB/phpbb/template/context.php | 12 +-- phpBB/phpbb/template/locator.php | 4 +- phpBB/phpbb/template/template.php | 28 ++++--- phpBB/phpbb/template/twig/definition.php | 8 +- phpBB/phpbb/template/twig/environment.php | 14 ++-- phpBB/phpbb/template/twig/extension.php | 68 +++++++-------- phpBB/phpbb/template/twig/lexer.php | 4 +- phpBB/phpbb/template/twig/node/definenode.php | 10 ++- phpBB/phpbb/template/twig/node/event.php | 10 ++- .../node/expression/binary/equalequal.php | 6 +- .../node/expression/binary/notequalequal.php | 6 +- .../phpbb/template/twig/node/includeasset.php | 10 ++- phpBB/phpbb/template/twig/node/includecss.php | 6 +- phpBB/phpbb/template/twig/node/includejs.php | 6 +- .../phpbb/template/twig/node/includenode.php | 6 +- phpBB/phpbb/template/twig/node/includephp.php | 10 ++- phpBB/phpbb/template/twig/node/php.php | 8 +- .../twig/tokenparser/defineparser.php | 18 ++-- .../phpbb/template/twig/tokenparser/event.php | 10 ++- .../template/twig/tokenparser/includecss.php | 10 ++- .../template/twig/tokenparser/includejs.php | 10 ++- .../twig/tokenparser/includeparser.php | 8 +- .../template/twig/tokenparser/includephp.php | 14 ++-- phpBB/phpbb/template/twig/tokenparser/php.php | 14 ++-- phpBB/phpbb/template/twig/twig.php | 60 +++++++------- phpBB/phpbb/tree/nestedset.php | 38 +++++---- phpBB/phpbb/tree/nestedset_forum.php | 10 ++- phpBB/phpbb/tree/tree_interface.php | 8 +- phpBB/phpbb/user.php | 28 ++++--- phpBB/phpbb/user_loader.php | 10 ++- phpBB/posting.php | 2 +- phpBB/search.php | 2 +- phpBB/ucp.php | 4 +- phpBB/viewforum.php | 2 +- phpBB/viewtopic.php | 4 +- tests/acp_board/auth_provider/valid.php | 2 +- tests/auth/provider_apache_test.php | 16 ++-- tests/auth/provider_db_test.php | 8 +- tests/avatar/driver/barfoo.php | 2 +- tests/avatar/driver/foobar.php | 2 +- tests/avatar/manager_test.php | 12 +-- tests/cache/apc_driver_test.php | 4 +- tests/cache/common_test_case.php | 12 +-- tests/cache/file_driver_test.php | 2 +- tests/cache/null_driver_test.php | 12 +-- tests/cache/redis_driver_test.php | 2 +- tests/class_loader/class_loader_test.php | 6 +- tests/config/config_test.php | 28 +++---- tests/config/db_test.php | 16 ++-- tests/config/db_text_test.php | 2 +- tests/content_visibility/delete_post_test.php | 8 +- .../get_forums_visibility_sql_test.php | 6 +- .../get_global_visibility_sql_test.php | 6 +- .../get_visibility_sql_test.php | 6 +- .../set_post_visibility_test.php | 6 +- .../set_topic_visibility_test.php | 6 +- tests/controller/controller_test.php | 4 +- tests/controller/helper_url_test.php | 14 ++-- tests/cron/ext/testext/cron/dummy_task.php | 2 +- .../includes/cron/task/core/dummy_task.php | 2 +- .../cron/task/core/second_dummy_task.php | 2 +- tests/cron/manager_test.php | 6 +- tests/cron/tasks/simple_not_runnable.php | 2 +- tests/cron/tasks/simple_ready.php | 2 +- tests/cron/tasks/simple_should_not_run.php | 2 +- tests/datetime/from_format_test.php | 2 +- tests/dbal/auto_increment_test.php | 2 +- tests/dbal/case_test.php | 12 +-- tests/dbal/concatenate_test.php | 4 +- tests/dbal/db_tools_test.php | 6 +- tests/dbal/migration/dummy.php | 4 +- tests/dbal/migration/fail.php | 2 +- tests/dbal/migration/if.php | 2 +- tests/dbal/migration/installed.php | 2 +- tests/dbal/migration/recall.php | 2 +- tests/dbal/migration/revert.php | 6 +- .../dbal/migration/revert_with_dependency.php | 2 +- tests/dbal/migration/unfulfillable.php | 2 +- tests/dbal/migrator_test.php | 28 +++---- tests/dbal/migrator_tool_config_test.php | 4 +- tests/dbal/migrator_tool_module_test.php | 10 +-- tests/dbal/migrator_tool_permission_test.php | 6 +- tests/dbal/schema_test.php | 4 +- tests/dbal/sql_insert_buffer_test.php | 4 +- tests/dbal/write_test.php | 18 ++-- tests/di/create_container_test.php | 14 ++-- tests/di/fixtures/config.php | 2 +- tests/error_collector_test.php | 2 +- tests/event/dispatcher_test.php | 4 +- tests/extension/ext/bar/ext.php | 2 +- tests/extension/ext/barfoo/ext.php | 2 +- tests/extension/ext/foo/ext.php | 2 +- tests/extension/ext/vendor/moo/ext.php | 2 +- tests/extension/finder_test.php | 6 +- tests/extension/manager_test.php | 10 +-- tests/extension/metadata_manager_test.php | 56 ++++++------- tests/extension/style_path_provider_test.php | 4 +- tests/filesystem/clean_path_test.php | 2 +- tests/functional/acp_permissions_test.php | 6 +- .../ext/foo/bar/controller/controller.php | 4 +- tests/functional/fixtures/ext/foo/bar/ext.php | 2 +- tests/functions/obtain_online_test.php | 2 +- .../group_user_attributes_test.php | 6 +- tests/groupposition/legend_test.php | 30 +++---- tests/groupposition/teampage_test.php | 34 ++++---- tests/lock/db_test.php | 10 +-- tests/lock/flock_test.php | 12 +-- tests/log/add_test.php | 12 +-- tests/log/function_add_log_test.php | 6 +- tests/log/function_view_log_test.php | 4 +- tests/mock/cache.php | 4 +- tests/mock/extension_manager.php | 4 +- tests/mock/metadata_manager.php | 2 +- tests/mock/notifications_auth.php | 2 +- tests/mock/request.php | 32 ++++---- tests/mock/session_testable.php | 2 +- tests/mock/sql_insert_buffer.php | 2 +- tests/notification/convert_test.php | 6 +- .../ext/test/notification/type/test.php | 2 +- tests/notification/manager_helper.php | 2 +- tests/notification/notification_test.php | 10 +-- tests/notification/submit_post_base.php | 20 ++--- .../request/deactivated_super_global_test.php | 2 +- tests/request/request_test.php | 8 +- tests/request/request_var_test.php | 2 +- tests/request/type_cast_helper_test.php | 2 +- tests/search/mysql_test.php | 2 +- tests/search/native_test.php | 2 +- tests/search/postgres_test.php | 2 +- tests/security/base.php | 4 +- tests/security/extract_current_page_test.php | 8 +- tests/session/continue_test.php | 8 +- tests/session/creation_test.php | 8 +- tests/session/testable_factory.php | 6 +- tests/template/template_events_test.php | 10 +-- tests/template/template_test_case.php | 12 +-- .../template/template_test_case_with_tree.php | 10 +-- .../phpbb_database_test_case.php | 2 +- ...phpbb_database_test_connection_manager.php | 68 +++++++-------- .../phpbb_functional_test_case.php | 38 ++++----- .../phpbb_test_case_helpers.php | 2 +- tests/tree/nestedset_forum_base.php | 8 +- tests/user/lang_test.php | 4 +- tests/user/user_loader_test.php | 2 +- tests/wrapper/phpbb_php_ini_fake.php | 2 +- 420 files changed, 2316 insertions(+), 1840 deletions(-) delete mode 100644 phpBB/cache/index.htm diff --git a/phpBB/cache/index.htm b/phpBB/cache/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/cache/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/common.php b/phpBB/common.php index 41d367d43c..027df4b2f3 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -47,7 +47,7 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); - $phpbb_filesystem = new phpbb_filesystem(); + $phpbb_filesystem = new \phpbb\filesystem(); $script_path = $phpbb_filesystem->clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; @@ -85,9 +85,9 @@ 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}phpbb/", $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 = new \phpbb\class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container @@ -125,7 +125,7 @@ $phpbb_style = $phpbb_container->get('style'); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); -$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display'))); +$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('\phpbb\template\template', 'display'))); $phpbb_hook_finder = $phpbb_container->get('hook_finder'); foreach ($phpbb_hook_finder->find() as $hook) diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml index bcc448e4d7..0a20ed6a80 100644 --- a/phpBB/config/auth_providers.yml +++ b/phpBB/config/auth_providers.yml @@ -1,12 +1,12 @@ services: auth.provider_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: auth.provider } auth.provider.db: - class: phpbb_auth_provider_db + class: phpbb\auth\provider\db arguments: - @dbal.conn - @config @@ -17,7 +17,7 @@ services: tags: - { name: auth.provider } auth.provider.apache: - class: phpbb_auth_provider_apache + class: phpbb\auth\provider\apache arguments: - @dbal.conn - @config @@ -28,7 +28,7 @@ services: tags: - { name: auth.provider } auth.provider.ldap: - class: phpbb_auth_provider_ldap + class: phpbb\auth\provider\ldap arguments: - @dbal.conn - @config diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml index 0aad08bac9..31ae1ecef9 100644 --- a/phpBB/config/avatars.yml +++ b/phpBB/config/avatars.yml @@ -1,6 +1,6 @@ services: avatar.driver.gravatar: - class: phpbb_avatar_driver_gravatar + class: phpbb\avatar\driver\gravatar arguments: - @config - %core.root_path% @@ -12,7 +12,7 @@ services: - { name: avatar.driver } avatar.driver.local: - class: phpbb_avatar_driver_local + class: phpbb\avatar\driver\local arguments: - @config - %core.root_path% @@ -24,7 +24,7 @@ services: - { name: avatar.driver } avatar.driver.remote: - class: phpbb_avatar_driver_remote + class: phpbb\avatar\driver\remote arguments: - @config - %core.root_path% @@ -36,7 +36,7 @@ services: - { name: avatar.driver } avatar.driver.upload: - class: phpbb_avatar_driver_upload + class: phpbb\avatar\driver\upload arguments: - @config - %core.root_path% @@ -48,7 +48,7 @@ services: - { name: avatar.driver } avatar.driver_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/cron_tasks.yml b/phpBB/config/cron_tasks.yml index d1954b1877..0c9795c0bd 100644 --- a/phpBB/config/cron_tasks.yml +++ b/phpBB/config/cron_tasks.yml @@ -1,6 +1,6 @@ services: cron.task.core.prune_all_forums: - class: phpbb_cron_task_core_prune_all_forums + class: phpbb\cron\task\core\prune_all_forums arguments: - %core.root_path% - %core.php_ext% @@ -12,7 +12,7 @@ services: - { name: cron.task } cron.task.core.prune_forum: - class: phpbb_cron_task_core_prune_forum + class: phpbb\cron\task\core\prune_forum arguments: - %core.root_path% - %core.php_ext% @@ -24,7 +24,7 @@ services: - { name: cron.task } cron.task.core.queue: - class: phpbb_cron_task_core_queue + class: phpbb\cron\task\core\queue arguments: - %core.root_path% - %core.php_ext% @@ -35,7 +35,7 @@ services: - { name: cron.task } cron.task.core.tidy_cache: - class: phpbb_cron_task_core_tidy_cache + class: phpbb\cron\task\core\tidy_cache arguments: - @config - @cache.driver @@ -45,7 +45,7 @@ services: - { name: cron.task } cron.task.core.tidy_database: - class: phpbb_cron_task_core_tidy_database + class: phpbb\cron\task\core\tidy_database arguments: - %core.root_path% - %core.php_ext% @@ -56,7 +56,7 @@ services: - { name: cron.task } cron.task.core.tidy_search: - class: phpbb_cron_task_core_tidy_search + class: phpbb\cron\task\core\tidy_search arguments: - %core.root_path% - %core.php_ext% @@ -70,7 +70,7 @@ services: - { name: cron.task } cron.task.core.tidy_sessions: - class: phpbb_cron_task_core_tidy_sessions + class: phpbb\cron\task\core\tidy_sessions arguments: - @config - @user @@ -80,7 +80,7 @@ services: - { name: cron.task } cron.task.core.tidy_warnings: - class: phpbb_cron_task_core_tidy_warnings + class: phpbb\cron\task\core\tidy_warnings arguments: - %core.root_path% - %core.php_ext% diff --git a/phpBB/config/feed.yml b/phpBB/config/feed.yml index 5a4cdae815..7712a832f3 100644 --- a/phpBB/config/feed.yml +++ b/phpBB/config/feed.yml @@ -1,20 +1,20 @@ services: feed.helper: - class: phpbb_feed_helper + class: phpbb\feed\helper arguments: - @config - @user - %core.root_path% feed.factory: - class: phpbb_feed_factory + class: phpbb\feed\factory arguments: - @service_container - @config - @dbal.conn feed.forum: - class: phpbb_feed_forum + class: phpbb\feed\forum scope: prototype arguments: - @feed.helper @@ -27,7 +27,7 @@ services: - %core.php_ext% feed.forums: - class: phpbb_feed_forums + class: phpbb\feed\forums scope: prototype arguments: - @feed.helper @@ -40,7 +40,7 @@ services: - %core.php_ext% feed.news: - class: phpbb_feed_news + class: phpbb\feed\news scope: prototype arguments: - @feed.helper @@ -53,7 +53,7 @@ services: - %core.php_ext% feed.overall: - class: phpbb_feed_overall + class: phpbb\feed\overall scope: prototype arguments: - @feed.helper @@ -66,7 +66,7 @@ services: - %core.php_ext% feed.topic: - class: phpbb_feed_topic + class: phpbb\feed\topic scope: prototype arguments: - @feed.helper @@ -79,7 +79,7 @@ services: - %core.php_ext% feed.topics: - class: phpbb_feed_topics + class: phpbb\feed\topics scope: prototype arguments: - @feed.helper @@ -92,7 +92,7 @@ services: - %core.php_ext% feed.topics_active: - class: phpbb_feed_topics_active + class: phpbb\feed\topics_active scope: prototype arguments: - @feed.helper diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml index 999a2d41a3..a94609418f 100644 --- a/phpBB/config/migrator.yml +++ b/phpBB/config/migrator.yml @@ -1,6 +1,6 @@ services: migrator: - class: phpbb_db_migrator + class: phpbb\db\migrator arguments: - @config - @dbal.conn @@ -12,21 +12,21 @@ services: - @migrator.tool_collection migrator.tool_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: migrator.tool } migrator.tool.config: - class: phpbb_db_migration_tool_config + class: phpbb\db\migration\tool\config arguments: - @config tags: - { name: migrator.tool } migrator.tool.module: - class: phpbb_db_migration_tool_module + class: phpbb\db\migration\tool\module arguments: - @dbal.conn - @cache @@ -38,7 +38,7 @@ services: - { name: migrator.tool } migrator.tool.permission: - class: phpbb_db_migration_tool_permission + class: phpbb\db\migration\tool\permission arguments: - @dbal.conn - @cache diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 60aa63a854..adafa99e75 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -1,20 +1,20 @@ services: notification.type_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: notification.type } notification.method_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: notification.method } notification.type.approve_post: - class: phpbb_notification_type_approve_post + class: phpbb\notification\type\approve_post scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work! arguments: - @user_loader @@ -32,7 +32,7 @@ services: - { name: notification.type } notification.type.approve_topic: - class: phpbb_notification_type_approve_topic + class: phpbb\notification\type\approve_topic scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -50,7 +50,7 @@ services: - { name: notification.type } notification.type.bookmark: - class: phpbb_notification_type_bookmark + class: phpbb\notification\type\bookmark scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -68,7 +68,7 @@ services: - { name: notification.type } notification.type.disapprove_post: - class: phpbb_notification_type_disapprove_post + class: phpbb\notification\type\disapprove_post scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -86,7 +86,7 @@ services: - { name: notification.type } notification.type.disapprove_topic: - class: phpbb_notification_type_disapprove_topic + class: phpbb\notification\type\disapprove_topic scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -104,7 +104,7 @@ services: - { name: notification.type } notification.type.pm: - class: phpbb_notification_type_pm + class: phpbb\notification\type\pm scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -122,7 +122,7 @@ services: - { name: notification.type } notification.type.post: - class: phpbb_notification_type_post + class: phpbb\notification\type\post scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -140,7 +140,7 @@ services: - { name: notification.type } notification.type.post_in_queue: - class: phpbb_notification_type_post_in_queue + class: phpbb\notification\type\post_in_queue scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -158,7 +158,7 @@ services: - { name: notification.type } notification.type.quote: - class: phpbb_notification_type_quote + class: phpbb\notification\type\quote scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -176,7 +176,7 @@ services: - { name: notification.type } notification.type.report_pm: - class: phpbb_notification_type_report_pm + class: phpbb\notification\type\report_pm scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -194,7 +194,7 @@ services: - { name: notification.type } notification.type.report_pm_closed: - class: phpbb_notification_type_report_pm_closed + class: phpbb\notification\type\report_pm_closed scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -212,7 +212,7 @@ services: - { name: notification.type } notification.type.report_post: - class: phpbb_notification_type_report_post + class: phpbb\notification\type\report_post scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -230,7 +230,7 @@ services: - { name: notification.type } notification.type.report_post_closed: - class: phpbb_notification_type_report_post + class: phpbb\notification\type\report_post scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -248,7 +248,7 @@ services: - { name: notification.type } notification.type.topic: - class: phpbb_notification_type_topic + class: phpbb\notification\type\topic scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -266,7 +266,7 @@ services: - { name: notification.type } notification.type.topic_in_queue: - class: phpbb_notification_type_topic_in_queue + class: phpbb\notification\type\topic_in_queue scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -284,7 +284,7 @@ services: - { name: notification.type } notification.method.email: - class: phpbb_notification_method_email + class: phpbb\notification\method\email scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -299,7 +299,7 @@ services: - { name: notification.method } notification.method.jabber: - class: phpbb_notification_method_jabber + class: phpbb\notification\method\jabber scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index c1579cfb57..f238ed3ed6 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -9,17 +9,17 @@ imports: services: auth: - class: phpbb_auth + class: phpbb\auth\auth avatar.manager: - class: phpbb_avatar_manager + class: phpbb\avatar\manager arguments: - @config - @avatar.driver_collection - @service_container cache: - class: phpbb_cache_service + class: phpbb\cache\service arguments: - @cache.driver - @config @@ -31,10 +31,10 @@ services: class: %cache.driver.class% cache.driver.install: - class: phpbb_cache_driver_file + class: phpbb\cache\driver\file class_loader: - class: phpbb_class_loader + class: phpbb\class_loader arguments: - phpbb_ - %core.root_path%includes/ @@ -44,7 +44,7 @@ services: - [set_cache, [@cache.driver]] class_loader.ext: - class: phpbb_class_loader + class: phpbb\class_loader arguments: - phpbb_ext_ - %core.root_path%ext/ @@ -54,20 +54,20 @@ services: - [set_cache, [@cache.driver]] config: - class: phpbb_config_db + class: phpbb\config\db arguments: - @dbal.conn - @cache.driver - %tables.config% config_text: - class: phpbb_config_db_text + class: phpbb\config\db_text arguments: - @dbal.conn - %tables.config_text% content.visibility: - class: phpbb_content_visibility + class: phpbb\content_visibility arguments: - @auth - @dbal.conn @@ -80,7 +80,7 @@ services: - %tables.users% controller.helper: - class: phpbb_controller_helper + class: phpbb\controller\helper arguments: - @template - @user @@ -88,35 +88,35 @@ services: - %core.php_ext% controller.resolver: - class: phpbb_controller_resolver + class: phpbb\controller\resolver arguments: - @user - @service_container - @style cron.task_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: cron.task } cron.manager: - class: phpbb_cron_manager + class: phpbb\cron\manager arguments: - @cron.task_collection - %core.root_path% - %core.php_ext% cron.lock_db: - class: phpbb_lock_db + class: phpbb\lock\db arguments: - cron_lock - @config - @dbal.conn dispatcher: - class: phpbb_event_dispatcher + class: phpbb\event\dispatcher arguments: - @service_container @@ -126,12 +126,12 @@ services: - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] dbal.tools: - class: phpbb_db_tools + class: phpbb\db\tools arguments: - @dbal.conn event.subscriber_loader: - class: phpbb_event_extension_subscriber_loader + class: phpbb\event\extension_subscriber_loader arguments: - @dispatcher - @ext.manager @@ -139,7 +139,7 @@ services: - [load, []] ext.manager: - class: phpbb_extension_manager + class: phpbb\extension\manager arguments: - @service_container - @dbal.conn @@ -151,7 +151,7 @@ services: - @cache.driver ext.finder: - class: phpbb_extension_finder + class: phpbb\extension\finder arguments: - @ext.manager - @filesystem @@ -161,16 +161,16 @@ services: - _ext_finder filesystem: - class: phpbb_filesystem + class: phpbb\filesystem groupposition.legend: - class: phpbb_groupposition_legend + class: phpbb\groupposition\legend arguments: - @dbal.conn - @user groupposition.teampage: - class: phpbb_groupposition_teampage + class: phpbb\groupposition\teampage arguments: - @dbal.conn - @user @@ -183,14 +183,14 @@ services: - @controller.resolver hook_finder: - class: phpbb_hook_finder + class: phpbb\hook\finder arguments: - %core.root_path% - %core.php_ext% - @cache.driver kernel_request_subscriber: - class: phpbb_event_kernel_request_subscriber + class: phpbb\event\kernel_request_subscriber arguments: - @ext.finder - %core.root_path% @@ -199,7 +199,7 @@ services: - { name: kernel.event_subscriber } kernel_exception_subscriber: - class: phpbb_event_kernel_exception_subscriber + class: phpbb\event\kernel_exception_subscriber arguments: - @template - @user @@ -207,12 +207,12 @@ services: - { name: kernel.event_subscriber } kernel_terminate_subscriber: - class: phpbb_event_kernel_terminate_subscriber + class: phpbb\event\kernel_terminate_subscriber tags: - { name: kernel.event_subscriber } log: - class: phpbb_log + class: phpbb\log\log arguments: - @dbal.conn - @user @@ -224,7 +224,7 @@ services: - %tables.log% notification_manager: - class: phpbb_notification_manager + class: phpbb\notification\manager arguments: - @notification.type_collection - @notification.method_collection @@ -240,10 +240,10 @@ services: - %tables.user_notifications% request: - class: phpbb_request + class: phpbb\request\request style: - class: phpbb_style + class: phpbb\style\style arguments: - %core.root_path% - %core.php_ext% @@ -254,20 +254,20 @@ services: - @template style.resource_locator: - class: phpbb_style_resource_locator + class: phpbb\style\resource_locator style.path_provider_ext: - class: phpbb_style_extension_path_provider + class: phpbb\style\extension_path_provider arguments: - @ext.manager - @style.path_provider - %core.root_path% style.path_provider: - class: phpbb_style_path_provider + class: phpbb\style\path_provider template: - class: phpbb_template_twig + class: phpbb\template\twig\twig arguments: - %core.root_path% - %core.php_ext% @@ -278,13 +278,13 @@ services: - %core.adm_relative_path% template_context: - class: phpbb_template_context + class: phpbb\template\context user: - class: phpbb_user + class: phpbb\user user_loader: - class: phpbb_user_loader + class: phpbb\user_loader arguments: - @dbal.conn - %core.root_path% diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 316fbe19e6..dc224cd411 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -986,7 +986,7 @@ function get_schema_struct() ), ); - $schema_data['phpbb_config'] = array( + $schema_data['\phpbb\config\config'] = array( 'COLUMNS' => array( 'config_name' => array('VCHAR', ''), 'config_value' => array('VCHAR_UNI', ''), @@ -1226,7 +1226,7 @@ function get_schema_struct() ), ); - $schema_data['phpbb_log'] = array( + $schema_data['\phpbb\log\log'] = array( 'COLUMNS' => array( 'log_id' => array('UINT', NULL, 'auto_increment'), 'log_type' => array('TINT:4', 0), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 597dd5e932..0a8d2b00f6 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -453,7 +453,7 @@ function get_schema_struct() ), ); - $schema_data['phpbb_config'] = array( + $schema_data['\phpbb\config\config'] = array( 'COLUMNS' => array( 'config_name' => array('VCHAR', ''), 'config_value' => array('VCHAR_UNI', ''), @@ -674,7 +674,7 @@ function get_schema_struct() ), ); - $schema_data['phpbb_log'] = array( + $schema_data['\phpbb\log\log'] = array( 'COLUMNS' => array( 'log_id' => array('UINT', NULL, 'auto_increment'), 'log_type' => array('TINT:4', 0), diff --git a/phpBB/download/file.php b/phpBB/download/file.php index cf7128b25b..8912a9f9d0 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -50,9 +50,9 @@ if (isset($_GET['avatar'])) require($phpbb_root_path . 'includes/utf/utf_tools.' . $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}includes/", $phpEx); $phpbb_class_loader->register(); - $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); + $phpbb_class_loader_ext = new \phpbb\class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index f7b3a166dd..55459739ca 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1472,7 +1472,7 @@ class acp_attachments $ip_list = array_unique(explode("\n", $ips)); $ip_list_log = implode(', ', $ip_list); - $ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_request_interface::POST); + $ip_exclude = (int) $request->variable('ipexclude', false, false, \phpbb\request\request_interface::POST); $iplist = array(); $hostlist = array(); diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 9c430b5a0b..dca39df38c 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -275,7 +275,7 @@ class acp_bbcodes if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['BBCODE_DELETED'], diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 2a0d517307..309376a75d 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -679,7 +679,7 @@ class acp_board foreach ($auth_providers as $key => $value) { - if (!($value instanceof phpbb_auth_provider_provider_interface)) + if (!($value instanceof \phpbb\auth\provider\provider_interface)) { continue; } diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index b9dd6664f4..e28a8d6451 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -355,7 +355,7 @@ class acp_bots if ($request->is_ajax() && ($action == 'activate' || $action == 'deactivate')) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'text' => $user->lang['BOT_' . (($action == 'activate') ? 'DE' : '') . 'ACTIVATE'], )); diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 5d191b3d0f..fc08a5fb94 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -28,7 +28,7 @@ class acp_database global $cache, $db, $user, $auth, $template, $table_prefix; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - $this->db_tools = new phpbb_db_tools($db); + $this->db_tools = new \phpbb\db\tools($db); $user->add_lang('acp/database'); diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 379e779c2c..b41f4d4e81 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -58,13 +58,13 @@ class acp_extensions // If they've specified an extension, let's load the metadata manager and validate it. if ($ext_name) { - $md_manager = new phpbb_extension_metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path); + $md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path); try { $md_manager->get_metadata('all'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { trigger_error($e); } @@ -120,7 +120,7 @@ class acp_extensions } } } - catch (phpbb_db_migration_exception $e) + catch (\phpbb\db\migration\exception $e) { $template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user)); } @@ -188,7 +188,7 @@ class acp_extensions } } } - catch (phpbb_db_migration_exception $e) + catch (\phpbb\db\migration\exception $e) { $template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user)); } @@ -217,7 +217,7 @@ class acp_extensions * @param $phpbb_extension_manager An instance of the extension manager * @return null */ - public function list_enabled_exts(phpbb_extension_manager $phpbb_extension_manager) + public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_manager) { foreach ($phpbb_extension_manager->all_enabled() as $name => $location) { @@ -236,7 +236,7 @@ class acp_extensions 'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name), )); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->template->assign_block_vars('disabled', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), @@ -251,7 +251,7 @@ class acp_extensions * @param $phpbb_extension_manager An instance of the extension manager * @return null */ - public function list_disabled_exts(phpbb_extension_manager $phpbb_extension_manager) + public function list_disabled_exts(\phpbb\extension\manager $phpbb_extension_manager) { foreach ($phpbb_extension_manager->all_disabled() as $name => $location) { @@ -270,7 +270,7 @@ class acp_extensions 'PURGE' => $this->u_action . '&action=purge_pre&ext_name=' . urlencode($name), )); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->template->assign_block_vars('disabled', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), @@ -285,7 +285,7 @@ class acp_extensions * @param $phpbb_extension_manager An instance of the extension manager * @return null */ - public function list_available_exts(phpbb_extension_manager $phpbb_extension_manager) + public function list_available_exts(\phpbb\extension\manager $phpbb_extension_manager) { $uninstalled = array_diff_key($phpbb_extension_manager->all_available(), $phpbb_extension_manager->all_configured()); @@ -305,7 +305,7 @@ class acp_extensions 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), )); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->template->assign_block_vars('disabled', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 970b033995..580c68f3ed 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -269,7 +269,7 @@ class acp_forums if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array('success' => ($move_forum_name !== false))); } diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index e6a36c97a8..ad29a5521b 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -324,7 +324,7 @@ class acp_groups $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the group_ prefix - $avatar_data = phpbb_avatar_manager::clean_row($group_row); + $avatar_data = \phpbb\avatar\manager::clean_row($group_row); } @@ -891,7 +891,7 @@ class acp_groups break; } } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING); } @@ -919,7 +919,7 @@ class acp_groups break; } } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING); } @@ -943,7 +943,7 @@ class acp_groups if (($action == 'move_up' || $action == 'move_down') && $request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array('success' => true)); } @@ -961,7 +961,7 @@ class acp_groups $template->assign_block_vars('legend', array( 'GROUP_NAME' => $group_name, 'GROUP_COLOUR' => ($row['group_colour']) ? '#' . $row['group_colour'] : '', - 'GROUP_TYPE' => $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])], + 'GROUP_TYPE' => $user->lang[\phpbb\groupposition\legend::group_type_language($row['group_type'])], 'U_MOVE_DOWN' => "{$this->u_action}&field=legend&action=move_down&g=" . $row['group_id'], 'U_MOVE_UP' => "{$this->u_action}&field=legend&action=move_up&g=" . $row['group_id'], @@ -1004,7 +1004,7 @@ class acp_groups if ($row['group_id']) { $group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; - $group_type = $user->lang[phpbb_groupposition_teampage::group_type_language($row['group_type'])]; + $group_type = $user->lang[\phpbb\groupposition\teampage::group_type_language($row['group_type'])]; } else { diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index f72ac82f6a..5b23f9c3a0 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -338,7 +338,7 @@ class acp_icons $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); // Ok, add the relevant bits if we are adding new codes to existing emoticons... - if ($request->variable('add_additional_code', false, false, phpbb_request_request_interface::POST)) + if ($request->variable('add_additional_code', false, false, \phpbb\request\request_interface::POST)) { $add_image = request_var('add_image', ''); $add_code = utf8_normalize_nfc(request_var('add_code', '', true)); @@ -354,7 +354,7 @@ class acp_icons $image_width[$add_image] = request_var('add_width', 0); $image_height[$add_image] = request_var('add_height', 0); - if ($request->variable('add_display_on_posting', false, false, phpbb_request_request_interface::POST)) + if ($request->variable('add_display_on_posting', false, false, \phpbb\request\request_interface::POST)) { $image_display_on_posting[$add_image] = 1; } @@ -785,7 +785,7 @@ class acp_icons if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $notice, diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 9d3532244f..013aab670f 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -161,7 +161,7 @@ class acp_language 'method' => $method) ); - $hidden_data .= build_hidden_fields(array('entry' => $request->variable('entry', $request_default, true, phpbb_request_request_interface::POST))); + $hidden_data .= build_hidden_fields(array('entry' => $request->variable('entry', $request_default, true, \phpbb\request\request_interface::POST))); $template->assign_vars(array( 'S_UPLOAD' => true, @@ -218,7 +218,7 @@ class acp_language trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); } - $entry_value = $request->variable('entry', $request_default, true, phpbb_request_request_interface::POST); + $entry_value = $request->variable('entry', $request_default, true, \phpbb\request\request_interface::POST); if (!$lang_id || !$entry_value) { diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 2120f67675..229bf135ff 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -35,8 +35,8 @@ class acp_logs $forum_id = request_var('f', 0); $topic_id = request_var('t', 0); $start = request_var('start', 0); - $deletemark = $request->variable('delmarked', false, false, phpbb_request_request_interface::POST); - $deleteall = $request->variable('delall', false, false, phpbb_request_request_interface::POST); + $deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST); + $deleteall = $request->variable('delall', false, false, \phpbb\request\request_interface::POST); $marked = request_var('mark', array(0)); // Sort keys diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index a1e681b29c..a1819e6dd5 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -375,7 +375,7 @@ class acp_modules { if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang('ERROR'), 'MESSAGE_TEXT' => implode('
', $errors), diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 57e14c4787..2cc5595190 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -676,7 +676,7 @@ class acp_permissions list($ug_id, ) = each($psubmit); list($forum_id, ) = each($psubmit[$ug_id]); - $settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_request_interface::POST); + $settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, \phpbb\request\request_interface::POST); if (empty($settings) || empty($settings[$ug_id]) || empty($settings[$ug_id][$forum_id])) { trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING); @@ -685,7 +685,7 @@ class acp_permissions $auth_settings = $settings[$ug_id][$forum_id]; // Do we have a role we want to set? - $roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_request_interface::POST); + $roles = $request->variable('role', array(0 => array(0 => 0)), false, \phpbb\request\request_interface::POST); $assigned_role = (isset($roles[$ug_id][$forum_id])) ? (int) $roles[$ug_id][$forum_id] : 0; // Do the admin want to set these permissions to other items too? @@ -757,8 +757,8 @@ class acp_permissions trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $auth_settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request_request_interface::POST); - $auth_roles = $request->variable('role', array(0 => array(0 => 0)), false, phpbb_request_request_interface::POST); + $auth_settings = $request->variable('setting', array(0 => array(0 => array('' => 0))), false, \phpbb\request\request_interface::POST); + $auth_roles = $request->variable('role', array(0 => array(0 => 0)), false, \phpbb\request\request_interface::POST); $ug_ids = $forum_ids = array(); // We need to go through the auth settings @@ -1100,7 +1100,7 @@ class acp_permissions { if ($user_id != $user->data['user_id']) { - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($userdata); $auth_setting = $auth2->acl_get($permission); } diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 09a88d4311..4e8145009f 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -245,7 +245,7 @@ class acp_profile if ($request->is_ajax()) { - $json_response = new phpbb_json_response(); + $json_response = new \phpbb\json_response(); $json_response->send(array( 'text' => $user->lang('DEACTIVATE'), )); @@ -277,7 +277,7 @@ class acp_profile if ($request->is_ajax()) { - $json_response = new phpbb_json_response(); + $json_response = new \phpbb\json_response(); $json_response->send(array( 'text' => $user->lang('ACTIVATE'), )); @@ -510,7 +510,7 @@ class acp_profile $cp->vars['field_default_value_month'] = $now['mon']; $cp->vars['field_default_value_year'] = $now['year']; $var = 'now'; - $request->overwrite('field_default_value', $var, phpbb_request_request_interface::POST); + $request->overwrite('field_default_value', $var, \phpbb\request\request_interface::POST); } else { @@ -520,7 +520,7 @@ class acp_profile $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); $var = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); - $request->overwrite('field_default_value', $var, phpbb_request_request_interface::POST); + $request->overwrite('field_default_value', $var, \phpbb\request\request_interface::POST); } else { diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php index 6b06d03f52..73e1de44d9 100644 --- a/phpBB/includes/acp/acp_ranks.php +++ b/phpBB/includes/acp/acp_ranks.php @@ -125,7 +125,7 @@ class acp_ranks if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['RANK_REMOVED'], diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index cbfd578d87..8853200ddc 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1604,7 +1604,7 @@ class acp_users || $user_row['user_allow_viewonline'] && !$sql_ary['user_allow_viewonline']) { // We also need to check if the user has the permission to cloak. - $user_auth = new phpbb_auth(); + $user_auth = new \phpbb\auth\auth(); $user_auth->acl($user_row); $session_sql_ary = array( @@ -1742,7 +1742,7 @@ class acp_users $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the user_ prefix - $avatar_data = phpbb_avatar_manager::clean_row($user_row); + $avatar_data = \phpbb\avatar\manager::clean_row($user_row); if ($submit) { diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 6b1da46a12..94fd67c9dd 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * ACP Permission/Auth class * @package phpBB3 */ -class auth_admin extends phpbb_auth +class auth_admin extends \phpbb\auth\auth { /** * Init auth settings @@ -130,7 +130,7 @@ class auth_admin extends phpbb_auth { if ($user->data['user_id'] != $userdata['user_id']) { - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($userdata); } else diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index fd00728510..15cda46246 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,10 +132,10 @@ class bbcode { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $style_resource_locator = new phpbb_style_resource_locator(); - $style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path); - $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager); - $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template); + $style_resource_locator = new \phpbb\style\resource_locator(); + $style_path_provider = new \phpbb\style\extension_path_provider($phpbb_extension_manager, new \phpbb\style\path_provider(), $phpbb_root_path); + $template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager); + $style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template); $style->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index c0c355f33b..80f5b65967 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -140,7 +140,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha $config_old = $config; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); foreach ($config_old as $key => $value) { $config->set($key, $value); diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php index 6843f25d72..82333f739e 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php @@ -112,7 +112,7 @@ class phpbb_captcha_qa { global $db; - $db_tool = new phpbb_db_tools($db); + $db_tool = new \phpbb\db\tools($db); return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE); } @@ -295,7 +295,7 @@ class phpbb_captcha_qa { global $db; - $db_tool = new phpbb_db_tools($db); + $db_tool = new \phpbb\db\tools($db); $tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f0681c9687..643f2d35a2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -26,13 +26,13 @@ if (!defined('IN_PHPBB')) function set_var(&$result, $var, $type, $multibyte = false) { // no need for dependency injection here, if you have the object, call the method yourself! - $type_cast_helper = new phpbb_request_type_cast_helper(); + $type_cast_helper = new \phpbb\request\type_cast_helper(); $type_cast_helper->set_var($result, $var, $type, $multibyte); } /** -* Wrapper function of phpbb_request::variable which exists for backwards compatability. -* See {@link phpbb_request_request_interface::variable phpbb_request_request_interface::variable} for +* Wrapper function of \phpbb\request\request::variable which exists for backwards compatability. +* See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for * documentation of this function's use. * * @deprecated @@ -40,20 +40,20 @@ function set_var(&$result, $var, $type, $multibyte = false) * If the value is an array this may be an array of indizes which will give * direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a") * then specifying array("var", 1) as the name will return "a". -* If you pass an instance of {@link phpbb_request_request_interface phpbb_request_interface} +* If you pass an instance of {@link \phpbb\request\request_interface phpbb_request_interface} * as this parameter it will overwrite the current request class instance. If you do * not do so, it will create its own instance (but leave superglobals enabled). * @param mixed $default A default value that is returned if the variable was not set. * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks -* @param bool $cookie This param is mapped to phpbb_request_request_interface::COOKIE as the last param for -* phpbb_request_request_interface::variable for backwards compatability reasons. -* @param phpbb_request_request_interface|null|false If an instance of phpbb_request_request_interface is given the instance is stored in +* @param bool $cookie This param is mapped to \phpbb\request\request_interface::COOKIE as the last param for +* \phpbb\request\request_interface::variable for backwards compatability reasons. +* @param \phpbb\request\request_interface|null|false If an instance of \phpbb\request\request_interface is given the instance is stored in * a static variable and used for all further calls where this parameters is null. Until -* the function is called with an instance it automatically creates a new phpbb_request +* the function is called with an instance it automatically creates a new \phpbb\request\request * instance on every call. By passing false this per-call instantiation can be restored -* after having passed in a phpbb_request_request_interface instance. +* after having passed in a \phpbb\request\request_interface instance. * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. @@ -64,7 +64,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ // the only real code is the function call which maps this function to a method. static $static_request = null; - if ($request instanceof phpbb_request_request_interface) + if ($request instanceof \phpbb\request\request_interface) { $static_request = $request; @@ -90,10 +90,10 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ { // false param: enable super globals, so the created request class does not // make super globals inaccessible everywhere outside this function. - $tmp_request = new phpbb_request(new phpbb_request_type_cast_helper(), false); + $tmp_request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); } - return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? phpbb_request_request_interface::COOKIE : phpbb_request_request_interface::REQUEST); + return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? \phpbb\request\request_interface::COOKIE : \phpbb\request\request_interface::REQUEST); } /** @@ -112,7 +112,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ * * @deprecated */ -function set_config($config_name, $config_value, $is_dynamic = false, phpbb_config $set_config = null) +function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\config\config $set_config = null) { static $config = null; @@ -142,7 +142,7 @@ function set_config($config_name, $config_value, $is_dynamic = false, phpbb_conf * * @deprecated */ -function set_config_count($config_name, $increment, $is_dynamic = false, phpbb_config $set_config = null) +function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\config\config $set_config = null) { static $config = null; @@ -1067,12 +1067,12 @@ function phpbb_clean_path($path) else { // The container is not yet loaded, use a new instance - if (!class_exists('phpbb_filesystem')) + if (!class_exists('\phpbb\filesystem')) { global $phpbb_root_path, $phpEx; require($phpbb_root_path . 'includes/filesystem.' . $phpEx); } - $phpbb_filesystem = new phpbb_filesystem(); + $phpbb_filesystem = new \phpbb\filesystem(); } return $phpbb_filesystem->clean_path($path); @@ -1253,7 +1253,7 @@ function tz_select($default = '', $truncate = false) /** * Options to pick a timezone and date/time * -* @param phpbb_user $user Object of the current user +* @param \phpbb\user $user Object of the current user * @param string $default A timezone to select * @param boolean $truncate Shall we truncate the options text * @@ -1272,7 +1272,7 @@ function phpbb_timezone_select($user, $default = '', $truncate = false) foreach ($unsorted_timezones as $timezone) { $tz = new DateTimeZone($timezone); - $dt = new phpbb_datetime($user, 'now', $tz); + $dt = new \phpbb\datetime($user, 'now', $tz); $offset = $dt->getOffset(); $current_time = $dt->format($user->lang['DATETIME_FORMAT'], true); $offset_string = phpbb_format_timezone_offset($offset); @@ -1391,7 +1391,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); unset($tracking_topics['tf']); @@ -1400,7 +1400,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ $tracking_topics['l'] = base_convert($post_time - $config['board_startdate'], 10, 36); $user->set_cookie('track', tracking_serialize($tracking_topics), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking_topics), phpbb_request_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking_topics), \phpbb\request\request_interface::COOKIE); unset($tracking_topics); @@ -1503,7 +1503,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking = ($tracking) ? tracking_unserialize($tracking) : array(); foreach ($forum_id as $f_id) @@ -1534,7 +1534,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } $user->set_cookie('track', tracking_serialize($tracking), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), \phpbb\request\request_interface::COOKIE); unset($tracking); } @@ -1591,7 +1591,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking = ($tracking) ? tracking_unserialize($tracking) : array(); $topic_id36 = base_convert($topic_id, 10, 36); @@ -1605,7 +1605,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ // If the cookie grows larger than 10000 characters we will remove the smallest value // This can result in old topics being unread - but most of the time it should be accurate... - if (strlen($request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE)) > 10000) + if (strlen($request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE)) > 10000) { //echo 'Cookie grown too large' . print_r($tracking, true); @@ -1650,7 +1650,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ } $user->set_cookie('track', tracking_serialize($tracking), $post_time + 31536000); - $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request_request_interface::COOKIE); + $request->overwrite($config['cookie_name'] . '_track', tracking_serialize($tracking), \phpbb\request\request_interface::COOKIE); } return; @@ -1788,7 +1788,7 @@ function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_lis if (!isset($tracking_topics) || !sizeof($tracking_topics)) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } @@ -1985,7 +1985,7 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); if (!$user->data['is_registered']) @@ -3094,7 +3094,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo return false; } - $confirm = ($user->lang['YES'] === $request->variable('confirm', '', true, phpbb_request_request_interface::POST)); + $confirm = ($user->lang['YES'] === $request->variable('confirm', '', true, \phpbb\request\request_interface::POST)); if ($check && $confirm) { @@ -3171,7 +3171,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo if ($request->is_ajax()) { $u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id; - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_BODY' => $template->assign_display('body'), 'MESSAGE_TITLE' => (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title], @@ -4390,7 +4390,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { global $refresh_data; - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $msg_title, 'MESSAGE_TEXT' => $msg_text, @@ -4896,7 +4896,7 @@ function phpbb_http_login($param) $username = null; foreach ($username_keys as $k) { - if ($request->is_set($k, phpbb_request_request_interface::SERVER)) + if ($request->is_set($k, \phpbb\request\request_interface::SERVER)) { $username = htmlspecialchars_decode($request->server($k)); break; @@ -4906,7 +4906,7 @@ function phpbb_http_login($param) $password = null; foreach ($password_keys as $k) { - if ($request->is_set($k, phpbb_request_request_interface::SERVER)) + if ($request->is_set($k, \phpbb\request\request_interface::SERVER)) { $password = htmlspecialchars_decode($request->server($k)); break; @@ -5007,13 +5007,13 @@ function phpbb_quoteattr($data, $entities = null) * * sid is always omitted. * -* @param phpbb_request $request Request object +* @param \phpbb\request\request $request Request object * @param array $exclude A list of variable names that should not be forwarded * @return string HTML with hidden fields */ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) { - $names = $request->variable_names(phpbb_request_request_interface::GET); + $names = $request->variable_names(\phpbb\request\request_interface::GET); $hidden = ''; foreach ($names as $name) { @@ -5035,7 +5035,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) // here. To avoid exposing cookies, skip variables that are // overwritten somewhere other than GET entirely. $value = $request->variable($name, '', true); - $get_value = $request->variable($name, '', true, phpbb_request_request_interface::GET); + $get_value = $request->variable($name, '', true, \phpbb\request\request_interface::GET); if ($value === $get_value) { $escaped_value = phpbb_quoteattr($value); @@ -5232,7 +5232,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 } } - $dt = new phpbb_datetime($user, 'now', $user->timezone); + $dt = new \phpbb\datetime($user, 'now', $user->timezone); $timezone_offset = 'GMT' . phpbb_format_timezone_offset($dt->getOffset()); $timezone_name = $user->timezone->getName(); if (isset($user->lang['timezones'][$timezone_name])) @@ -5583,7 +5583,7 @@ function exit_handler() } /** -* Handler for init calls in phpBB. This function is called in phpbb_user::setup(); +* Handler for init calls in phpBB. This function is called in \phpbb\user::setup(); * This function supports hooks. */ function phpbb_user_session_handler() @@ -5677,16 +5677,16 @@ function phpbb_convert_30_dbms_to_31($dbms) } /** -* Create a Symfony Request object from phpbb_request object +* Create a Symfony Request object from \phpbb\request\request object * -* @param phpbb_request $request Request object +* @param \phpbb\request\request $request Request object * @return Request A Symfony Request object */ -function phpbb_create_symfony_request(phpbb_request $request) +function phpbb_create_symfony_request(\phpbb\request\request $request) { // This function is meant to sanitize the global input arrays $sanitizer = function(&$value, $key) { - $type_cast_helper = new phpbb_request_type_cast_helper(); + $type_cast_helper = new \phpbb\request\type_cast_helper(); $type_cast_helper->set_var($value, $value, gettype($value), true); }; diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index fada0b52be..722d3c9c67 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2348,9 +2348,9 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr * via admin_permissions. Changes of usernames and group names * must be carried through for the moderators table. * -* @param phpbb_db_driver $db Database connection -* @param phpbb_cache_driver_driver_interface Cache driver -* @param phpbb_auth $auth Authentication object +* @param \phpbb\db\driver\driver $db Database connection +* @param \phpbb\cache\driver\driver_interface Cache driver +* @param \phpbb\auth\auth $auth Authentication object * @return null */ function phpbb_cache_moderators($db, $cache, $auth) @@ -2571,8 +2571,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id /** * Removes moderators and administrators from foe lists. * -* @param phpbb_db_driver $db Database connection -* @param phpbb_auth $auth Authentication object +* @param \phpbb\db\driver\driver $db Database connection +* @param \phpbb\auth\auth $auth Authentication object * @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore * @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore * @return null diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index f63dde0614..4412c5973c 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -26,7 +26,7 @@ if (!defined('IN_PHPBB')) * Used to bootstrap the container. * * @param string $config_file -* @return phpbb_db_driver +* @return \phpbb\db\driver\driver */ function phpbb_bootstrap_db_connection($config_file) { @@ -118,7 +118,7 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext) */ function phpbb_create_install_container($phpbb_root_path, $php_ext) { - $core = new phpbb_di_extension_core($phpbb_root_path); + $core = new \phpbb\di\extension\core($phpbb_root_path); $container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext); $container->setParameter('core.root_path', $phpbb_root_path); @@ -149,7 +149,7 @@ function phpbb_create_compiled_container($config_file, array $extensions, array $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path); // Now pass the enabled extension paths into the ext compiler extension - $extensions[] = new phpbb_di_extension_ext($installed_exts); + $extensions[] = new \phpbb\di\extension\ext($installed_exts); // Create the final container to be compiled and cached $container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); @@ -234,12 +234,12 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext) return phpbb_create_dumped_container_unless_debug( $config_file, array( - new phpbb_di_extension_config($config_file), - new phpbb_di_extension_core($phpbb_root_path), + new \phpbb\di\extension\config($config_file), + new \phpbb\di\extension\core($phpbb_root_path), ), array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), + new \phpbb\di\pass\collection_pass(), + new \phpbb\di\pass\kernel_pass(), ), $phpbb_root_path, $php_ext diff --git a/phpBB/includes/functions_database_helper.php b/phpBB/includes/functions_database_helper.php index 1b508e6a02..923e542690 100644 --- a/phpBB/includes/functions_database_helper.php +++ b/phpBB/includes/functions_database_helper.php @@ -22,14 +22,14 @@ if (!defined('IN_PHPBB')) * * The only supported table is bookmarks. * -* @param phpbb_db_driver $db Database object +* @param \phpbb\db\driver\driver $db Database object * @param string $table Table on which to perform the update * @param string $column Column whose values to change * @param array $from_values An array of values that should be changed * @param int $to_value The new value * @return null */ -function phpbb_update_rows_avoiding_duplicates(phpbb_db_driver $db, $table, $column, $from_values, $to_value) +function phpbb_update_rows_avoiding_duplicates(\phpbb\db\driver\driver $db, $table, $column, $from_values, $to_value) { $sql = "SELECT $column, user_id FROM $table @@ -107,14 +107,14 @@ function phpbb_update_rows_avoiding_duplicates(phpbb_db_driver $db, $table, $col * * The only supported table is topics_watch. * -* @param phpbb_db_driver $db Database object +* @param \phpbb\db\driver\driver $db Database object * @param string $table Table on which to perform the update * @param string $column Column whose values to change * @param array $from_values An array of values that should be changed * @param int $to_value The new value * @return null */ -function phpbb_update_rows_avoiding_duplicates_notify_status(phpbb_db_driver $db, $table, $column, $from_values, $to_value) +function phpbb_update_rows_avoiding_duplicates_notify_status(\phpbb\db\driver\driver $db, $table, $column, $from_values, $to_value) { $sql = "SELECT $column, user_id, notify_status FROM $table diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index f05c88419a..c6ab5df90f 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -71,7 +71,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED'] ); - $json_response = new phpbb_json_response(); + $json_response = new \phpbb\json_response(); $json_response->send($data); } @@ -104,7 +104,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); if (!$user->data['is_registered']) @@ -346,7 +346,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED'] ); - $json_response = new phpbb_json_response(); + $json_response = new \phpbb\json_response(); $json_response->send($data); } @@ -1164,7 +1164,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true)) { - if ($uid != $user_id || $request->variable('unwatch', '', false, phpbb_request_request_interface::GET) != $mode) + if ($uid != $user_id || $request->variable('unwatch', '', false, \phpbb\request\request_interface::GET) != $mode) { $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); $message = $user->lang['ERR_UNWATCHING'] . '

' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); @@ -1229,7 +1229,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true)) { - if ($uid != $user_id || $request->variable('watch', '', false, phpbb_request_request_interface::GET) != $mode) + if ($uid != $user_id || $request->variable('watch', '', false, \phpbb\request\request_interface::GET) != $mode) { $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); $message = $user->lang['ERR_WATCHING'] . '

' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); @@ -1272,8 +1272,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, } else { - if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', false, phpbb_request_request_interface::GET) == $mode) || - (isset($_GET['watch']) && $request->variable('watch', '', false, phpbb_request_request_interface::GET) == $mode)) + if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', false, \phpbb\request\request_interface::GET) == $mode) || + (isset($_GET['watch']) && $request->variable('watch', '', false, \phpbb\request\request_interface::GET) == $mode)) { login_box(); } @@ -1352,7 +1352,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank */ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false) { - $row = phpbb_avatar_manager::clean_row($user_row); + $row = \phpbb\avatar\manager::clean_row($user_row); return phpbb_get_avatar($row, $alt, $ignore_config); } @@ -1367,14 +1367,14 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = */ function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false) { - $row = phpbb_avatar_manager::clean_row($user_row); + $row = \phpbb\avatar\manager::clean_row($user_row); return phpbb_get_avatar($row, $alt, $ignore_config); } /** * Get avatar * -* @param array $row Row cleaned by phpbb_avatar_driver::clean_row +* @param array $row Row cleaned by \phpbb\avatar\driver\driver::clean_row * @param string $alt Optional language string for alt tag within image, can be a language key or text * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP * diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 0a8000ea3d..e7a1d2bff5 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -596,7 +596,7 @@ function phpbb_parse_range_request($request_array, $filesize) /** * Increments the download count of all provided attachments * -* @param phpbb_db_driver $db The database object +* @param \phpbb\db\driver\driver $db The database object * @param array|int $ids The attach_id of each attachment * * @return null @@ -617,8 +617,8 @@ function phpbb_increment_downloads($db, $ids) /** * Handles authentication when downloading attachments from a post or topic * -* @param phpbb_db_driver $db The database object -* @param phpbb_auth $auth The authentication object +* @param \phpbb\db\driver\driver $db The database object +* @param \phpbb\auth\auth $auth The authentication object * @param int $topic_id The id of the topic that we are downloading from * * @return null @@ -651,8 +651,8 @@ function phpbb_download_handle_forum_auth($db, $auth, $topic_id) /** * Handles authentication when downloading attachments from PMs * -* @param phpbb_db_driver $db The database object -* @param phpbb_auth $auth The authentication object +* @param \phpbb\db\driver\driver $db The database object +* @param \phpbb\auth\auth $auth The authentication object * @param int $user_id The user id * @param int $msg_id The id of the PM that we are downloading from * @@ -678,7 +678,7 @@ function phpbb_download_handle_pm_auth($db, $auth, $user_id, $msg_id) /** * Checks whether a user can download from a particular PM * -* @param phpbb_db_driver $db The database object +* @param \phpbb\db\driver\driver $db The database object * @param int $user_id The user id * @param int $msg_id The id of the PM that we are downloading from * diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index bd0ffaaf00..57a07ecccd 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -28,7 +28,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'firebird', 'MODULE' => 'interbase', 'DELIM' => ';;', - 'DRIVER' => 'phpbb_db_driver_firebird', + 'DRIVER' => '\phpbb\db\driver\firebird', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -39,7 +39,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mysql_41', 'MODULE' => 'mysqli', 'DELIM' => ';', - 'DRIVER' => 'phpbb_db_driver_mysqli', + 'DRIVER' => '\phpbb\db\driver\mysqli', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -48,7 +48,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mysql', 'MODULE' => 'mysql', 'DELIM' => ';', - 'DRIVER' => 'phpbb_db_driver_mysql', + 'DRIVER' => '\phpbb\db\driver\mysql', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -57,7 +57,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'mssql', 'DELIM' => 'GO', - 'DRIVER' => 'phpbb_db_driver_mssql', + 'DRIVER' => '\phpbb\db\driver\mssql', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -66,7 +66,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'odbc', 'DELIM' => 'GO', - 'DRIVER' => 'phpbb_db_driver_mssql_odbc', + 'DRIVER' => '\phpbb\db\driver\mssql_odbc', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -75,7 +75,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'sqlsrv', 'DELIM' => 'GO', - 'DRIVER' => 'phpbb_db_driver_mssqlnative', + 'DRIVER' => '\phpbb\db\driver\mssqlnative', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -84,7 +84,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'oracle', 'MODULE' => 'oci8', 'DELIM' => '/', - 'DRIVER' => 'phpbb_db_driver_oracle', + 'DRIVER' => '\phpbb\db\driver\oracle', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -93,7 +93,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'postgres', 'MODULE' => 'pgsql', 'DELIM' => ';', - 'DRIVER' => 'phpbb_db_driver_postgres', + 'DRIVER' => '\phpbb\db\driver\postgres', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -102,7 +102,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'sqlite', 'MODULE' => 'sqlite', 'DELIM' => ';', - 'DRIVER' => 'phpbb_db_driver_sqlite', + 'DRIVER' => '\phpbb\db\driver\sqlite', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -184,7 +184,7 @@ function dbms_select($default = '', $only_20x_options = false) */ function get_tables(&$db) { - $db_tools = new phpbb_db_tools($db); + $db_tools = new \phpbb\db\tools($db); return $db_tools->sql_list_tables(); } @@ -206,14 +206,14 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, $db->sql_return_on_error(true); // Check that we actually have a database name before going any further..... - if ($dbms_details['DRIVER'] != 'phpbb_db_driver_sqlite' && $dbms_details['DRIVER'] != 'phpbb_db_driver_oracle' && $dbname === '') + if ($dbms_details['DRIVER'] != '\phpbb\db\driver\sqlite' && $dbms_details['DRIVER'] != '\phpbb\db\driver\oracle' && $dbname === '') { $error[] = $lang['INST_ERR_DB_NO_NAME']; return false; } // Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea - if ($dbms_details['DRIVER'] == 'phpbb_db_driver_sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) + if ($dbms_details['DRIVER'] == '\phpbb\db\driver\sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) { $error[] = $lang['INST_ERR_DB_FORUM_PATH']; return false; @@ -222,8 +222,8 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // Check the prefix length to ensure that index names are not too long and does not contain invalid characters switch ($dbms_details['DRIVER']) { - case 'phpbb_db_driver_mysql': - case 'phpbb_db_driver_mysqli': + case '\phpbb\db\driver\mysql': + case '\phpbb\db\driver\mysqli': if (strspn($table_prefix, '-./\\') !== 0) { $error[] = $lang['INST_ERR_PREFIX_INVALID']; @@ -232,22 +232,22 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // no break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': $prefix_length = 36; break; - case 'phpbb_db_driver_mssql': - case 'phpbb_db_driver_mssql_odbc': - case 'phpbb_db_driver_mssqlnative': + case '\phpbb\db\driver\mssql': + case '\phpbb\db\driver\mssql_odbc': + case '\phpbb\db\driver\mssqlnative': $prefix_length = 90; break; - case 'phpbb_db_driver_sqlite': + case '\phpbb\db\driver\sqlite': $prefix_length = 200; break; - case 'phpbb_db_driver_firebird': - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\firebird': + case '\phpbb\db\driver\oracle': $prefix_length = 6; break; } @@ -285,21 +285,21 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // Make sure that the user has selected a sensible DBAL for the DBMS actually installed switch ($dbms_details['DRIVER']) { - case 'phpbb_db_driver_mysqli': + case '\phpbb\db\driver\mysqli': if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<')) { $error[] = $lang['INST_ERR_DB_NO_MYSQLI']; } break; - case 'phpbb_db_driver_sqlite': + case '\phpbb\db\driver\sqlite': if (version_compare(sqlite_libversion(), '2.8.2', '<')) { $error[] = $lang['INST_ERR_DB_NO_SQLITE']; } break; - case 'phpbb_db_driver_firebird': + case '\phpbb\db\driver\firebird': // check the version of FB, use some hackery if we can't get access to the server info if ($db->service_handle !== false && function_exists('ibase_server_info')) { @@ -380,7 +380,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, } break; - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\oracle': if ($unicode_check) { $sql = "SELECT * @@ -402,7 +402,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, } break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': if ($unicode_check) { $sql = "SHOW server_encoding;"; @@ -507,7 +507,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test 'adm_relative_path' => 'adm/', - 'acm_type' => 'phpbb_cache_driver_file', + 'acm_type' => '\phpbb\cache\driver\file', ); foreach ($config_data_array as $key => $value) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 0222a57bcc..d5f3c8725e 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -27,7 +27,7 @@ class messenger var $mail_priority = MAIL_NORMAL_PRIORITY; var $use_queue = true; - /** @var phpbb_template */ + /** @var \phpbb\template\template */ protected $template; var $eol = "\n"; @@ -645,12 +645,12 @@ class messenger { global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager; - if ($this->template instanceof phpbb_template) + if ($this->template instanceof \phpbb\template\template) { return; } - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager); } /** @@ -717,7 +717,7 @@ class queue { global $db, $config, $phpEx, $phpbb_root_path, $user; - $lock = new phpbb_lock_flock($this->cache_file); + $lock = new \phpbb\lock\flock($this->cache_file); $lock->acquire(); // avoid races, check file existence once @@ -887,7 +887,7 @@ class queue return; } - $lock = new phpbb_lock_flock($this->cache_file); + $lock = new \phpbb\lock\flock($this->cache_file); $lock->acquire(); if (file_exists($this->cache_file)) @@ -1004,12 +1004,12 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false) $smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']); // Ok we have error checked as much as we can to this point let's get on it already. - if (!class_exists('phpbb_error_collector')) + if (!class_exists('\phpbb\error_collector')) { global $phpbb_root_path, $phpEx; include($phpbb_root_path . 'includes/error_collector.' . $phpEx); } - $collector = new phpbb_error_collector; + $collector = new \phpbb\error_collector; $collector->install(); $smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20); $collector->uninstall(); @@ -1723,12 +1723,12 @@ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) // Reference: http://bugs.php.net/bug.php?id=15841 $headers = implode($eol, $headers); - if (!class_exists('phpbb_error_collector')) + if (!class_exists('\phpbb\error_collector')) { include($phpbb_root_path . 'includes/error_collector.' . $phpEx); } - $collector = new phpbb_error_collector; + $collector = new \phpbb\error_collector; $collector->install(); // On some PHP Versions mail() *may* fail if there are newlines within the subject. diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 14278a2529..f69b2946f7 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -343,7 +343,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) $userdata = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($userdata); if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_')) diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 6261231c09..4181896eca 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -713,7 +713,7 @@ class fileupload } $this->common_checks($file); - $request->overwrite('local', $upload, phpbb_request_request_interface::FILES); + $request->overwrite('local', $upload, \phpbb\request\request_interface::FILES); return $file; } diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index a89ab7b126..fdde302e3b 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -22,13 +22,13 @@ if (!defined('IN_PHPBB')) /** * Create a new UrlMatcher class and dump it into the cache file * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param RequestContext $context Symfony RequestContext object * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext) +function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path, $php_ext) { if (defined('DEBUG')) { @@ -46,14 +46,14 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c /** * Create a new UrlMatcher class and dump it into the cache file * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_path, $php_ext) +function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext) { - $provider = new phpbb_controller_provider(); + $provider = new \phpbb\controller\provider(); $routes = $provider->import_paths_from_finder($finder)->find(); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( @@ -66,13 +66,13 @@ function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_p /** * Create a non-cached UrlMatcher * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param RequestContext $context Symfony RequestContext object * @return UrlMatcher */ -function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context) +function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context) { - $provider = new phpbb_controller_provider(); + $provider = new \phpbb\controller\provider(); $routes = $provider->import_paths_from_finder($finder)->find(); return new UrlMatcher($routes, $context); } diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 1b598f7bf7..56fcef29e6 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2150,8 +2150,8 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow if (!sizeof($error)) { - $current_legend = phpbb_groupposition_legend::GROUP_DISABLED; - $current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED; + $current_legend = \phpbb\groupposition\legend::GROUP_DISABLED; + $current_teampage = \phpbb\groupposition\teampage::GROUP_DISABLED; $legend = $phpbb_container->get('groupposition.legend'); $teampage = $phpbb_container->get('groupposition.teampage'); @@ -2162,7 +2162,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow $current_legend = $legend->get_group_value($group_id); $current_teampage = $teampage->get_group_value($group_id); } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage())); } @@ -2170,7 +2170,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow if (!empty($group_attributes['group_legend'])) { - if (($group_id && ($current_legend == phpbb_groupposition_legend::GROUP_DISABLED)) || !$group_id) + if (($group_id && ($current_legend == \phpbb\groupposition\legend::GROUP_DISABLED)) || !$group_id) { // Old group currently not in the legend or new group, add at the end. $group_attributes['group_legend'] = 1 + $legend->get_group_count(); @@ -2181,22 +2181,22 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow $group_attributes['group_legend'] = $current_legend; } } - else if ($group_id && ($current_legend != phpbb_groupposition_legend::GROUP_DISABLED)) + else if ($group_id && ($current_legend != \phpbb\groupposition\legend::GROUP_DISABLED)) { // Group is removed from the legend try { $legend->delete_group($group_id, true); } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage())); } - $group_attributes['group_legend'] = phpbb_groupposition_legend::GROUP_DISABLED; + $group_attributes['group_legend'] = \phpbb\groupposition\legend::GROUP_DISABLED; } else { - $group_attributes['group_legend'] = phpbb_groupposition_legend::GROUP_DISABLED; + $group_attributes['group_legend'] = \phpbb\groupposition\legend::GROUP_DISABLED; } // Unset the objects, we don't need them anymore. @@ -2296,13 +2296,13 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow // Remove the group from the teampage, only if unselected and we are editing a group, // which is currently displayed. - if (!$group_teampage && $group_id && $current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED) + if (!$group_teampage && $group_id && $current_teampage != \phpbb\groupposition\teampage::GROUP_DISABLED) { try { $teampage->delete_group($group_id); } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage())); } @@ -2320,24 +2320,24 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow try { - if ($group_teampage && $current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED) + if ($group_teampage && $current_teampage == \phpbb\groupposition\teampage::GROUP_DISABLED) { $teampage->add_group($group_id); } if ($group_teampage) { - if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED) + if ($current_teampage == \phpbb\groupposition\teampage::GROUP_DISABLED) { $teampage->add_group($group_id); } } - else if ($group_id && ($current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED)) + else if ($group_id && ($current_teampage != \phpbb\groupposition\teampage::GROUP_DISABLED)) { $teampage->delete_group($group_id); } } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { trigger_error($user->lang($exception->getMessage())); } @@ -2472,7 +2472,7 @@ function group_delete($group_id, $group_name = false) $legend->delete_group($group_id); unset($legend); } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { // The group we want to delete does not exist. // No reason to worry, we just continue the deleting process. @@ -2485,7 +2485,7 @@ function group_delete($group_id, $group_name = false) $teampage->delete_group($group_id); unset($teampage); } - catch (phpbb_groupposition_exception $exception) + catch (\phpbb\groupposition\exception $exception) { // The group we want to delete does not exist. // No reason to worry, we just continue the deleting process. diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 5439aba232..6df3320a97 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -36,8 +36,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info) // Fixes a "bug" that makes forum_view use the same ordering as topic_view $request->overwrite('sk', null); $request->overwrite('sd', null); - $request->overwrite('sk', null, phpbb_request_request_interface::POST); - $request->overwrite('sd', null, phpbb_request_request_interface::POST); + $request->overwrite('sk', null, \phpbb\request\request_interface::POST); + $request->overwrite('sd', null, \phpbb\request\request_interface::POST); } $forum_id = $forum_info['forum_id']; diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 989419cc49..4f27d32a5a 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -462,7 +462,7 @@ function mcp_move_topic($topic_ids) if (!$to_forum_id || $additional_msg) { - $request->overwrite('confirm', null, phpbb_request_request_interface::POST); + $request->overwrite('confirm', null, \phpbb\request\request_interface::POST); $request->overwrite('confirm_key', null); } @@ -694,7 +694,7 @@ function mcp_restore_topic($topic_ids) } $topic_id = $request->variable('t', 0); - if (!$request->is_set('quickmod', phpbb_request_request_interface::REQUEST)) + if (!$request->is_set('quickmod', \phpbb\request\request_interface::REQUEST)) { $redirect = $request->variable('redirect', "index.$phpEx"); $redirect = reapply_sid($redirect); @@ -823,7 +823,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '' } $topic_id = $request->variable('t', 0); - if (!$request->is_set('quickmod', phpbb_request_request_interface::REQUEST)) + if (!$request->is_set('quickmod', \phpbb\request\request_interface::REQUEST)) { $redirect = $request->variable('redirect', "index.$phpEx"); $redirect = reapply_sid($redirect); @@ -1136,7 +1136,7 @@ function mcp_fork_topic($topic_ids) if ($additional_msg) { - $request->overwrite('confirm', null, phpbb_request_request_interface::POST); + $request->overwrite('confirm', null, \phpbb\request\request_interface::POST); $request->overwrite('confirm_key', null); } diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index aa0725efff..81965df463 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -738,7 +738,7 @@ class mcp_queue if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $message, @@ -886,7 +886,7 @@ class mcp_queue if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $message, @@ -946,9 +946,9 @@ class mcp_queue { $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; - $request->overwrite('confirm', null, phpbb_request_request_interface::POST); - $request->overwrite('confirm_key', null, phpbb_request_request_interface::POST); - $request->overwrite('confirm_key', null, phpbb_request_request_interface::REQUEST); + $request->overwrite('confirm', null, \phpbb\request\request_interface::POST); + $request->overwrite('confirm_key', null, \phpbb\request\request_interface::POST); + $request->overwrite('confirm_key', null, \phpbb\request\request_interface::REQUEST); } else { @@ -1221,7 +1221,7 @@ class mcp_queue if ($request->is_ajax()) { - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $message, diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 4ef477775d..fedf672249 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -253,7 +253,7 @@ class mcp_warn // Check if can send a notification if ($config['allow_privmsg']) { - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($user_row); $s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false; unset($auth2); @@ -376,7 +376,7 @@ class mcp_warn // Check if can send a notification if ($config['allow_privmsg']) { - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($user_row); $s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false; unset($auth2); diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 6971b786fb..3e348801c7 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1545,7 +1545,7 @@ class parse_message extends bbcode_firstpass global $request; $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); - $attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, phpbb_request_request_interface::POST); + $attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, \phpbb\request\request_interface::POST); $this->attachment_data = array(); $check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id; diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 03d3de3337..ff47e4d37d 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -34,8 +34,8 @@ class ucp_groups $return_page = '

' . sprintf($user->lang['RETURN_PAGE'], '', ''); $mark_ary = request_var('mark', array(0)); - $submit = $request->variable('submit', false, false, phpbb_request_request_interface::POST); - $delete = $request->variable('delete', false, false, phpbb_request_request_interface::POST); + $submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST); + $delete = $request->variable('delete', false, false, \phpbb\request\request_interface::POST); $error = $data = array(); switch ($mode) @@ -496,7 +496,7 @@ class ucp_groups $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the group_ prefix - $avatar_data = phpbb_avatar_manager::clean_row($group_row); + $avatar_data = \phpbb\avatar\manager::clean_row($group_row); } // Did we submit? diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index c2b48e7bc6..b859413d92 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -296,7 +296,7 @@ class ucp_main } else { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 72c41776b3..2f22f6cf9c 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -163,11 +163,11 @@ class ucp_notifications * Output all the notification types to the template * * @param string $block - * @param phpbb_notification_manager $phpbb_notifications - * @param phpbb_template $template - * @param phpbb_user $user + * @param \phpbb\notification\manager $phpbb_notifications + * @param \phpbb\template\template $template + * @param \phpbb\user $user */ - public function output_notification_types($subscriptions, $block = 'notification_types', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user) + public function output_notification_types($subscriptions, $block = 'notification_types', \phpbb\notification\manager $phpbb_notifications, \phpbb\template\template $template, \phpbb\user $user) { $notification_methods = $phpbb_notifications->get_subscription_methods(); @@ -210,11 +210,11 @@ class ucp_notifications * Output all the notification methods to the template * * @param string $block - * @param phpbb_notification_manager $phpbb_notifications - * @param phpbb_template $template - * @param phpbb_user $user + * @param \phpbb\notification\manager $phpbb_notifications + * @param \phpbb\template\template $template + * @param \phpbb\user $user */ - public function output_notification_methods($block = 'notification_methods', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user) + public function output_notification_methods($block = 'notification_methods', \phpbb\notification\manager $phpbb_notifications, \phpbb\template\template $template, \phpbb\user $user) { $notification_methods = $phpbb_notifications->get_subscription_methods(); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index ff1e3d1a95..03081cffb6 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -34,9 +34,9 @@ class ucp_profile $user->add_lang('posting'); - $preview = $request->variable('preview', false, false, phpbb_request_request_interface::POST); - $submit = $request->variable('submit', false, false, phpbb_request_request_interface::POST); - $delete = $request->variable('delete', false, false, phpbb_request_request_interface::POST); + $preview = $request->variable('preview', false, false, \phpbb\request\request_interface::POST); + $submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST); + $delete = $request->variable('delete', false, false, \phpbb\request\request_interface::POST); $error = $data = array(); $s_hidden_fields = ''; @@ -564,7 +564,7 @@ class ucp_profile $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the user_ prefix - $avatar_data = phpbb_avatar_manager::clean_row($user->data); + $avatar_data = \phpbb\avatar\manager::clean_row($user->data); if ($submit) { diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index ff7ab53736..63bde7f054 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -71,7 +71,7 @@ class ucp_remind } // Check users permissions - $auth2 = new phpbb_auth(); + $auth2 = new \phpbb\auth\auth(); $auth2->acl($user_row); if (!$auth2->acl_get('u_chgpasswd')) diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php index a669c450a4..6bb3cdc145 100644 --- a/phpBB/includes/ucp/ucp_zebra.php +++ b/phpBB/includes/ucp/ucp_zebra.php @@ -229,7 +229,7 @@ class ucp_zebra { $message = ($updated) ? $user->lang[$l_mode . '_UPDATED'] : implode('
', $error); - $json_response = new phpbb_json_response; + $json_response = new \phpbb\json_response; $json_response->send(array( 'success' => $updated, diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 19db0a9fc1..74106ca31f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -95,17 +95,17 @@ 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}phpbb/", $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) $container_extensions = array( - new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), - new phpbb_di_extension_core($phpbb_root_path), + new \phpbb\di\extension\config($phpbb_root_path . 'config.' . $phpEx), + new \phpbb\di\extension\core($phpbb_root_path), ); $container_passes = array( - new phpbb_di_pass_collection_pass(), - //new phpbb_di_pass_kernel_pass(), + new \phpbb\di\pass\collection_pass(), + //new \phpbb\di\pass\kernel_pass(), ); $phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx); @@ -230,7 +230,7 @@ while (!$migrator->finished()) { $migrator->update(); } - catch (phpbb_db_migration_exception $e) + catch (\phpbb\db\migration\exception $e) { echo $e->getLocalisedMessage($user); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 65f33766b5..b01dfa61ed 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -90,9 +90,9 @@ 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}phpbb/", $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 = new \phpbb\class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container @@ -187,8 +187,8 @@ $sub = request_var('sub', ''); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); -$user = new phpbb_user(); -$auth = new phpbb_auth(); +$user = new \phpbb\user(); +$auth = new \phpbb\auth\auth(); // Add own hook handler, if present. :o if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) @@ -208,14 +208,14 @@ else } // Set some standard variables we want to force -$config = new phpbb_config(array( +$config = new \phpbb\config\config(array( 'load_tplcompile' => '1' )); -$phpbb_style_resource_locator = new phpbb_style_resource_locator(); -$phpbb_style_path_provider = new phpbb_style_path_provider(); -$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); -$phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); +$phpbb_style_resource_locator = new \phpbb\style\resource_locator(); +$phpbb_style_path_provider = new \phpbb\style\path_provider(); +$template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); +$phpbb_style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $phpbb_style->set_ext_dir_prefix('adm/'); $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); $template->assign_var('T_ASSETS_PATH', '../assets'); diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 8a8c440036..4d3e1d3d4a 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -130,7 +130,7 @@ class install_convert extends module unset($dbpasswd); // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -345,7 +345,7 @@ class install_convert extends module $this->page_title = $lang['STAGE_SETTINGS']; // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -586,7 +586,7 @@ class install_convert extends module unset($dbpasswd); // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -739,7 +739,7 @@ class install_convert extends module // For conversions we are a bit less strict and set to a search backend we know exist... if (!class_exists($search_type)) { - $search_type = 'phpbb_search_fulltext_native'; + $search_type = '\phpbb\search\fulltext_native'; set_config('search_type', $search_type); } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index ea23c318e3..107da0f90a 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -102,7 +102,7 @@ class install_install extends module break; case 'final': - // Enable super globals to prevent issues with the new phpbb_request object + // Enable super globals to prevent issues with the new \phpbb\request\request object $request->enable_super_globals(); // Create a normal container now @@ -1438,12 +1438,12 @@ class install_install extends module 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); $error = false; - $search = new phpbb_search_fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new \phpbb\search\fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id FROM ' . POSTS_TABLE; @@ -1753,7 +1753,7 @@ class install_install extends module $data = $this->get_submitted_data(); // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -1827,7 +1827,7 @@ class install_install extends module $data = $this->get_submitted_data(); // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -1892,8 +1892,8 @@ class install_install extends module * "installs" means it adds all migrations to the migrations table, but does not * perform any of the actions in the migrations. * - * @param phpbb_extension_manager $extension_manager - * @param phpbb_db_migrator $migrator + * @param \phpbb\extension\manager $extension_manager + * @param \phpbb\db\migrator $migrator */ function populate_migrations($extension_manager, $migrator) { diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 2d165b551a..b61ee277b4 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -108,7 +108,7 @@ class install_update extends module unset($dbpasswd); // 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); + $config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -248,7 +248,7 @@ class install_update extends module $this->include_file('includes/diff/renderer.' . $phpEx); // Make sure we stay at the file check if checking the files again - if ($request->variable('check_again', false, false, phpbb_request_request_interface::POST)) + if ($request->variable('check_again', false, false, \phpbb\request\request_interface::POST)) { $sub = $this->p_master->sub = 'file_check'; } @@ -355,7 +355,7 @@ class install_update extends module $action = request_var('action', ''); // We are directly within an update. To make sure our update list is correct we check its status. - $update_list = ($request->variable('check_again', false, false, phpbb_request_request_interface::POST)) ? false : $cache->get('_update_list'); + $update_list = ($request->variable('check_again', false, false, \phpbb\request\request_interface::POST)) ? false : $cache->get('_update_list'); $modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0; // Make sure the list is up-to-date diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 1ab9ec2fb6..e2915cad78 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -49,7 +49,7 @@ $action = request_var('action', ''); $action_ary = request_var('action', array('' => 0)); $forum_action = request_var('forum_action', ''); -if ($forum_action !== '' && $request->variable('sort', false, false, phpbb_request_request_interface::POST)) +if ($forum_action !== '' && $request->variable('sort', false, false, \phpbb\request\request_interface::POST)) { $action = $forum_action; } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e4cd5e7daa..2e4301d43a 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1058,7 +1058,7 @@ switch ($mode) // We validate form and field here, only id/class allowed $form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; $field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field; - if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(phpbb_request_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) + if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(\phpbb\request\request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) { $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 279959974d..804e1ce44b 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Permission/Auth class * @package phpBB3 */ -class phpbb_auth +class auth { var $acl = array(); var $cache = array(); @@ -92,7 +94,7 @@ class phpbb_auth } } - // If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them + // If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew \them if ($renew) { $this->acl_cache($userdata); @@ -993,7 +995,7 @@ class phpbb_auth // Successful session creation if ($result === true) { - // If admin re-authentication we remove the old session entry because a new one has been created... + // If admin re-authentication we remove the old session entry because a new \one has been created... if ($admin) { // the login array is used because the user ids do not differ for re-authentication diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index a7148c634a..cd1330e7b0 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider; + /** * @ignore */ @@ -20,19 +22,19 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_apache extends phpbb_auth_provider_base +class apache extends \phpbb\auth\provider\base { /** * Apache Authentication Constructor * - * @param phpbb_db_driver $db - * @param phpbb_config $config - * @param phpbb_request $request - * @param phpbb_user $user + * @param \phpbb\db\driver\driver $db + * @param \phpbb\config\config $config + * @param \phpbb\request\request $request + * @param \phpbb\user $user * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; @@ -47,7 +49,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base */ public function init() { - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'))) + if (!$this->request->is_set('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'))) { return $this->user->lang['APACHE_SETUP_BEFORE_USE']; } @@ -78,7 +80,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base ); } - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) + if (!$this->request->is_set('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER)) { return array( 'status' => LOGIN_ERROR_EXTERNAL_AUTH, @@ -149,7 +151,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base */ public function autologin() { - if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) + if (!$this->request->is_set('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER)) { return array(); } @@ -202,8 +204,8 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base * This function generates an array which can be passed to the user_add * function in order to create a user * - * @param string $username The username of the new user. - * @param string $password The password of the new user. + * @param string $username The username of the new \user. + * @param string $password The password of the new \user. * @return array Contains data that can be passed directly to * the user_add function. */ @@ -241,7 +243,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base public function validate_session($user) { // Check if PHP_AUTH_USER is set and handle this case - if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_request_interface::SERVER)) + if ($this->request->is_set('PHP_AUTH_USER', \phpbb\request\request_interface::SERVER)) { $php_auth_user = $this->request->server('PHP_AUTH_USER'); diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php index 626ad8478f..f0a2a2f68c 100644 --- a/phpBB/phpbb/auth/provider/base.php +++ b/phpBB/phpbb/auth/provider/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -abstract class phpbb_auth_provider_base implements phpbb_auth_provider_provider_interface +abstract class base implements \phpbb\auth\provider\provider_interface { /** * {@inheritdoc} diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 0934c56d9b..f613bafc6a 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider; + /** * @ignore */ @@ -22,20 +24,20 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_db extends phpbb_auth_provider_base +class db extends \phpbb\auth\provider\base { /** * Database Authentication Constructor * - * @param phpbb_db_driver $db - * @param phpbb_config $config - * @param phpbb_request $request - * @param phpbb_user $user + * @param \phpbb\db\driver\driver $db + * @param \phpbb\config\config $config + * @param \phpbb\request\request $request + * @param \phpbb\user $user * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; @@ -149,7 +151,7 @@ class phpbb_auth_provider_db extends phpbb_auth_provider_base include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext); } - $captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']); + $captcha = \phpbb_captcha_factory::get_instance($this->config['captcha_plugin']); $captcha->init(CONFIRM_LOGIN); $vc_response = $captcha->validate($row); if ($vc_response) @@ -202,7 +204,7 @@ class phpbb_auth_provider_db extends phpbb_auth_provider_base { $hash = phpbb_hash($password_new_format); - // Update the password in the users table to the new format and remove user_pass_convert flag + // Update the password in the users table to the new \format and remove user_pass_convert flag $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password = \'' . $this->db->sql_escape($hash) . '\', user_pass_convert = 0 @@ -239,7 +241,7 @@ class phpbb_auth_provider_db extends phpbb_auth_provider_base { $hash = phpbb_hash($password); - // Update the password in the users table to the new format + // Update the password in the users table to the new \format $sql = 'UPDATE ' . USERS_TABLE . " SET user_password = '" . $this->db->sql_escape($hash) . "', user_pass_convert = 0 diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 0196529408..9d29789567 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider; + /** * @ignore */ @@ -22,16 +24,16 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_ldap extends phpbb_auth_provider_base +class ldap extends \phpbb\auth\provider\base { /** * LDAP Authentication Constructor * - * @param phpbb_db_driver $db - * @param phpbb_config $config - * @param phpbb_user $user + * @param \phpbb\db\driver\driver $db + * @param \phpbb\config\config $config + * @param \phpbb\user $user */ - public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\user $user) { $this->db = $db; $this->config = $config; diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index baf55c7a86..8df2043375 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -interface phpbb_auth_provider_provider_interface +interface provider_interface { /** * Checks whether the user is currently identified to the authentication @@ -70,7 +72,7 @@ interface phpbb_auth_provider_provider_interface * options with whatever configuraton values are passed to it as an array. * It then returns the name of the acp file related to this authentication * provider. - * @param array $new_config Contains the new configuration values that + * @param array $new_config Contains the new \configuration values that * have been set in acp_board. * @return array|null Returns null if not implemented or an array with * the template file name and an array of the vars @@ -87,8 +89,8 @@ interface phpbb_auth_provider_provider_interface * Performs additional actions during logout. * * @param array $data An array corresponding to - * phpbb_session::data - * @param boolean $new_session True for a new session, false for no new + * \phpbb\session::data + * @param boolean $new_session True for a new \session, false for no new * session. */ public function logout($data, $new_session); diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index a125759e3f..d688e7d70c 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Base class for avatar drivers * @package phpBB3 */ -abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interface +abstract class driver implements \phpbb\avatar\driver\driver_interface { /** * Avatar driver name @@ -29,7 +31,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa /** * Current board configuration - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; @@ -47,7 +49,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa /** * Cache driver - * @var phpbb_cache_driver_driver_interface + * @var \phpbb\cache\driver\driver_interface */ protected $cache; @@ -69,13 +71,13 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa /** * Construct a driver object * - * @param phpbb_config $config phpBB configuration - * @param phpbb_request $request Request object + * @param \phpbb\config\config $config phpBB configuration + * @param \phpbb\request\request $request Request object * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension - * @param phpbb_cache_driver_driver_interface $cache Cache driver + * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext, phpbb_cache_driver_driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php index 0a44a7a1fe..d9540c19db 100644 --- a/phpBB/phpbb/avatar/driver/driver_interface.php +++ b/phpBB/phpbb/avatar/driver/driver_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Interface for avatar drivers * @package phpBB3 */ -interface phpbb_avatar_driver_driver_interface +interface driver_interface { /** * Returns the name of the driver. @@ -32,7 +34,7 @@ interface phpbb_avatar_driver_driver_interface * Get the avatar url and dimensions * * @param array $row User data or group data that has been cleaned with - * phpbb_avatar_manager::clean_row + * \phpbb\avatar\manager::clean_row * @return array Avatar data, must have keys src, width and height, e.g. * ['src' => '', 'width' => 0, 'height' => 0] */ @@ -41,9 +43,9 @@ interface phpbb_avatar_driver_driver_interface /** * Returns custom html if it is needed for displaying this avatar * - * @param phpbb_user $user phpBB user object + * @param \phpbb\user $user phpBB user object * @param array $row User data or group data that has been cleaned with - * phpbb_avatar_manager::clean_row + * \phpbb\avatar\manager::clean_row * @param string $alt Alternate text for avatar image * * @return string HTML @@ -53,11 +55,11 @@ interface phpbb_avatar_driver_driver_interface /** * Prepare form for changing the settings of this avatar * - * @param phpbb_request $request Request object - * @param phpbb_template $template Template object - * @param phpbb_user $user User object + * @param \phpbb\request\request $request Request object + * @param \phpbb\template\template $template Template object + * @param \phpbb\user $user User object * @param array $row User data or group data that has been cleaned with - * phpbb_avatar_manager::clean_row + * \phpbb\avatar\manager::clean_row * @param array &$error Reference to an error array that is filled by this * function. Key values can either be a string with a language key or * an array that will be passed to vsprintf() with the language key in @@ -70,7 +72,7 @@ interface phpbb_avatar_driver_driver_interface /** * Prepare form for changing the acp settings of this avatar * - * @param phpbb_user $user phpBB user object + * @param \phpbb\user $user phpBB user object * * @return array Array of configuration options as consumed by acp_board. * The setting for enabling/disabling the avatar will be handled by @@ -81,11 +83,11 @@ interface phpbb_avatar_driver_driver_interface /** * Process form data * - * @param phpbb_request $request Request object - * @param phpbb_template $template Template object - * @param phpbb_user $user User object + * @param \phpbb\request\request $request Request object + * @param \phpbb\template\template $template Template object + * @param \phpbb\user $user User object * @param array $row User data or group data that has been cleaned with - * phpbb_avatar_manager::clean_row + * \phpbb\avatar\manager::clean_row * @param array &$error Reference to an error array that is filled by this * function. Key values can either be a string with a language key or * an array that will be passed to vsprintf() with the language key in @@ -100,7 +102,7 @@ interface phpbb_avatar_driver_driver_interface * Delete avatar * * @param array $row User data or group data that has been cleaned with - * phpbb_avatar_manager::clean_row + * \phpbb\avatar\manager::clean_row * * @return bool True if avatar has been deleted or there is no need to delete, * i.e. when the avatar is not hosted locally. diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index d559da1c0d..3ad783932e 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Handles avatars hosted at gravatar.com * @package phpBB3 */ -class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver +class gravatar extends \phpbb\avatar\driver\driver { /** * The URL for the gravatar service diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index f4bcd4ce74..d779099c46 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Handles avatars selected from the board gallery * @package phpBB3 */ -class phpbb_avatar_driver_local extends phpbb_avatar_driver +class local extends \phpbb\avatar\driver\driver { /** * @inheritdoc @@ -144,7 +146,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver * Get a list of avatars that are locally available * Results get cached for 24 hours (86400 seconds) * - * @param phpbb_user $user User object + * @param \phpbb\user $user User object * * @return array Array containing the locally available avatars */ @@ -157,7 +159,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver $avatar_list = array(); $path = $this->phpbb_root_path . $this->config['avatar_gallery_path']; - $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS), RecursiveIteratorIterator::SELF_FIRST); + $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS), \RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $file_info) { $file_path = $file_info->getPath(); diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 7da58107a1..1e29fb5735 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Handles avatars hosted remotely * @package phpBB3 */ -class phpbb_avatar_driver_remote extends phpbb_avatar_driver +class remote extends \phpbb\avatar\driver\driver { /** * @inheritdoc @@ -120,8 +122,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext); } - $types = fileupload::image_types(); - $extension = strtolower(filespec::get_extension($url)); + $types = \fileupload::image_types(); + $extension = strtolower(\filespec::get_extension($url)); if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) { diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 685ac4f349..377c9a0b04 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Handles avatars uploaded to the board * @package phpBB3 */ -class phpbb_avatar_driver_upload extends phpbb_avatar_driver +class upload extends \phpbb\avatar\driver\driver { /** * @inheritdoc @@ -66,7 +68,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext); } - $upload = new fileupload('AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); + $upload = new \fileupload('AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); $url = $request->variable('avatar_upload_url', ''); $upload_file = $request->file('avatar_upload_file'); diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 58d994c3c0..717ba00ed7 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\avatar; + /** * @ignore */ @@ -18,11 +20,11 @@ if (!defined('IN_PHPBB')) /** * @package avatar */ -class phpbb_avatar_manager +class manager { /** * phpBB configuration - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; @@ -59,11 +61,11 @@ class phpbb_avatar_manager /** * Construct an avatar manager object * - * @param phpbb_config $config phpBB configuration + * @param \phpbb\config\config $config phpBB configuration * @param array $avatar_drivers Avatar drivers passed via the service container * @param object $container Container object */ - public function __construct(phpbb_config $config, $avatar_drivers, $container) + public function __construct(\phpbb\config\config $config, $avatar_drivers, $container) { $this->config = $config; $this->avatar_drivers = $avatar_drivers; @@ -194,7 +196,7 @@ class phpbb_avatar_manager $keys = array_keys($row); $values = array_values($row); - $keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys); + $keys = array_map(array('\phpbb\avatar\manager', 'strip_prefix'), $keys); return array_combine($keys, $values); } @@ -281,7 +283,7 @@ class phpbb_avatar_manager /** * Replace "error" strings with their real, localized form * - * @param phpbb_user phpBB User object + * @param \phpbb\user phpBB User object * @param array $error Array containing error strings * Key values can either be a string with a language key or an array * that will be passed to vsprintf() with the language key in the @@ -289,7 +291,7 @@ class phpbb_avatar_manager * * @return array Array containing the localized error strings */ - public function localize_errors(phpbb_user $user, $error) + public function localize_errors(\phpbb\user $user, $error) { foreach ($error as $key => $lang) { diff --git a/phpBB/phpbb/cache/driver/apc.php b/phpBB/phpbb/cache/driver/apc.php index 0516b669c8..ce72ec6134 100644 --- a/phpBB/phpbb/cache/driver/apc.php +++ b/phpBB/phpbb/cache/driver/apc.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * ACM for APC * @package acm */ -class phpbb_cache_driver_apc extends phpbb_cache_driver_memory +class apc extends \phpbb\cache\driver\memory { var $extension = 'apc'; diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php index 7ee7e82ad5..90185a00d2 100644 --- a/phpBB/phpbb/cache/driver/base.php +++ b/phpBB/phpbb/cache/driver/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -18,6 +20,6 @@ if (!defined('IN_PHPBB')) /** * @package acm */ -abstract class phpbb_cache_driver_base implements phpbb_cache_driver_driver_interface +abstract class base implements \phpbb\cache\driver\driver_interface { } diff --git a/phpBB/phpbb/cache/driver/driver_interface.php b/phpBB/phpbb/cache/driver/driver_interface.php index 34028b82e2..34c60b5935 100644 --- a/phpBB/phpbb/cache/driver/driver_interface.php +++ b/phpBB/phpbb/cache/driver/driver_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package acm */ -interface phpbb_cache_driver_driver_interface +interface driver_interface { /** * Load global cache @@ -85,10 +87,10 @@ interface phpbb_cache_driver_driver_interface * result to persistent storage. In other words, there is no need * to call save() afterwards. * - * @param phpbb_db_driver $db Database connection + * @param \phpbb\db\driver\driver $db Database connection * @param string $query SQL query, should be used for generating storage key - * @param mixed $query_result The result from dbal::sql_query, to be passed to - * dbal::sql_fetchrow to get all rows and store them + * @param mixed $query_result The result from \dbal::sql_query, to be passed to + * \dbal::sql_fetchrow to get all rows and store them * in cache. * @param int $ttl Time to live, after this timeout the query should * expire from the cache. @@ -96,7 +98,7 @@ interface phpbb_cache_driver_driver_interface * representing the query should be returned. Otherwise * the original $query_result should be returned. */ - public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl); + public function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl); /** * Check if result for a given SQL query exists in cache. diff --git a/phpBB/phpbb/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php index 257b90c76e..72c0d77d02 100644 --- a/phpBB/phpbb/cache/driver/eaccelerator.php +++ b/phpBB/phpbb/cache/driver/eaccelerator.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * @package acm * @todo Missing locks from destroy() talk with David */ -class phpbb_cache_driver_eaccelerator extends phpbb_cache_driver_memory +class eaccelerator extends \phpbb\cache\driver\memory { var $extension = 'eaccelerator'; var $function = 'eaccelerator_get'; diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index 85decbe3e8..6e88499577 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * ACM File Based Caching * @package acm */ -class phpbb_cache_driver_file extends phpbb_cache_driver_base +class file extends \phpbb\cache\driver\base { var $vars = array(); var $var_expires = array(); @@ -369,7 +371,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base /** * {@inheritDoc} */ - function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) + function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl) { // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); @@ -651,7 +653,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base $file = "{$this->cache_dir}$filename.$phpEx"; - $lock = new phpbb_lock_flock($file); + $lock = new \phpbb\lock\flock($file); $lock->acquire(); if ($handle = @fopen($file, 'wb')) diff --git a/phpBB/phpbb/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php index 3fd16b23b0..84fe68ae49 100644 --- a/phpBB/phpbb/cache/driver/memcache.php +++ b/phpBB/phpbb/cache/driver/memcache.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -40,7 +42,7 @@ if (!defined('PHPBB_ACM_MEMCACHE')) * ACM for Memcached * @package acm */ -class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory +class memcache extends \phpbb\cache\driver\memory { var $extension = 'memcache'; @@ -52,7 +54,7 @@ class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory // Call the parent constructor parent::__construct(); - $this->memcache = new Memcache; + $this->memcache = new \Memcache; foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u) { $parts = explode('/', $u); diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index f77a1df316..5a9861913f 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * ACM Abstract Memory Class * @package acm */ -abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base +abstract class memory extends \phpbb\cache\driver\base { var $key_prefix; @@ -285,7 +287,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base /** * {@inheritDoc} */ - function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) + function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl) { // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); diff --git a/phpBB/phpbb/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php index 2fadc27ba3..c03319ad61 100644 --- a/phpBB/phpbb/cache/driver/null.php +++ b/phpBB/phpbb/cache/driver/null.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * ACM Null Caching * @package acm */ -class phpbb_cache_driver_null extends phpbb_cache_driver_base +class null extends \phpbb\cache\driver\base { /** * Set cache path @@ -107,7 +109,7 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base /** * {@inheritDoc} */ - function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) + function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl) { return $query_result; } diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php index 960735b673..317d07428a 100644 --- a/phpBB/phpbb/cache/driver/redis.php +++ b/phpBB/phpbb/cache/driver/redis.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -33,7 +35,7 @@ if (!defined('PHPBB_ACM_REDIS_HOST')) * * @package acm */ -class phpbb_cache_driver_redis extends phpbb_cache_driver_memory +class redis extends \phpbb\cache\driver\memory { var $extension = 'redis'; @@ -56,7 +58,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory // Call the parent constructor parent::__construct(); - $this->redis = new Redis(); + $this->redis = new \Redis(); $args = func_get_args(); if (!empty($args)) @@ -83,8 +85,8 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory } } - $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP); - $this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix); + $this->redis->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP); + $this->redis->setOption(\Redis::OPT_PREFIX, $this->key_prefix); if (defined('PHPBB_ACM_REDIS_DB')) { diff --git a/phpBB/phpbb/cache/driver/wincache.php b/phpBB/phpbb/cache/driver/wincache.php index 58f3b4a581..a0b24e4a1f 100644 --- a/phpBB/phpbb/cache/driver/wincache.php +++ b/phpBB/phpbb/cache/driver/wincache.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * ACM for WinCache * @package acm */ -class phpbb_cache_driver_wincache extends phpbb_cache_driver_memory +class wincache extends \phpbb\cache\driver\memory { var $extension = 'wincache'; diff --git a/phpBB/phpbb/cache/driver/xcache.php b/phpBB/phpbb/cache/driver/xcache.php index 06c5fafd97..fdcbf7e4b5 100644 --- a/phpBB/phpbb/cache/driver/xcache.php +++ b/phpBB/phpbb/cache/driver/xcache.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache\driver; + /** * @ignore */ @@ -24,7 +26,7 @@ if (!defined('IN_PHPBB')) * - xcache.admin.enable_auth = off (or xcache.admin.user and xcache.admin.password set) * */ -class phpbb_cache_driver_xcache extends phpbb_cache_driver_memory +class xcache extends \phpbb\cache\driver\memory { var $extension = 'XCache'; diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php index 02dd3d48a9..da8f4eb8d8 100644 --- a/phpBB/phpbb/cache/service.php +++ b/phpBB/phpbb/cache/service.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cache; + /** * @ignore */ @@ -19,26 +21,26 @@ if (!defined('IN_PHPBB')) * Class for grabbing/handling cached entries * @package acm */ -class phpbb_cache_service +class service { /** * Cache driver. * - * @var phpbb_cache_driver_driver_interface + * @var \phpbb\cache\driver\driver_interface */ protected $driver; /** * The config. * - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Database connection. * - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; @@ -59,13 +61,13 @@ class phpbb_cache_service /** * Creates a cache service around a cache driver * - * @param phpbb_cache_driver_driver_interface $driver The cache driver - * @param phpbb_config $config The config - * @param phpbb_db_driver $db Database connection + * @param \phpbb\cache\driver\driver_interface $driver The cache driver + * @param \phpbb\config\config $config The config + * @param \phpbb\db\driver\driver $db Database connection * @param string $phpbb_root_path Root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_cache_driver_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\cache\driver\driver_interface $driver, \phpbb\config\config $config, \phpbb\db\driver\driver $db, $phpbb_root_path, $php_ext) { $this->set_driver($driver); $this->config = $config; @@ -77,7 +79,7 @@ class phpbb_cache_service /** * Returns the cache driver used by this cache service. * - * @return phpbb_cache_driver_driver_interface The cache driver + * @return \phpbb\cache\driver\driver_interface The cache driver */ public function get_driver() { @@ -87,9 +89,9 @@ class phpbb_cache_service /** * Replaces the cache driver used by this cache service. * - * @param phpbb_cache_driver_driver_interface $driver The cache driver + * @param \phpbb\cache\driver\driver_interface $driver The cache driver */ - public function set_driver(phpbb_cache_driver_driver_interface $driver) + public function set_driver(\phpbb\cache\driver\driver_interface $driver) { $this->driver = $driver; } diff --git a/phpBB/phpbb/config/config.php b/phpBB/phpbb/config/config.php index 4b533dd55c..dc865df707 100644 --- a/phpBB/phpbb/config/config.php +++ b/phpBB/phpbb/config/config.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\config; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Configuration container class * @package phpBB3 */ -class phpbb_config implements ArrayAccess, IteratorAggregate, Countable +class config implements \ArrayAccess, \IteratorAggregate, \Countable { /** * The configuration data @@ -44,7 +46,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable */ public function getIterator() { - return new ArrayIterator($this->config); + return new \ArrayIterator($this->config); } /** @@ -90,7 +92,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable */ public function offsetUnset($key) { - trigger_error('Config values have to be deleted explicitly with the phpbb_config::delete($key) method.', E_USER_ERROR); + trigger_error('Config values have to be deleted explicitly with the \phpbb\config\config::delete($key) method.', E_USER_ERROR); } /** diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php index 25647e1d0b..7174327ef3 100644 --- a/phpBB/phpbb/config/db.php +++ b/phpBB/phpbb/config/db.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\config; + /** * @ignore */ @@ -19,17 +21,17 @@ if (!defined('IN_PHPBB')) * Configuration container class * @package phpBB3 */ -class phpbb_config_db extends phpbb_config +class db extends \phpbb\config\config { /** * Cache instance - * @var phpbb_cache_driver_driver_interface + * @var \phpbb\cache\driver\driver_interface */ protected $cache; /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; @@ -42,11 +44,11 @@ class phpbb_config_db extends phpbb_config /** * Creates a configuration container with a default set of values * - * @param phpbb_db_driver $db Database connection - * @param phpbb_cache_driver_driver_interface $cache Cache instance + * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\cache\driver\driver_interface $cache Cache instance * @param string $table Configuration table name */ - public function __construct(phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $table) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, $table) { $this->db = $db; $this->cache = $cache; @@ -176,7 +178,7 @@ class phpbb_config_db extends phpbb_config /** * Increments an integer config value directly in the database. * - * Using this method instead of setting the new value directly avoids race + * Using this method instead of setting the new \value directly avoids race * conditions and unlike set_atomic it cannot fail. * * @param string $key The configuration option's name diff --git a/phpBB/phpbb/config/db_text.php b/phpBB/phpbb/config/db_text.php index b365cb5c77..3ee3351e19 100644 --- a/phpBB/phpbb/config/db_text.php +++ b/phpBB/phpbb/config/db_text.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\config; + /** * @ignore */ @@ -17,16 +19,16 @@ if (!defined('IN_PHPBB')) /** * Manages configuration options with an arbitrary length value stored in a TEXT -* column. In constrast to class phpbb_config_db, values are never cached and +* column. In constrast to class \phpbb\config\db, values are never cached and * prefetched, but every get operation sends a query to the database. * * @package phpBB3 */ -class phpbb_config_db_text +class db_text { /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; @@ -37,10 +39,10 @@ class phpbb_config_db_text protected $table; /** - * @param phpbb_db_driver $db Database connection + * @param \phpbb\db\driver\driver $db Database connection * @param string $table Table name */ - public function __construct(phpbb_db_driver $db, $table) + public function __construct(\phpbb\db\driver\driver $db, $table) { $this->db = $db; $this->table = $this->db->sql_escape($table); diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 4ad5f6793e..097a886430 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -20,23 +22,23 @@ if (!defined('IN_PHPBB')) * Handle fetching and setting the visibility for topics and posts * @package phpbb */ -class phpbb_content_visibility +class content_visibility { /** * Database object - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Auth object - * @var phpbb_auth + * @var \phpbb\auth\auth */ protected $auth; @@ -55,14 +57,14 @@ class phpbb_content_visibility /** * Constructor * - * @param phpbb_auth $auth Auth object - * @param phpbb_db_driver $db Database object - * @param phpbb_user $user User object + * @param \phpbb\auth\auth $auth Auth object + * @param \phpbb\db\driver\driver $db Database object + * @param \phpbb\user $user User object * @param string $phpbb_root_path Root path * @param string $php_ext PHP Extension * @return null */ - public function __construct(phpbb_auth $auth, phpbb_db_driver $db, phpbb_user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table) + public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver $db, \phpbb\user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table) { $this->auth = $auth; $this->db = $db; diff --git a/phpBB/phpbb/controller/exception.php b/phpBB/phpbb/controller/exception.php index faa8b6b584..e8694b8bcf 100644 --- a/phpBB/phpbb/controller/exception.php +++ b/phpBB/phpbb/controller/exception.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\controller; + /** * @ignore */ @@ -19,6 +21,6 @@ if (!defined('IN_PHPBB')) * Controller exception class * @package phpBB3 */ -class phpbb_controller_exception extends RuntimeException +class exception extends \RuntimeException { } diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 74410ddfd1..f1cc29f21b 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\controller; + /** * @ignore */ @@ -21,17 +23,17 @@ use Symfony\Component\HttpFoundation\Response; * Controller helper class, contains methods that do things for controllers * @package phpBB3 */ -class phpbb_controller_helper +class helper { /** * Template object - * @var phpbb_template + * @var \phpbb\template\template */ protected $template; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -50,12 +52,12 @@ class phpbb_controller_helper /** * Constructor * - * @param phpbb_template $template Template object - * @param phpbb_user $user User object + * @param \phpbb\template\template $template Template object + * @param \phpbb\user $user User object * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; @@ -81,7 +83,7 @@ class phpbb_controller_helper page_footer(true, false, false); - return new Response($this->template->assign_display('body'), $status_code); + return new \Response($this->template->assign_display('body'), $status_code); } /** diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index b2a5b9f6b2..3aad08e3aa 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\controller; + /** * @ignore */ @@ -23,7 +25,7 @@ use Symfony\Component\Config\FileLocator; * Controller interface * @package phpBB3 */ -class phpbb_controller_provider +class provider { /** * YAML file(s) containing route information @@ -48,7 +50,7 @@ class phpbb_controller_provider * * @return The current instance of this object for method chaining */ - public function import_paths_from_finder(phpbb_extension_finder $finder) + public function import_paths_from_finder(\phpbb\extension\finder $finder) { // We hardcode the path to the core config directory // because the finder cannot find it diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index 95dfc8da8e..5c1f5e836e 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\controller; + /** * @ignore */ @@ -23,11 +25,11 @@ use Symfony\Component\HttpFoundation\Request; * Controller manager class * @package phpBB3 */ -class phpbb_controller_resolver implements ControllerResolverInterface +class resolver implements ControllerResolverInterface { /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -38,19 +40,19 @@ class phpbb_controller_resolver implements ControllerResolverInterface protected $container; /** - * phpbb_style object - * @var phpbb_style + * \phpbb\style\style object + * @var \phpbb\style\style */ protected $style; /** * Construct method * - * @param phpbb_user $user User Object + * @param \phpbb\user $user User Object * @param ContainerInterface $container ContainerInterface object - * @param phpbb_style $style + * @param \phpbb\style\style $style */ - public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style = null) + public function __construct(\phpbb\user $user, ContainerInterface $container, \phpbb\style\style $style = null) { $this->user = $user; $this->container = $container; @@ -62,7 +64,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface * * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object * @return bool|Callable Callable or false - * @throws phpbb_controller_exception + * @throws \phpbb\controller\exception */ public function getController(Request $request) { @@ -70,20 +72,20 @@ class phpbb_controller_resolver implements ControllerResolverInterface if (!$controller) { - throw new phpbb_controller_exception($this->user->lang['CONTROLLER_NOT_SPECIFIED']); + throw new \phpbb\controller\exception($this->user->lang['CONTROLLER_NOT_SPECIFIED']); } // Require a method name along with the service name if (stripos($controller, ':') === false) { - throw new phpbb_controller_exception($this->user->lang['CONTROLLER_METHOD_NOT_SPECIFIED']); + throw new \phpbb\controller\exception($this->user->lang['CONTROLLER_METHOD_NOT_SPECIFIED']); } list($service, $method) = explode(':', $controller); if (!$this->container->has($service)) { - throw new phpbb_controller_exception($this->user->lang('CONTROLLER_SERVICE_UNDEFINED', $service)); + throw new \phpbb\controller\exception($this->user->lang('CONTROLLER_SERVICE_UNDEFINED', $service)); } $controller_object = $this->container->get($service); @@ -118,13 +120,13 @@ class phpbb_controller_resolver implements ControllerResolverInterface * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object * @param mixed $controller A callable (controller class, method) * @return bool False - * @throws phpbb_controller_exception + * @throws \phpbb\controller\exception */ public function getArguments(Request $request, $controller) { // At this point, $controller contains the object and method name list($object, $method) = $controller; - $mirror = new ReflectionMethod($object, $method); + $mirror = new \ReflectionMethod($object, $method); $arguments = array(); $parameters = $mirror->getParameters(); @@ -145,7 +147,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface } else { - throw new phpbb_controller_exception($this->user->lang('CONTROLLER_ARGUMENT_VALUE_MISSING', $param->getPosition() + 1, get_class($object) . ':' . $method, $param->name)); + throw new \phpbb\controller\exception($this->user->lang('CONTROLLER_ARGUMENT_VALUE_MISSING', $param->getPosition() + 1, get_class($object) . ':' . $method, $param->name)); } } diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index 84c9650830..f58ba64a3d 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron; + /** * @ignore */ @@ -22,10 +24,10 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_manager +class manager { /** - * Set of phpbb_cron_task_wrapper objects. + * Set of \phpbb\cron\task\wrapper objects. * Array holding all tasks that have been found. * * @var array @@ -52,7 +54,7 @@ class phpbb_cron_manager * Loads tasks given by name, wraps them * and puts them into $this->tasks. * - * @param array|Traversable $tasks Array of instances of phpbb_cron_task + * @param array|Traversable $tasks Array of instances of \phpbb\cron\task\task * * @return null */ @@ -71,7 +73,7 @@ class phpbb_cron_manager * * If no tasks are ready, null is returned. * - * @return phpbb_cron_task_wrapper|null + * @return \phpbb\cron\task\wrapper|null */ public function find_one_ready_task() { @@ -88,7 +90,7 @@ class phpbb_cron_manager /** * Finds all tasks that are ready to run. * - * @return array List of tasks which are ready to run (wrapped in phpbb_cron_task_wrapper). + * @return array List of tasks which are ready to run (wrapped in \phpbb\cron\task\wrapper). */ public function find_all_ready_tasks() { @@ -111,7 +113,7 @@ class phpbb_cron_manager * Web runner uses this method to resolve names to tasks. * * @param string $name Name of the task to look up. - * @return phpbb_cron_task A task corresponding to the given name, or null. + * @return \phpbb\cron\task\task A task corresponding to the given name, or null. */ public function find_task($name) { @@ -126,13 +128,13 @@ class phpbb_cron_manager } /** - * Wraps a task inside an instance of phpbb_cron_task_wrapper. + * Wraps a task inside an instance of \phpbb\cron\task\wrapper. * - * @param phpbb_cron_task $task The task. - * @return phpbb_cron_task_wrapper The wrapped task. + * @param \phpbb\cron\task\task $task The task. + * @return \phpbb\cron\task\wrapper The wrapped task. */ - public function wrap_task(phpbb_cron_task $task) + public function wrap_task(\phpbb\cron\task\task $task) { - return new phpbb_cron_task_wrapper($task, $this->phpbb_root_path, $this->php_ext); + return new \phpbb\cron\task\wrapper($task, $this->phpbb_root_path, $this->php_ext); } } diff --git a/phpBB/phpbb/cron/task/base.php b/phpBB/phpbb/cron/task/base.php index 94a2f267b4..f30c9daf1b 100644 --- a/phpBB/phpbb/cron/task/base.php +++ b/phpBB/phpbb/cron/task/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task; + /** * @ignore */ @@ -26,7 +28,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -abstract class phpbb_cron_task_base implements phpbb_cron_task +abstract class base implements \phpbb\cron\task\task { private $name; diff --git a/phpBB/phpbb/cron/task/core/prune_all_forums.php b/phpBB/phpbb/cron/task/core/prune_all_forums.php index 2c5d38cec0..8e3ef25ce6 100644 --- a/phpBB/phpbb/cron/task/core/prune_all_forums.php +++ b/phpBB/phpbb/cron/task/core/prune_all_forums.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -24,7 +26,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base +class prune_all_forums extends \phpbb\cron\task\base { protected $phpbb_root_path; protected $php_ext; @@ -36,10 +38,10 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_config $config The config - * @param phpbb_db_driver $db The db connection + * @param \phpbb\config\config $config The config + * @param \phpbb\db\driver\driver $db The db connection */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db) + public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, \phpbb\db\driver\driver $db) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/phpbb/cron/task/core/prune_forum.php b/phpBB/phpbb/cron/task/core/prune_forum.php index 0e4c75c77f..f14ab7b702 100644 --- a/phpBB/phpbb/cron/task/core/prune_forum.php +++ b/phpBB/phpbb/cron/task/core/prune_forum.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -24,7 +26,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements phpbb_cron_task_parametrized +class prune_forum extends \phpbb\cron\task\base implements \phpbb\cron\task\parametrized { protected $phpbb_root_path; protected $php_ext; @@ -46,10 +48,10 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_config $config The config - * @param phpbb_db_driver $db The db connection + * @param \phpbb\config\config $config The config + * @param \phpbb\db\driver\driver $db The db connection */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db) + public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, \phpbb\db\driver\driver $db) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -132,15 +134,15 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p /** * Parses parameters found in $request, which is an instance of - * phpbb_request_request_interface. + * \phpbb\request\request_interface. * * It is expected to have a key f whose value is id of the forum to be pruned. * - * @param phpbb_request_request_interface $request Request object. + * @param \phpbb\request\request_interface $request Request object. * * @return null */ - public function parse_parameters(phpbb_request_request_interface $request) + public function parse_parameters(\phpbb\request\request_interface $request) { $this->forum_data = null; if ($request->is_set('f')) diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php index 732f9c6bea..cb13df86df 100644 --- a/phpBB/phpbb/cron/task/core/queue.php +++ b/phpBB/phpbb/cron/task/core/queue.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_queue extends phpbb_cron_task_base +class queue extends \phpbb\cron\task\base { protected $phpbb_root_path; protected $php_ext; @@ -31,9 +33,9 @@ class phpbb_cron_task_core_queue extends phpbb_cron_task_base * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_config $config The config + * @param \phpbb\config\config $config The config */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config) + public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -51,7 +53,7 @@ class phpbb_cron_task_core_queue extends phpbb_cron_task_base { include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); } - $queue = new queue(); + $queue = new \queue(); $queue->process(); } diff --git a/phpBB/phpbb/cron/task/core/tidy_cache.php b/phpBB/phpbb/cron/task/core/tidy_cache.php index 4618e8200e..021d5fd8a3 100644 --- a/phpBB/phpbb/cron/task/core/tidy_cache.php +++ b/phpBB/phpbb/cron/task/core/tidy_cache.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base +class tidy_cache extends \phpbb\cron\task\base { protected $config; protected $cache; @@ -28,10 +30,10 @@ class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base /** * Constructor. * - * @param phpbb_config $config The config - * @param phpbb_cache_driver_driver_interface $cache The cache driver + * @param \phpbb\config\config $config The config + * @param \phpbb\cache\driver\driver_interface $cache The cache driver */ - public function __construct(phpbb_config $config, phpbb_cache_driver_driver_interface $cache) + public function __construct(\phpbb\config\config $config, \phpbb\cache\driver\driver_interface $cache) { $this->config = $config; $this->cache = $cache; diff --git a/phpBB/phpbb/cron/task/core/tidy_database.php b/phpBB/phpbb/cron/task/core/tidy_database.php index b882e7b500..d03cba1d86 100644 --- a/phpBB/phpbb/cron/task/core/tidy_database.php +++ b/phpBB/phpbb/cron/task/core/tidy_database.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_tidy_database extends phpbb_cron_task_base +class tidy_database extends \phpbb\cron\task\base { protected $phpbb_root_path; protected $php_ext; @@ -31,9 +33,9 @@ class phpbb_cron_task_core_tidy_database extends phpbb_cron_task_base * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_config $config The config + * @param \phpbb\config\config $config The config */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config) + public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/phpbb/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php index a3d5b7dbd2..ebd0d86cbc 100644 --- a/phpBB/phpbb/cron/task/core/tidy_search.php +++ b/phpBB/phpbb/cron/task/core/tidy_search.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base +class tidy_search extends \phpbb\cron\task\base { protected $phpbb_root_path; protected $php_ext; @@ -36,12 +38,12 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_auth $auth The auth - * @param phpbb_config $config The config - * @param phpbb_db_driver $db The db connection - * @param phpbb_user $user The user + * @param \phpbb\auth\auth $auth The auth + * @param \phpbb\config\config $config The config + * @param \phpbb\db\driver\driver $db The db connection + * @param \phpbb\user $user The user */ - public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, phpbb_db_driver $db, phpbb_user $user) + public function __construct($phpbb_root_path, $php_ext, \phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\user $user) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/phpbb/cron/task/core/tidy_sessions.php b/phpBB/phpbb/cron/task/core/tidy_sessions.php index 95f55235c9..5df019ae46 100644 --- a/phpBB/phpbb/cron/task/core/tidy_sessions.php +++ b/phpBB/phpbb/cron/task/core/tidy_sessions.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_tidy_sessions extends phpbb_cron_task_base +class tidy_sessions extends \phpbb\cron\task\base { protected $config; protected $user; @@ -28,10 +30,10 @@ class phpbb_cron_task_core_tidy_sessions extends phpbb_cron_task_base /** * Constructor. * - * @param phpbb_config $config The config - * @param phpbb_user $user The user + * @param \phpbb\config\config $config The config + * @param \phpbb\user $user The user */ - public function __construct(phpbb_config $config, phpbb_user $user) + public function __construct(\phpbb\config\config $config, \phpbb\user $user) { $this->config = $config; $this->user = $user; diff --git a/phpBB/phpbb/cron/task/core/tidy_warnings.php b/phpBB/phpbb/cron/task/core/tidy_warnings.php index 2a7798e56e..1cc0abbe88 100644 --- a/phpBB/phpbb/cron/task/core/tidy_warnings.php +++ b/phpBB/phpbb/cron/task/core/tidy_warnings.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task\core; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_core_tidy_warnings extends phpbb_cron_task_base +class tidy_warnings extends \phpbb\cron\task\base { protected $phpbb_root_path; protected $php_ext; @@ -33,9 +35,9 @@ class phpbb_cron_task_core_tidy_warnings extends phpbb_cron_task_base * * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension - * @param phpbb_config $config The config + * @param \phpbb\config\config $config The config */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config) + public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/phpbb/cron/task/parametrized.php b/phpBB/phpbb/cron/task/parametrized.php index 9a6a55c6bc..1d2f449c58 100644 --- a/phpBB/phpbb/cron/task/parametrized.php +++ b/phpBB/phpbb/cron/task/parametrized.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task; + /** * @ignore */ @@ -26,7 +28,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_cron_task_parametrized extends phpbb_cron_task +interface parametrized extends \phpbb\cron\task\task { /** * Returns parameters of this cron task as an array. @@ -39,14 +41,14 @@ interface phpbb_cron_task_parametrized extends phpbb_cron_task /** * Parses parameters found in $request, which is an instance of - * phpbb_request_request_interface. + * \phpbb\request\request_interface. * * $request contains user input and must not be trusted. * Cron task must validate all data before using it. * - * @param phpbb_request_request_interface $request Request object. + * @param \phpbb\request\request_interface $request Request object. * * @return null */ - public function parse_parameters(phpbb_request_request_interface $request); + public function parse_parameters(\phpbb\request\request_interface $request); } diff --git a/phpBB/phpbb/cron/task/task.php b/phpBB/phpbb/cron/task/task.php index 2d585df96d..84218c4fc9 100644 --- a/phpBB/phpbb/cron/task/task.php +++ b/phpBB/phpbb/cron/task/task.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Cron task interface * @package phpBB3 */ -interface phpbb_cron_task +interface task { /** * Returns the name of the task. diff --git a/phpBB/phpbb/cron/task/wrapper.php b/phpBB/phpbb/cron/task/wrapper.php index 386fb5b383..aa015966c6 100644 --- a/phpBB/phpbb/cron/task/wrapper.php +++ b/phpBB/phpbb/cron/task/wrapper.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\cron\task; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_cron_task_wrapper +class wrapper { protected $task; protected $phpbb_root_path; @@ -32,9 +34,9 @@ class phpbb_cron_task_wrapper * * Wraps a task $task, which must implement cron_task interface. * - * @param phpbb_cron_task $task The cron task to wrap. + * @param \phpbb\cron\task\task $task The cron task to wrap. */ - public function __construct(phpbb_cron_task $task, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\cron\task\task $task, $phpbb_root_path, $php_ext) { $this->task = $task; $this->phpbb_root_path = $phpbb_root_path; @@ -51,7 +53,7 @@ class phpbb_cron_task_wrapper */ public function is_parametrized() { - return $this->task instanceof phpbb_cron_task_parametrized; + return $this->task instanceof \phpbb\cron\task\parametrized; } /** diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php index 3c6d4971b9..2d48c8311e 100644 --- a/phpBB/phpbb/datetime.php +++ b/phpBB/phpbb/datetime.php @@ -6,11 +6,13 @@ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 */ +namespace phpbb; + /** * phpBB custom extensions to the PHP DateTime class * This handles the relative formats phpBB employs */ -class phpbb_datetime extends DateTime +class datetime extends \DateTime { /** * String used to wrap the date segment which should be replaced by today/tomorrow/yesterday @@ -28,14 +30,14 @@ class phpbb_datetime extends DateTime static protected $format_cache = array(); /** - * Constructs a new instance of phpbb_datetime, expanded to include an argument to inject + * Constructs a new \instance of \phpbb\datetime, expanded to include an argument to inject * the user context and modify the timezone to the users selected timezone if one is not set. * * @param string $time String in a format accepted by strtotime(). * @param DateTimeZone $timezone Time zone of the time. * @param user User object for context. */ - public function __construct($user, $time = 'now', DateTimeZone $timezone = null) + public function __construct($user, $time = 'now', \DateTimeZone $timezone = null) { $this->user = $user; $timezone = $timezone ?: $this->user->timezone; diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 08c966c07a..a266b2aa48 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Database Abstraction Layer * @package dbal */ -class phpbb_db_driver +class driver { var $db_connect_id; var $query_result; @@ -272,7 +274,7 @@ class phpbb_db_driver * Correctly adjust LIKE expression for special characters * Some DBMS are handling them in a different way * - * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char + * @param string $expression The expression to use. Every wildcard is escaped, \except $this->any_char and $this->one_char * @return string LIKE expression including the keyword! */ function sql_like_expression($expression) @@ -450,7 +452,7 @@ class phpbb_db_driver * @param string $field name of the sql column that shall be compared * @param array $array array of values that are allowed (IN) or not allowed (NOT IN) * @param bool $negate true for NOT IN (), false for IN () (default) - * @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. + * @param bool $allow_empty_set If true, \allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. */ function sql_in_set($field, $array, $negate = false, $allow_empty_set = false) { diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php index 787c28b812..2df5eaf369 100644 --- a/phpBB/phpbb/db/driver/firebird.php +++ b/phpBB/phpbb/db/driver/firebird.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Minimum Requirement is Firebird 2.1 * @package dbal */ -class phpbb_db_driver_firebird extends phpbb_db_driver +class firebird extends \phpbb\db\driver\driver { var $last_query_text = ''; var $service_handle = false; diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php index 89c2c2351b..4d2cd287da 100644 --- a/phpBB/phpbb/db/driver/mssql.php +++ b/phpBB/phpbb/db/driver/mssql.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Minimum Requirement is MSSQL 2000+ * @package dbal */ -class phpbb_db_driver_mssql extends phpbb_db_driver +class mssql extends \phpbb\db\driver\driver { var $connect_error = ''; diff --git a/phpBB/phpbb/db/driver/mssql_base.php b/phpBB/phpbb/db/driver/mssql_base.php index 56c111c871..57c4e0f1fd 100644 --- a/phpBB/phpbb/db/driver/mssql_base.php +++ b/phpBB/phpbb/db/driver/mssql_base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * MSSQL Database Base Abstraction Layer * @package dbal */ -abstract class phpbb_db_driver_mssql_base extends phpbb_db_driver +abstract class mssql_base extends \phpbb\db\driver\driver { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php index a1d1a5d5dd..9db34a69fb 100644 --- a/phpBB/phpbb/db/driver/mssql_odbc.php +++ b/phpBB/phpbb/db/driver/mssql_odbc.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -26,7 +28,7 @@ if (!defined('IN_PHPBB')) * * @package dbal */ -class phpbb_db_driver_mssql_odbc extends phpbb_db_driver_mssql_base +class mssql_odbc extends \phpbb\db\driver\mssql_base { var $last_query_text = ''; var $connect_error = ''; diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php index 28fc88298a..e6002fe1a3 100644 --- a/phpBB/phpbb/db/driver/mssqlnative.php +++ b/phpBB/phpbb/db/driver/mssqlnative.php @@ -11,6 +11,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -56,7 +58,7 @@ class result_mssqlnative { if (is_array($value)) { - $obj->$key = new stdClass(); + $obj->$key = new \stdClass(); array_to_obj($value, $obj->$key); } else @@ -191,7 +193,7 @@ class result_mssqlnative /** * @package dbal */ -class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base +class mssqlnative extends \phpbb\db\driver\mssql_base { var $m_insert_id = NULL; var $last_query_text = ''; diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php index f3744ac09d..c76126763d 100644 --- a/phpBB/phpbb/db/driver/mysql.php +++ b/phpBB/phpbb/db/driver/mysql.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -24,7 +26,7 @@ if (!defined('IN_PHPBB')) * MySQL 5.0+ * @package dbal */ -class phpbb_db_driver_mysql extends phpbb_db_driver_mysql_base +class mysql extends \phpbb\db\driver\mysql_base { var $multi_insert = true; var $connect_error = ''; diff --git a/phpBB/phpbb/db/driver/mysql_base.php b/phpBB/phpbb/db/driver/mysql_base.php index ba44ea61aa..8f2f66674b 100644 --- a/phpBB/phpbb/db/driver/mysql_base.php +++ b/phpBB/phpbb/db/driver/mysql_base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Abstract MySQL Database Base Abstraction Layer * @package dbal */ -abstract class phpbb_db_driver_mysql_base extends phpbb_db_driver +abstract class mysql_base extends \phpbb\db\driver\driver { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 0f7a73ee6e..4d0e43b464 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * MySQL 4.1+ or MySQL 5.0+ * @package dbal */ -class phpbb_db_driver_mysqli extends phpbb_db_driver_mysql_base +class mysqli extends \phpbb\db\driver\mysql_base { var $multi_insert = true; var $connect_error = ''; diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php index e21e07055d..5dfab21455 100644 --- a/phpBB/phpbb/db/driver/oracle.php +++ b/phpBB/phpbb/db/driver/oracle.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Oracle Database Abstraction Layer * @package dbal */ -class phpbb_db_driver_oracle extends phpbb_db_driver +class oracle extends \phpbb\db\driver\driver { var $last_query_text = ''; var $connect_error = ''; diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 14854d179d..7a98b90c73 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Minimum Requirement is Version 7.3+ * @package dbal */ -class phpbb_db_driver_postgres extends phpbb_db_driver +class postgres extends \phpbb\db\driver\driver { var $last_query_text = ''; var $connect_error = ''; @@ -84,7 +86,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver $this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?'; return $this->sql_error(''); } - $collector = new phpbb_error_collector; + $collector = new \phpbb\error_collector; $collector->install(); $this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW); } @@ -95,7 +97,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver $this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?'; return $this->sql_error(''); } - $collector = new phpbb_error_collector; + $collector = new \phpbb\error_collector; $collector->install(); $this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW); } diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php index 7188f0daa2..a548fd2618 100644 --- a/phpBB/phpbb/db/driver/sqlite.php +++ b/phpBB/phpbb/db/driver/sqlite.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\driver; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Minimum Requirement: 2.8.2+ * @package dbal */ -class phpbb_db_driver_sqlite extends phpbb_db_driver +class sqlite extends \phpbb\db\driver\driver { var $connect_error = ''; diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1.php index c996a0138a..2fe0addc06 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10.php b/phpBB/phpbb/db/migration/data/30x/3_0_10.php index 122f93d6b4..cdf824a9ff 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_10.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_10.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_10 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php index 0ed05812dc..ee05fcabaa 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_10_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php index b14b3b00aa..f53a4b0d97 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_10_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php index 473057d65d..20456e0458 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_10_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11.php b/phpBB/phpbb/db/migration/data/30x/3_0_11.php index e063c699cc..5b842cba4b 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_11.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_11.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_11 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php index dddfc0e0e7..1d484a97ca 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_11_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php index fac8523e8c..b7e475a87b 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_11_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php index 6a31a51201..f1692f8ef7 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php @@ -7,9 +7,11 @@ * */ +namespace phpbb\db\migration\datax; + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/ -class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration +class 3_0_12_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php index 562ccf077c..0444de4ac2 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_1_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2.php index eed5acef82..4f9278e2fa 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php index a960e90765..8f709fb769 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_2_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php index 8917dfea77..ecbe8bf808 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_2_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_3.php b/phpBB/phpbb/db/migration/data/30x/3_0_3.php index 8984cf7b76..5f94bd9018 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_3.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_3.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_3 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php index 4b102e1a2e..631d382135 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_3_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_4.php b/phpBB/phpbb/db/migration/data/30x/3_0_4.php index 9a0c132e78..369f23f7e7 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_4.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_4.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_4 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php index 8ad75a557b..f98d7a59d0 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_4_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -82,7 +84,7 @@ class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration public function update_custom_profile_fields() { - // Update the Custom Profile Fields based on previous settings to the new format + // Update the Custom Profile Fields based on previous settings to the new \format $sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide FROM ' . PROFILE_FIELDS_TABLE; $result = $this->db->sql_query($sql); diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5.php b/phpBB/phpbb/db/migration/data/30x/3_0_5.php index 16d2dee457..9265f09b39 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_5.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_5.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_5 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php index ea17cc1e31..b99313de5d 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_5_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php index 8538347b1a..65787f9310 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_5_rc1part2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6.php b/phpBB/phpbb/db/migration/data/30x/3_0_6.php index bb651dc7cd..382fb6cde2 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_6.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_6.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_6 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php index 38c282ebf0..0b54c3b195 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_6_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -214,7 +216,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration $group_id = $this->db->sql_nextid(); } - // Insert new user role... at the end of the chain + // Insert new \user role... at the end of the chain $sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . " WHERE role_name = 'ROLE_USER_NEW_MEMBER' @@ -239,7 +241,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration $u_role = $this->db->sql_nextid(); // Now add the correct data to the roles... - // The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups + // The standard role says that new \users are not able to send a PM, Mass PM, are not able to PM groups $sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')"; $this->sql_query($sql); @@ -248,7 +250,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration $this->sql_query($sql); } - // Insert new forum role + // Insert new \forum role $sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . " WHERE role_name = 'ROLE_FORUM_NEW_MEMBER' @@ -276,7 +278,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration $this->sql_query($sql); } - // Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once) + // Set every members user_new \column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once) $sql = 'SELECT 1 FROM ' . USERS_TABLE . ' WHERE user_new = 0'; @@ -318,7 +320,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration // Clear permissions... include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext); - $auth_admin = new auth_admin(); + $auth_admin = new \auth_admin(); $auth_admin->acl_clear_prefetch(); } } diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php index a939dbd489..041224d19a 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_6_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php index b3f09d8ab8..3183c16efd 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_6_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -30,7 +32,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration public function update_cp_fields() { - // Update the Custom Profile Fields based on previous settings to the new format + // Update the Custom Profile Fields based on previous settings to the new \format $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . ' SET field_show_on_vt = 1 WHERE field_hide = 0 diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php index fc2923f99b..7d75b12130 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_6_rc4 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7.php b/phpBB/phpbb/db/migration/data/30x/3_0_7.php index 9ff2e9e4ab..1b1e5d0373 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_7.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_7.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_7 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php index c9cc9d19ac..a45c9c3c14 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_7_pl1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php index ffebf66f2d..dab90512ab 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_7_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php index 55bc2bc679..ea430740c6 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_7_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_8.php b/phpBB/phpbb/db/migration/data/30x/3_0_8.php index 8998ef9627..c08a74e5ee 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_8.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_8.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_8 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php index aeff35333e..dce88e249e 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_8_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9.php b/phpBB/phpbb/db/migration/data/30x/3_0_9.php index d5269ea6f0..8254ac8561 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_9.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_9.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_9 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php index 4c345b429b..14e0fe6013 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_9_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php index c0e662aa45..44fd789353 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_9_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php index d6d1f14b2e..e4102fb193 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_9_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php index e673249343..5896d11ba5 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class 3_0_9_rc4 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php index f324b8880d..360daed437 100644 --- a/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php +++ b/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration +namespace phpbb\db\migration\datax; + +class local_url_bbcode extends \phpbb\db\migration\migration { static public function depends_on() { @@ -44,7 +46,7 @@ class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration $bbcode_match = $row['bbcode_match']; $bbcode_tpl = $row['bbcode_tpl']; - $acp_bbcodes = new acp_bbcodes(); + $acp_bbcodes = new \acp_bbcodes(); $sql_ary = $acp_bbcodes->build_regexp($bbcode_match, $bbcode_tpl); $sql = 'UPDATE ' . BBCODES_TABLE . ' diff --git a/phpBB/phpbb/db/migration/data/310/avatars.php b/phpBB/phpbb/db/migration/data/310/avatars.php index 79547337f7..0d539d0c75 100644 --- a/phpBB/phpbb/db/migration/data/310/avatars.php +++ b/phpBB/phpbb/db/migration/data/310/avatars.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_avatars extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class avatars extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/boardindex.php b/phpBB/phpbb/db/migration/data/310/boardindex.php index 965e32c15c..ee403a7360 100644 --- a/phpBB/phpbb/db/migration/data/310/boardindex.php +++ b/phpBB/phpbb/db/migration/data/310/boardindex.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class boardindex extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/config_db_text.php b/phpBB/phpbb/db/migration/data/310/config_db_text.php index 89f211adda..932edf39d7 100644 --- a/phpBB/phpbb/db/migration/data/310/config_db_text.php +++ b/phpBB/phpbb/db/migration/data/310/config_db_text.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_config_db_text extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class config_db_text extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/dev.php b/phpBB/phpbb/db/migration/data/310/dev.php index 0fc2950987..702073bcdd 100644 --- a/phpBB/phpbb/db/migration/data/310/dev.php +++ b/phpBB/phpbb/db/migration/data/310/dev.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_dev extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class dev extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -17,10 +19,10 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration static public function depends_on() { return array( - 'phpbb_db_migration_data_310_extensions', - 'phpbb_db_migration_data_310_style_update_p2', - 'phpbb_db_migration_data_310_timezone_p2', - 'phpbb_db_migration_data_310_reported_posts_display', + '\phpbb\db\migration\data0\extensions', + '\phpbb\db\migration\data0\style_update_p2', + '\phpbb\db\migration\data0\timezone_p2', + '\phpbb\db\migration\data0\reported_posts_display', ); } @@ -183,7 +185,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration public function move_customise_modules() { - // Move language management to new location in the Customise tab + // Move language management to new \location in the Customise tab // First get language module id $sql = 'SELECT module_id FROM ' . MODULES_TABLE . " WHERE module_basename = 'acp_language'"; @@ -206,7 +208,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration { include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); } - $module_manager = new acp_modules(); + $module_manager = new \acp_modules(); $module_manager->module_class = 'acp'; $module_manager->move_module($language_module_id, $language_management_module_id); } diff --git a/phpBB/phpbb/db/migration/data/310/extensions.php b/phpBB/phpbb/db/migration/data/310/extensions.php index 6a9caa1cfc..fde2038cca 100644 --- a/phpBB/phpbb/db/migration/data/310/extensions.php +++ b/phpBB/phpbb/db/migration/data/310/extensions.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_extensions extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class extensions extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/forgot_password.php b/phpBB/phpbb/db/migration/data/310/forgot_password.php index a553e51f35..9a42565223 100644 --- a/phpBB/phpbb/db/migration/data/310/forgot_password.php +++ b/phpBB/phpbb/db/migration/data/310/forgot_password.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class forgot_password extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/jquery_update.php b/phpBB/phpbb/db/migration/data/310/jquery_update.php index dc49f74fcb..2b30e2dd3b 100644 --- a/phpBB/phpbb/db/migration/data/310/jquery_update.php +++ b/phpBB/phpbb/db/migration/data/310/jquery_update.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class jquery_update extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -17,7 +19,7 @@ class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', + '\phpbb\db\migration\data0\dev', ); } diff --git a/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php index d994d7ec5f..482051c287 100644 --- a/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php @@ -7,11 +7,13 @@ * */ -class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class notification_options_reconvert extends \phpbb\db\migration\migration { static public function depends_on() { - return array('phpbb_db_migration_data_310_notifications_schema_fix'); + return array('\phpbb\db\migration\data0\notifications_schema_fix'); } public function update_data() @@ -24,7 +26,7 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d public function convert_notifications() { $insert_table = $this->table_prefix . 'user_notifications'; - $insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table); + $insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $insert_table); $this->perform_conversion($insert_buffer, $insert_table); } @@ -32,10 +34,10 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d /** * Perform the conversion (separate for testability) * - * @param phpbb_db_sql_insert_buffer $insert_buffer + * @param \phpbb\db\sql_insert_buffer $insert_buffer * @param string $insert_table */ - public function perform_conversion(phpbb_db_sql_insert_buffer $insert_buffer, $insert_table) + public function perform_conversion(\phpbb\db\sql_insert_buffer $insert_buffer, $insert_table) { $sql = 'DELETE FROM ' . $insert_table; $this->db->sql_query($sql); @@ -94,13 +96,13 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d /** * Insert method rows to DB * - * @param phpbb_db_sql_insert_buffer $insert_buffer + * @param \phpbb\db\sql_insert_buffer $insert_buffer * @param string $item_type * @param int $item_id * @param int $user_id * @param string $methods */ - protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods) + protected function add_method_rows(\phpbb\db\sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods) { $row_base = array( 'item_type' => $item_type, diff --git a/phpBB/phpbb/db/migration/data/310/notifications.php b/phpBB/phpbb/db/migration/data/310/notifications.php index 17c939d95a..f5bd9ebf07 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications.php +++ b/phpBB/phpbb/db/migration/data/310/notifications.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_notifications extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class notifications extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration static public function depends_on() { - return array('phpbb_db_migration_data_310_dev'); + return array('\phpbb\db\migration\data0\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php index 27e63e10d0..fa2da6fe92 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php +++ b/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php @@ -7,11 +7,13 @@ * */ -class phpbb_db_migration_data_310_notifications_schema_fix extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class notifications_schema_fix extends \phpbb\db\migration\migration { static public function depends_on() { - return array('phpbb_db_migration_data_310_notifications'); + return array('\phpbb\db\migration\data0\notifications'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/reported_posts_display.php b/phpBB/phpbb/db/migration/data/310/reported_posts_display.php index 80a0a0e43f..ef35f48970 100644 --- a/phpBB/phpbb/db/migration/data/310/reported_posts_display.php +++ b/phpBB/phpbb/db/migration/data/310/reported_posts_display.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class reported_posts_display extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/310/signature_module_auth.php index e4fbb27bcb..27585fec10 100644 --- a/phpBB/phpbb/db/migration/data/310/signature_module_auth.php +++ b/phpBB/phpbb/db/migration/data/310/signature_module_auth.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class signature_module_auth extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_p1.php b/phpBB/phpbb/db/migration/data/310/softdelete_p1.php index 84f8eebd4a..22ee78bb22 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_p1.php +++ b/phpBB/phpbb/db/migration/data/310/softdelete_p1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class softdelete_p1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration static public function depends_on() { - return array('phpbb_db_migration_data_310_dev'); + return array('\phpbb\db\migration\data0\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/310/softdelete_p2.php index 7320a2c2bf..698e44fab7 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_p2.php +++ b/phpBB/phpbb/db/migration/data/310/softdelete_p2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class softdelete_p2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -17,8 +19,8 @@ class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', - 'phpbb_db_migration_data_310_softdelete_p1', + '\phpbb\db\migration\data0\dev', + '\phpbb\db\migration\data0\softdelete_p1', ); } diff --git a/phpBB/phpbb/db/migration/data/310/style_update_p1.php b/phpBB/phpbb/db/migration/data/310/style_update_p1.php index d43537559d..fe60993f20 100644 --- a/phpBB/phpbb/db/migration/data/310/style_update_p1.php +++ b/phpBB/phpbb/db/migration/data/310/style_update_p1.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class style_update_p1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -59,7 +61,7 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration // Get list of valid 3.1 styles $available_styles = array('prosilver'); - $iterator = new DirectoryIterator($this->phpbb_root_path . 'styles'); + $iterator = new \DirectoryIterator($this->phpbb_root_path . 'styles'); $skip_dirs = array('.', '..', 'prosilver'); foreach ($iterator as $fileinfo) { diff --git a/phpBB/phpbb/db/migration/data/310/style_update_p2.php b/phpBB/phpbb/db/migration/data/310/style_update_p2.php index 7b10518a66..3f6477b7cb 100644 --- a/phpBB/phpbb/db/migration/data/310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/310/style_update_p2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class style_update_p2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration static public function depends_on() { - return array('phpbb_db_migration_data_310_style_update_p1'); + return array('\phpbb\db\migration\data0\style_update_p1'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/teampage.php b/phpBB/phpbb/db/migration/data/310/teampage.php index 4e77da17b7..605156dc41 100644 --- a/phpBB/phpbb/db/migration/data/310/teampage.php +++ b/phpBB/phpbb/db/migration/data/310/teampage.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_teampage extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class teampage extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_teampage extends phpbb_db_migration static public function depends_on() { - return array('phpbb_db_migration_data_310_dev'); + return array('\phpbb\db\migration\data0\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/timezone.php b/phpBB/phpbb/db/migration/data/310/timezone.php index 6e50cbe45f..97fea19a64 100644 --- a/phpBB/phpbb/db/migration/data/310/timezone.php +++ b/phpBB/phpbb/db/migration/data/310/timezone.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_timezone extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class timezone extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -63,12 +65,12 @@ class phpbb_db_migration_data_310_timezone extends phpbb_db_migration } /** - * Determine the new timezone for a given phpBB 3.0 timezone and + * Determine the new \timezone for a given phpBB 3.0 timezone and * "Daylight Saving Time" option * * @param $timezone float Users timezone in 3.0 * @param $dst int Users daylight saving time - * @return string Users new php Timezone which is used since 3.1 + * @return string Users new \php Timezone which is used since 3.1 */ public function convert_phpbb30_timezone($timezone, $dst) { diff --git a/phpBB/phpbb/db/migration/data/310/timezone_p2.php b/phpBB/phpbb/db/migration/data/310/timezone_p2.php index 113b979e4f..0c174b0d56 100644 --- a/phpBB/phpbb/db/migration/data/310/timezone_p2.php +++ b/phpBB/phpbb/db/migration/data/310/timezone_p2.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration +namespace phpbb\db\migration\data0; + +class timezone_p2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -16,7 +18,7 @@ class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration static public function depends_on() { - return array('phpbb_db_migration_data_310_timezone'); + return array('\phpbb\db\migration\data0\timezone'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php index e84330dd71..8bf18dec68 100644 --- a/phpBB/phpbb/db/migration/exception.php +++ b/phpBB/phpbb/db/migration/exception.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\migration; + /** * @ignore */ @@ -16,11 +18,11 @@ if (!defined('IN_PHPBB')) } /** -* The migrator is responsible for applying new migrations in the correct order. +* The migrator is responsible for applying new \migrations in the correct order. * * @package db */ -class phpbb_db_migration_exception extends \Exception +class exception extends \Exception { /** * Extra parameters sent to exception to aid in debugging @@ -64,12 +66,12 @@ class phpbb_db_migration_exception extends \Exception } /** - * Get localised message (with $user->lang()) + * Get localised message (\with $user->lang()) * - * @param phpbb_user $user + * @param \phpbb\user $user * @return string */ - public function getLocalisedMessage(phpbb_user $user) + public function getLocalisedMessage(\phpbb\user $user) { $parameters = $this->getParameters(); array_unshift($parameters, $this->getMessage()); diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php index 0ffa96fd14..aff3837279 100644 --- a/phpBB/phpbb/db/migration/migration.php +++ b/phpBB/phpbb/db/migration/migration.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db\migration; + /** * @ignore */ @@ -24,15 +26,15 @@ if (!defined('IN_PHPBB')) * * @package db */ -abstract class phpbb_db_migration +abstract class migration { - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_db_tools */ + /** @var \phpbb\db\tools */ protected $db_tools; /** @var string */ @@ -53,14 +55,14 @@ abstract class phpbb_db_migration /** * Constructor * - * @param phpbb_config $config - * @param phpbb_db_driver $db - * @param phpbb_db_tools $db_tools + * @param \phpbb\config\config $config + * @param \phpbb\db\driver\driver $db + * @param \phpbb\db\tools $db_tools * @param string $phpbb_root_path * @param string $php_ext * @param string $table_prefix */ - public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix) + public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\db\tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix) { $this->config = $config; $this->db = $db; diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php index 5dd47cfa60..6ff69bbd2b 100644 --- a/phpBB/phpbb/db/migration/tool/config.php +++ b/phpBB/phpbb/db/migration/tool/config.php @@ -7,22 +7,24 @@ * */ +namespace phpbb\db\migration\tool; + /** * Migration config tool * * @package db */ -class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_tool_interface +class config implements \phpbb\db\migration\tool\tool_interface { - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; /** * Constructor * - * @param phpbb_config $config + * @param \phpbb\config\config $config */ - public function __construct(phpbb_config $config) + public function __construct(\phpbb\config\config $config) { $this->config = $config; } @@ -67,7 +69,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_tool_int { if (!isset($this->config[$config_name])) { - throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name); + throw new \phpbb\db\migration\exception('CONFIG_NOT_EXIST', $config_name); } $this->config->set($config_name, $config_value); @@ -78,7 +80,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_tool_int * current config value * * @param string $compare If equal to the current config value, will be - * updated to the new config value, otherwise not + * updated to the new \config value, otherwise not * @param string $config_name The name of the config setting you would * like to update * @param mixed $config_value The value of the config setting @@ -88,7 +90,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_tool_int { if (!isset($this->config[$config_name])) { - throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name); + throw new \phpbb\db\migration\exception('CONFIG_NOT_EXIST', $config_name); } $this->config->set_atomic($config_name, $compare, $config_value); diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index 8ed2a933ff..ecb1176bd4 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -7,20 +7,22 @@ * */ +namespace phpbb\db\migration\tool; + /** * Migration module management tool * * @package db */ -class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_interface +class module implements \phpbb\db\migration\tool\tool_interface { - /** @var phpbb_cache_service */ + /** @var \phpbb\cache\service */ protected $cache; /** @var dbal */ protected $db; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; /** @var string */ @@ -35,14 +37,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int /** * Constructor * - * @param phpbb_db_driver $db + * @param \phpbb\db\driver\driver $db * @param mixed $cache - * @param phpbb_user $user + * @param \phpbb\user $user * @param string $phpbb_root_path * @param string $php_ext * @param string $modules_table */ - public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_user $user, $phpbb_root_path, $php_ext, $modules_table) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\cache\service $cache, \phpbb\user $user, $phpbb_root_path, $php_ext, $modules_table) { $this->db = $db; $this->cache = $cache; @@ -129,11 +131,11 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int /** * Module Add * - * Add a new module + * Add a new \module * * @param string $class The module class(acp|mcp|ucp) * @param int|string $parent The parent module_id|module_langname (0 for no parent) - * @param array $data an array of the data on the new module. + * @param array $data an array of the data on the new \module. * This can be setup in two different ways. * 1. The "manual" way. For inserting a category or one at a time. * It will be merged with the base array shown a bit below, @@ -221,14 +223,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int if (!$module_id) { - throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent); + throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent); } $parent = $data['parent_id'] = $module_id; } else if (!$this->exists($class, false, $parent)) { - throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent); + throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent); } if ($this->exists($class, $parent, $data['module_langname'])) @@ -241,7 +243,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext); $this->user->add_lang('acp/modules'); } - $acp_modules = new acp_modules(); + $acp_modules = new \acp_modules(); $module_data = array( 'module_enabled' => (isset($data['module_enabled'])) ? $data['module_enabled'] : 1, @@ -259,7 +261,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int if (is_string($result)) { // Error - throw new phpbb_db_migration_exception('MODULE_ERROR', $result); + throw new \phpbb\db\migration\exception('MODULE_ERROR', $result); } else { @@ -347,7 +349,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int // Failed. if (!isset($module['module_basename'])) { - throw new phpbb_db_migration_exception('MODULE_NOT_EXIST'); + throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST'); } // Automatic method @@ -433,7 +435,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext); $this->user->add_lang('acp/modules'); } - $acp_modules = new acp_modules(); + $acp_modules = new \acp_modules(); $acp_modules->module_class = $class; foreach ($module_ids as $module_id) @@ -476,7 +478,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int } /** - * Wrapper for acp_modules::get_module_infos() + * Wrapper for \acp_modules::get_module_infos() * * @param string $class Module Class * @param string $basename Module Basename @@ -488,12 +490,12 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_tool_int { include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext); } - $acp_modules = new acp_modules(); + $acp_modules = new \acp_modules(); $module = $acp_modules->get_module_infos($basename, $class, true); if (empty($module)) { - throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename); + throw new \phpbb\db\migration\exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename); } return array_pop($module); diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index f1140d0759..51b0996c30 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -7,17 +7,19 @@ * */ +namespace phpbb\db\migration\tool; + /** * Migration permission management tool * * @package db */ -class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool_interface +class permission implements \phpbb\db\migration\tool\tool_interface { - /** @var phpbb_auth */ + /** @var \phpbb\auth\auth */ protected $auth; - /** @var phpbb_cache_service */ + /** @var \phpbb\cache\service */ protected $cache; /** @var dbal */ @@ -32,13 +34,13 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool /** * Constructor * - * @param phpbb_db_driver $db + * @param \phpbb\db\driver\driver $db * @param mixed $cache - * @param phpbb_auth $auth + * @param \phpbb\auth\auth $auth * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\cache\service $cache, \phpbb\auth\auth $auth, $phpbb_root_path, $php_ext) { $this->db = $db; $this->cache = $cache; @@ -117,7 +119,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool { include($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext); } - $auth_admin = new auth_admin(); + $auth_admin = new \auth_admin(); // We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists. If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here. if ($this->exists($auth_option, !$global)) @@ -236,9 +238,9 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool } /** - * Add a new permission role + * Add a new \permission role * - * @param string $role_name The new role name + * @param string $role_name The new \role name * @param sting $role_type The type (u_, m_, a_) * @return null */ @@ -277,7 +279,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool * Update the name on a permission role * * @param string $old_role_name The old role name - * @param string $new_role_name The new role name + * @param string $new_role_name The new \role name * @return null */ public function role_update($old_role_name, $new_role_name) @@ -290,7 +292,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool if (!$role_id) { - throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $old_role_name); + throw new \phpbb\db\migration\exception('ROLE_NOT_EXIST', $old_role_name); } $sql = 'UPDATE ' . ACL_ROLES_TABLE . " @@ -380,7 +382,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool if (!$role_id) { - throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name); + throw new \phpbb\db\migration\exception('ROLE_NOT_EXIST', $name); } $sql = 'SELECT auth_option_id, auth_setting @@ -403,7 +405,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool if (!$group_id) { - throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name); + throw new \phpbb\db\migration\exception('GROUP_NOT_EXIST', $name); } // If the group has a role set for them we will add the requested permissions to that role. @@ -523,7 +525,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool if (!$role_id) { - throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name); + throw new \phpbb\db\migration\exception('ROLE_NOT_EXIST', $name); } $sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' @@ -540,7 +542,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_tool if (!$group_id) { - throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name); + throw new \phpbb\db\migration\exception('GROUP_NOT_EXIST', $name); } // If the group has a role set for them we will remove the requested permissions from that role. diff --git a/phpBB/phpbb/db/migration/tool/tool_interface.php b/phpBB/phpbb/db/migration/tool/tool_interface.php index 72344d50d2..e7b89d8858 100644 --- a/phpBB/phpbb/db/migration/tool/tool_interface.php +++ b/phpBB/phpbb/db/migration/tool/tool_interface.php @@ -7,12 +7,14 @@ * */ +namespace phpbb\db\migration\tool; + /** * Migration tool interface * * @package db */ -interface phpbb_db_migration_tool_tool_interface +interface tool_interface { /** * Retrieve a short name used for commands in migrations. diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index ca3ffc8043..0b9463a622 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db; + /** * @ignore */ @@ -16,19 +18,19 @@ if (!defined('IN_PHPBB')) } /** -* The migrator is responsible for applying new migrations in the correct order. +* The migrator is responsible for applying new \migrations in the correct order. * * @package db */ -class phpbb_db_migrator +class migrator { - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_db_tools */ + /** @var \phpbb\db\tools */ protected $db_tools; /** @var string */ @@ -71,7 +73,7 @@ class phpbb_db_migrator /** * Constructor of the database migrator */ - public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools) + public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\db\tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools) { $this->config = $config; $this->db = $db; @@ -240,7 +242,7 @@ class phpbb_db_migrator $state['migration_data_done'] = ($result === true); $state['migration_end_time'] = ($result === true) ? time() : 0; } - catch (phpbb_db_migration_exception $e) + catch (\phpbb\db\migration\exception $e) { // Revert the schema changes $this->revert($name); @@ -398,7 +400,7 @@ class phpbb_db_migrator )); } } - catch (phpbb_db_migration_exception $e) + catch (\phpbb\db\migration\exception $e) { // We should try rolling back here foreach ($steps as $reverse_step_identifier => $reverse_step) @@ -474,12 +476,12 @@ class phpbb_db_migrator case 'if': if (!isset($parameters[0])) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_CONDITION', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_MISSING_CONDITION', $step); } if (!isset($parameters[1])) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_STEP', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_MISSING_STEP', $step); } $condition = $parameters[0]; @@ -496,7 +498,7 @@ class phpbb_db_migrator case 'custom': if (!is_callable($parameters[0])) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step); } return array( @@ -508,17 +510,17 @@ class phpbb_db_migrator default: if (!$method) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNKNOWN_TYPE', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_UNKNOWN_TYPE', $step); } if (!isset($this->tools[$class])) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_TOOL', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_UNDEFINED_TOOL', $step); } if (!method_exists(get_class($this->tools[$class]), $method)) { - throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_METHOD', $step); + throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_UNDEFINED_METHOD', $step); } // Attempt to reverse operations @@ -656,7 +658,7 @@ class phpbb_db_migrator * Helper to get a migration * * @param string $name Name of the migration - * @return phpbb_db_migration + * @return \phpbb\db\migration\migration */ protected function get_migration($name) { @@ -694,7 +696,7 @@ class phpbb_db_migrator /** * Load migration data files from a directory * - * @param phpbb_extension_finder $finder + * @param \phpbb\extension\finder $finder * @param string $path Path to migration data files * @param bool $check_fulfillable If TRUE (default), we will check * if all of the migrations are fulfillable after loading them. @@ -703,11 +705,11 @@ class phpbb_db_migrator * with the last call to prevent throwing errors unnecessarily). * @return array Array of migration names */ - public function load_migrations(phpbb_extension_finder $finder, $path, $check_fulfillable = true) + public function load_migrations(\phpbb\extension\finder $finder, $path, $check_fulfillable = true) { if (!is_dir($path)) { - throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path); + throw new \phpbb\db\migration\exception('DIRECTORY INVALID', $path); } $migrations = array(); @@ -736,7 +738,7 @@ class phpbb_db_migrator $unfulfillable = $this->unfulfillable($name); if ($unfulfillable !== false) { - throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable); + throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable); } } } diff --git a/phpBB/phpbb/db/sql_insert_buffer.php b/phpBB/phpbb/db/sql_insert_buffer.php index c18f908429..7bbd213bdc 100644 --- a/phpBB/phpbb/db/sql_insert_buffer.php +++ b/phpBB/phpbb/db/sql_insert_buffer.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db; + /** * @ignore */ @@ -38,7 +40,7 @@ if (!defined('IN_PHPBB')) * * Usage: * -* $buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234); +* $buffer = new \phpbb\db\sql_insert_buffer($db, 'test_table', 1234); * * while (do_stuff()) * { @@ -53,9 +55,9 @@ if (!defined('IN_PHPBB')) * * @package dbal */ -class phpbb_db_sql_insert_buffer +class sql_insert_buffer { - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; /** @var string */ @@ -68,11 +70,11 @@ class phpbb_db_sql_insert_buffer protected $buffer = array(); /** - * @param phpbb_db_driver $db + * @param \phpbb\db\driver\driver $db * @param string $table_name * @param int $max_buffered_rows */ - public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500) + public function __construct(\phpbb\db\driver\driver $db, $table_name, $max_buffered_rows = 500) { $this->db = $db; $this->table_name = $table_name; diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 492284ffcd..35b89e8166 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\db; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package dbal */ -class phpbb_db_tools +class tools { /** * Current sql layer @@ -300,10 +302,10 @@ class phpbb_db_tools /** * Constructor. Set DB Object and set {@link $return_statements return_statements}. * - * @param phpbb_db_driver $db Database connection + * @param \phpbb\db\driver\driver $db Database connection * @param bool $return_statements True if only statements should be returned and no SQL being executed */ - public function __construct(phpbb_db_driver $db, $return_statements = false) + public function __construct(\phpbb\db\driver\driver $db, $return_statements = false) { $this->db = $db; $this->return_statements = $return_statements; @@ -491,7 +493,7 @@ class phpbb_db_tools trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR); } - // here we add the definition of the new column to the list of columns + // here we add the definition of the new \column to the list of columns switch ($this->sql_layer) { case 'mssql': @@ -978,7 +980,7 @@ class phpbb_db_tools $column_list[] = $entities[0]; } - // note down the primary key notation because sqlite only supports adding it to the end for the new table + // note down the primary key notation because sqlite only supports adding it to the end for the new \table $primary_key = false; $_new_cols = array(); @@ -1058,7 +1060,7 @@ class phpbb_db_tools { $new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')'; } - // Add a new one or the old primary key + // Add a new \one or the old primary key else if ($primary_key !== false) { $new_table_cols[] = $primary_key; @@ -1066,7 +1068,7 @@ class phpbb_db_tools $columns = implode(',', $column_list); - // create a new table and fill it up. destroy the temp one + // create a new \table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1689,7 +1691,7 @@ class phpbb_db_tools } /** - * Add new column + * Add new \column */ function sql_column_add($table_name, $column_name, $column_data, $inline = false) { @@ -1798,7 +1800,7 @@ class phpbb_db_tools $new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols; - // create a new table and fill it up. destroy the temp one + // create a new \table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1913,7 +1915,7 @@ class phpbb_db_tools $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); - // create a new table and fill it up. destroy the temp one + // create a new \table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2105,7 +2107,7 @@ class phpbb_db_tools $columns = implode(',', $column_list); - // create a new table and fill it up. destroy the temp one + // create a new \table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2471,7 +2473,7 @@ class phpbb_db_tools $columns = implode(',', $column_list); - // create a new table and fill it up. destroy the temp one + // create a new \table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 6c272a6588..62757c5b7d 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di\extension; + /** * @ignore */ @@ -23,7 +25,7 @@ use Symfony\Component\Config\FileLocator; /** * Container config extension */ -class phpbb_di_extension_config extends Extension +class config extends Extension { public function __construct($config_file) { diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 9c36ba2fc4..901addc694 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di\extension; + /** * @ignore */ @@ -23,7 +25,7 @@ use Symfony\Component\Config\FileLocator; /** * Container core extension */ -class phpbb_di_extension_core extends Extension +class core extends Extension { /** * phpBB Root path diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php index 7d9b433751..cf623a7c87 100644 --- a/phpBB/phpbb/di/extension/ext.php +++ b/phpBB/phpbb/di/extension/ext.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di\extension; + /** * @ignore */ @@ -23,7 +25,7 @@ use Symfony\Component\Config\FileLocator; /** * Container ext extension */ -class phpbb_di_extension_ext extends Extension +class ext extends Extension { protected $paths = array(); diff --git a/phpBB/phpbb/di/pass/collection_pass.php b/phpBB/phpbb/di/pass/collection_pass.php index 63a5c7dfc4..ffc5a41f6d 100644 --- a/phpBB/phpbb/di/pass/collection_pass.php +++ b/phpBB/phpbb/di/pass/collection_pass.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di\pass; + /** * @ignore */ @@ -23,7 +25,7 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; * the services tagged with the appropriate name defined in the collection's * service_collection tag. */ -class phpbb_di_pass_collection_pass implements CompilerPassInterface +class collection_pass implements CompilerPassInterface { /** * Modify the container before it is passed to the rest of the code diff --git a/phpBB/phpbb/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php index a701ebcfa6..6a9124ad78 100644 --- a/phpBB/phpbb/di/pass/kernel_pass.php +++ b/phpBB/phpbb/di/pass/kernel_pass.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di\pass; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; -class phpbb_di_pass_kernel_pass implements CompilerPassInterface +class kernel_pass implements CompilerPassInterface { /** * Modify the container before it is passed to the rest of the code @@ -38,12 +40,12 @@ class phpbb_di_pass_kernel_pass implements CompilerPassInterface if (!isset($event['event'])) { - throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id)); + throw new \InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id)); } if (!isset($event['method'])) { - throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id)); + throw new \InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id)); } $definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority)); @@ -55,11 +57,11 @@ class phpbb_di_pass_kernel_pass implements CompilerPassInterface // We must assume that the class value has been correctly filled, even if the service is created by a factory $class = $container->getDefinition($id)->getClass(); - $refClass = new ReflectionClass($class); + $refClass = new \ReflectionClass($class); $interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface'; if (!$refClass->implementsInterface($interface)) { - throw new InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface)); + throw new \InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface)); } $definition->addMethodCall('addSubscriberService', array($id, $class)); diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php index 880cb46d4d..fccdd77071 100644 --- a/phpBB/phpbb/di/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\di; + /** * @ignore */ @@ -22,7 +24,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @package phpBB3 */ -class phpbb_di_service_collection extends ArrayObject +class service_collection extends \ArrayObject { /** * Constructor diff --git a/phpBB/phpbb/error_collector.php b/phpBB/phpbb/error_collector.php index 0a6462d046..9b3216e32f 100644 --- a/phpBB/phpbb/error_collector.php +++ b/phpBB/phpbb/error_collector.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_error_collector +class error_collector { var $errors; diff --git a/phpBB/phpbb/event/data.php b/phpBB/phpbb/event/data.php index 70718ff0ae..3481023b74 100644 --- a/phpBB/phpbb/event/data.php +++ b/phpBB/phpbb/event/data.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -17,7 +19,7 @@ if (!defined('IN_PHPBB')) use Symfony\Component\EventDispatcher\Event; -class phpbb_event_data extends Event implements ArrayAccess +class data extends Event implements \ArrayAccess { private $data; diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php index 4f637ce3bb..cc3733692e 100644 --- a/phpBB/phpbb/event/dispatcher.php +++ b/phpBB/phpbb/event/dispatcher.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -31,11 +33,11 @@ use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher; * extract($phpbb_dispatcher->trigger_event('core.index', compact($vars))); * */ -class phpbb_event_dispatcher extends ContainerAwareEventDispatcher +class dispatcher extends ContainerAwareEventDispatcher { public function trigger_event($eventName, $data = array()) { - $event = new phpbb_event_data($data); + $event = new \phpbb\event\data($data); $this->dispatch($eventName, $event); return $event->get_data_filtered(array_keys($data)); } diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php index d933b943d7..6bc23be176 100644 --- a/phpBB/phpbb/event/extension_subscriber_loader.php +++ b/phpBB/phpbb/event/extension_subscriber_loader.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -17,12 +19,12 @@ if (!defined('IN_PHPBB')) use Symfony\Component\EventDispatcher\EventDispatcherInterface; -class phpbb_event_extension_subscriber_loader +class extension_subscriber_loader { private $dispatcher; private $extension_manager; - public function __construct(EventDispatcherInterface $dispatcher, phpbb_extension_manager $extension_manager) + public function __construct(EventDispatcherInterface $dispatcher, \phpbb\extension\manager $extension_manager) { $this->dispatcher = $dispatcher; $this->extension_manager = $extension_manager; diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index f90989a74c..7199f47ae8 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -21,27 +23,27 @@ use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpFoundation\Response; -class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterface +class kernel_exception_subscriber implements EventSubscriberInterface { /** * Template object - * @var phpbb_template + * @var \phpbb\template\template */ protected $template; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Construct method * - * @param phpbb_template $template Template object - * @param phpbb_user $user User object + * @param \phpbb\template\template $template Template object + * @param \phpbb\user $user User object */ - public function __construct(phpbb_template $template, phpbb_user $user) + public function __construct(\phpbb\template\template $template, \phpbb\user $user) { $this->template = $template; $this->user = $user; @@ -53,7 +55,7 @@ class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterfac * @param GetResponseForExceptionEvent $event * @return null */ - public function on_kernel_exception(GetResponseForExceptionEvent $event) + public function on_kernel_exception(\GetResponseForExceptionEvent $event) { page_header($this->user->lang('INFORMATION')); @@ -72,7 +74,7 @@ class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterfac $status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500; - $response = new Response($this->template->assign_display('body'), $status_code); + $response = new \Response($this->template->assign_display('body'), $status_code); $event->setResponse($response); } diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php index afb8464f80..9691be7ca5 100644 --- a/phpBB/phpbb/event/kernel_request_subscriber.php +++ b/phpBB/phpbb/event/kernel_request_subscriber.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -21,11 +23,11 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\EventListener\RouterListener; use Symfony\Component\Routing\RequestContext; -class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface +class kernel_request_subscriber implements EventSubscriberInterface { /** * Extension finder object - * @var phpbb_extension_finder + * @var \phpbb\extension\finder */ protected $finder; @@ -44,11 +46,11 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface /** * Construct method * - * @param phpbb_extension_finder $finder Extension finder object + * @param \phpbb\extension\finder $finder Extension finder object * @param string $root_path Root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_extension_finder $finder, $root_path, $php_ext) + public function __construct(\phpbb\extension\finder $finder, $root_path, $php_ext) { $this->finder = $finder; $this->root_path = $root_path; @@ -63,14 +65,14 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface * @param GetResponseEvent $event * @return null */ - public function on_kernel_request(GetResponseEvent $event) + public function on_kernel_request(\GetResponseEvent $event) { $request = $event->getRequest(); - $context = new RequestContext(); + $context = new \RequestContext(); $context->fromRequest($request); $matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext); - $router_listener = new RouterListener($matcher, $context); + $router_listener = new \RouterListener($matcher, $context); $router_listener->onKernelRequest($event); } diff --git a/phpBB/phpbb/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php index 1eaf890e42..aea9d7cc44 100644 --- a/phpBB/phpbb/event/kernel_terminate_subscriber.php +++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\event; + /** * @ignore */ @@ -19,7 +21,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\PostResponseEvent; -class phpbb_event_kernel_terminate_subscriber implements EventSubscriberInterface +class kernel_terminate_subscriber implements EventSubscriberInterface { /** * This listener is run when the KernelEvents::TERMINATE event is triggered @@ -29,7 +31,7 @@ class phpbb_event_kernel_terminate_subscriber implements EventSubscriberInterfac * @param PostResponseEvent $event * @return null */ - public function on_kernel_terminate(PostResponseEvent $event) + public function on_kernel_terminate(\PostResponseEvent $event) { exit_handler(); } diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index de18998106..a529cc7961 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -22,15 +24,15 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @package extension */ -class phpbb_extension_base implements phpbb_extension_extension_interface +class base implements \phpbb\extension\extension_interface { /** @var ContainerInterface */ protected $container; - /** @var phpbb_extension_finder */ + /** @var \phpbb\extension\finder */ protected $finder; - /** @var phpbb_db_migrator */ + /** @var \phpbb\db\migrator */ protected $migrator; /** @var string */ @@ -43,11 +45,11 @@ class phpbb_extension_base implements phpbb_extension_extension_interface * Constructor * * @param ContainerInterface $container Container object - * @param phpbb_extension_finder $extension_finder + * @param \phpbb\extension\finder $extension_finder * @param string $extension_name Name of this extension (from ext.manager) * @param string $extension_path Relative path to this extension */ - public function __construct(ContainerInterface $container, phpbb_extension_finder $extension_finder, phpbb_db_migrator $migrator, $extension_name, $extension_path) + public function __construct(ContainerInterface $container, \phpbb\extension\finder $extension_finder, \phpbb\db\migrator $migrator, $extension_name, $extension_path) { $this->container = $container; $this->extension_finder = $extension_finder; diff --git a/phpBB/phpbb/extension/exception.php b/phpBB/phpbb/extension/exception.php index e08a8912ea..e2ba647878 100644 --- a/phpBB/phpbb/extension/exception.php +++ b/phpBB/phpbb/extension/exception.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * Exception class for metadata */ -class phpbb_extension_exception extends UnexpectedValueException +class exception extends \UnexpectedValueException { public function __toString() { diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php index b922499738..1e5f546dc5 100644 --- a/phpBB/phpbb/extension/extension_interface.php +++ b/phpBB/phpbb/extension/extension_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package extension */ -interface phpbb_extension_extension_interface +interface extension_interface { /** * enable_step is executed on enabling an extension until it returns false. diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index 1569c90eb8..0ecae7a13f 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package extension */ -class phpbb_extension_finder +class finder { protected $extension_manager; protected $filesystem; @@ -50,19 +52,19 @@ class phpbb_extension_finder protected $cached_queries; /** - * Creates a new finder instance with its dependencies + * Creates a new \finder instance with its dependencies * - * @param phpbb_extension_manager $extension_manager An extension manager + * @param \phpbb\extension\manager $extension_manager An extension manager * instance that provides the finder with a list of active * extensions and their locations - * @param phpbb_filesystem $filesystem Filesystem instance + * @param \phpbb\filesystem $filesystem Filesystem instance * @param string $phpbb_root_path Path to the phpbb root directory - * @param phpbb_cache_driver_driver_interface $cache A cache instance or null + * @param \phpbb\cache\driver\driver_interface $cache A cache instance or null * @param string $php_ext php file extension * @param string $cache_name The name of the cache variable, defaults to * _ext_finder */ - public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder') + public function __construct(\phpbb\extension\manager $extension_manager, \phpbb\filesystem $filesystem, $phpbb_root_path = '', \phpbb\cache\driver\driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder') { $this->extension_manager = $extension_manager; $this->filesystem = $filesystem; @@ -88,7 +90,7 @@ class phpbb_extension_finder * Sets a core path to be searched in addition to extensions * * @param string $core_path The path relative to phpbb_root_path - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function core_path($core_path) { @@ -104,7 +106,7 @@ class phpbb_extension_finder * file extension is automatically added to suffixes. * * @param string $suffix A filename suffix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function suffix($suffix) { @@ -121,7 +123,7 @@ class phpbb_extension_finder * file extension is automatically added to suffixes. * * @param string $extension_suffix A filename suffix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function extension_suffix($extension_suffix) { @@ -137,7 +139,7 @@ class phpbb_extension_finder * file extension is automatically added to suffixes. * * @param string $core_suffix A filename suffix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function core_suffix($core_suffix) { @@ -149,7 +151,7 @@ class phpbb_extension_finder * Sets the prefix all files found in extensions and core must match * * @param string $prefix A filename prefix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function prefix($prefix) { @@ -162,7 +164,7 @@ class phpbb_extension_finder * Sets a prefix all files found in extensions must match * * @param string $extension_prefix A filename prefix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function extension_prefix($extension_prefix) { @@ -174,7 +176,7 @@ class phpbb_extension_finder * Sets a prefix all files found in the core path must match * * @param string $core_prefix A filename prefix - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function core_prefix($core_prefix) { @@ -189,7 +191,7 @@ class phpbb_extension_finder * the current directory. * * @param string $directory - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function directory($directory) { @@ -202,7 +204,7 @@ class phpbb_extension_finder * Sets a directory all files found in extensions must be contained in * * @param string $extension_directory - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function extension_directory($extension_directory) { @@ -214,7 +216,7 @@ class phpbb_extension_finder * Sets a directory all files found in the core path must be contained in * * @param string $core_directory - * @return phpbb_extension_finder This object for chaining calls + * @return \phpbb\extension\finder This object for chaining calls */ public function core_directory($core_directory) { @@ -473,7 +475,7 @@ class phpbb_extension_finder } $directory_pattern = '#' . $directory_pattern . '#'; - $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST); + $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path), \RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $file_info) { $filename = $file_info->getFilename(); diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index f9f722f773..d174146f52 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -22,7 +24,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @package extension */ -class phpbb_extension_manager +class manager { /** @var ContainerInterface */ protected $container; @@ -40,16 +42,16 @@ class phpbb_extension_manager * Creates a manager and loads information from database * * @param ContainerInterface $container A container - * @param phpbb_db_driver $db A database connection - * @param phpbb_config $config phpbb_config - * @param phpbb_filesystem $filesystem + * @param \phpbb\db\driver\driver $db A database connection + * @param \phpbb\config\config $config \phpbb\config\config + * @param \phpbb\filesystem $filesystem * @param string $extension_table The name of the table holding extensions * @param string $phpbb_root_path Path to the phpbb includes directory. * @param string $php_ext php file extension - * @param phpbb_cache_driver_driver_interface $cache A cache instance or null + * @param \phpbb\cache\driver\driver_interface $cache A cache instance or null * @param string $cache_name The name of the cache variable, defaults to _ext */ - public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_driver_interface $cache = null, $cache_name = '_ext') + public function __construct(ContainerInterface $container, \phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext') { $this->container = $container; $this->phpbb_root_path = $phpbb_root_path; @@ -126,8 +128,8 @@ class phpbb_extension_manager * Instantiates the extension meta class for the extension with the given name * * @param string $name The extension name - * @return phpbb_extension_extension_interface Instance of the extension meta class or - * phpbb_extension_base if the class does not exist + * @return \phpbb\extension\extension_interface Instance of the extension meta class or + * \phpbb\extension\base if the class does not exist */ public function get_extension($name) { @@ -141,7 +143,7 @@ class phpbb_extension_manager } else { - return new phpbb_extension_base($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true)); + return new \phpbb\extension\base($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true)); } } @@ -150,11 +152,11 @@ class phpbb_extension_manager * * @param string $name The extension name * @param string $template The template manager - * @return phpbb_extension_metadata_manager Instance of the metadata manager + * @return \phpbb\extension\metadata_manager Instance of the metadata manager */ - public function create_extension_metadata_manager($name, phpbb_template $template) + public function create_extension_metadata_manager($name, \phpbb\template\template $template) { - return new phpbb_extension_metadata_manager($name, $this->config, $this, $template, $this->phpbb_root_path); + return new \phpbb\extension\metadata_manager($name, $this->config, $this, $template, $this->phpbb_root_path); } /** @@ -403,9 +405,9 @@ class phpbb_extension_manager return $available; } - $iterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', FilesystemIterator::NEW_CURRENT_AND_KEY | FilesystemIterator::FOLLOW_SYMLINKS), - RecursiveIteratorIterator::SELF_FIRST); + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', \FilesystemIterator::NEW_CURRENT_AND_KEY | \FilesystemIterator::FOLLOW_SYMLINKS), + \RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $file_info) { if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext) @@ -502,12 +504,12 @@ class phpbb_extension_manager } /** - * Instantiates a phpbb_extension_finder. + * Instantiates a \phpbb\extension\finder. * - * @return phpbb_extension_finder An extension finder instance + * @return \phpbb\extension\finder An extension finder instance */ public function get_finder() { - return new phpbb_extension_finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); + return new \phpbb\extension\finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); } } diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 14b77c085b..a77f3a2c6e 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -20,23 +22,23 @@ if (!defined('IN_PHPBB')) * * @package extension */ -class phpbb_extension_metadata_manager +class metadata_manager { /** * phpBB Config instance - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * phpBB Extension Manager - * @var phpbb_extension_manager + * @var \phpbb\extension\manager */ protected $extension_manager; /** * phpBB Template instance - * @var phpbb_template + * @var \phpbb\template\template */ protected $template; @@ -68,12 +70,12 @@ class phpbb_extension_metadata_manager * Creates the metadata manager * * @param string $ext_name Name (including vendor) of the extension - * @param phpbb_config $config phpBB Config instance - * @param phpbb_extension_manager $extension_manager An instance of the phpBBb extension manager - * @param phpbb_template $template phpBB Template instance + * @param \phpbb\config\config $config phpBB Config instance + * @param \phpbb\extension\manager $extension_manager An instance of the phpBBb extension manager + * @param \phpbb\template\template $template phpBB Template instance * @param string $phpbb_root_path Path to the phpbb includes directory. */ - public function __construct($ext_name, phpbb_config $config, phpbb_extension_manager $extension_manager, phpbb_template $template, $phpbb_root_path) + public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, $phpbb_root_path) { $this->config = $config; $this->extension_manager = $extension_manager; @@ -145,7 +147,7 @@ class phpbb_extension_metadata_manager if (!file_exists($this->metadata_file)) { - throw new phpbb_extension_exception('The required file does not exist: ' . $this->metadata_file); + throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file); } } @@ -158,18 +160,18 @@ class phpbb_extension_metadata_manager { if (!file_exists($this->metadata_file)) { - throw new phpbb_extension_exception('The required file does not exist: ' . $this->metadata_file); + throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file); } else { if (!($file_contents = file_get_contents($this->metadata_file))) { - throw new phpbb_extension_exception('file_get_contents failed on ' . $this->metadata_file); + throw new \phpbb\extension\exception('file_get_contents failed on ' . $this->metadata_file); } if (($metadata = json_decode($file_contents, true)) === NULL) { - throw new phpbb_extension_exception('json_decode failed on ' . $this->metadata_file); + throw new \phpbb\extension\exception('json_decode failed on ' . $this->metadata_file); } $this->metadata = $metadata; @@ -228,12 +230,12 @@ class phpbb_extension_metadata_manager { if (!isset($this->metadata[$name])) { - throw new phpbb_extension_exception("Required meta field '$name' has not been set."); + throw new \phpbb\extension\exception("Required meta field '$name' has not been set."); } if (!preg_match($fields[$name], $this->metadata[$name])) { - throw new phpbb_extension_exception("Meta field '$name' is invalid."); + throw new \phpbb\extension\exception("Meta field '$name' is invalid."); } } break; @@ -251,14 +253,14 @@ class phpbb_extension_metadata_manager { if (empty($this->metadata['authors'])) { - throw new phpbb_extension_exception("Required meta field 'authors' has not been set."); + throw new \phpbb\extension\exception("Required meta field 'authors' has not been set."); } foreach ($this->metadata['authors'] as $author) { if (!isset($author['name'])) { - throw new phpbb_extension_exception("Required meta field 'author name' has not been set."); + throw new \phpbb\extension\exception("Required meta field 'author name' has not been set."); } } diff --git a/phpBB/phpbb/extension/provider.php b/phpBB/phpbb/extension/provider.php index 45b55e5cab..c2a264d311 100644 --- a/phpBB/phpbb/extension/provider.php +++ b/phpBB/phpbb/extension/provider.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\extension; + /** * @ignore */ @@ -28,7 +30,7 @@ if (!defined('IN_PHPBB')) * * @package extension */ -abstract class phpbb_extension_provider implements IteratorAggregate +abstract class provider implements \IteratorAggregate { /** * Array holding all found items @@ -38,16 +40,16 @@ abstract class phpbb_extension_provider implements IteratorAggregate /** * An extension manager to search for items in extensions - * @var phpbb_extension_manager + * @var \phpbb\extension\manager */ protected $extension_manager; /** * Constructor. Loads all available items. * - * @param phpbb_extension_manager $extension_manager phpBB extension manager + * @param \phpbb\extension\manager $extension_manager phpBB extension manager */ - public function __construct(phpbb_extension_manager $extension_manager) + public function __construct(\phpbb\extension\manager $extension_manager) { $this->extension_manager = $extension_manager; } @@ -71,6 +73,6 @@ abstract class phpbb_extension_provider implements IteratorAggregate $this->items = $this->find(); } - return new ArrayIterator($this->items); + return new \ArrayIterator($this->items); } } diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php index 9a38e604a3..de7dd41df4 100644 --- a/phpBB/phpbb/feed/base.php +++ b/phpBB/phpbb/feed/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -20,27 +22,27 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -abstract class phpbb_feed_base +abstract class base { /** * Feed helper object - * @var phpbb_feed_helper + * @var \phpbb\feed\helper */ protected $helper; - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_cache_driver_driver_interface */ + /** @var \phpbb\cache\driver\driver_interface */ protected $cache; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; - /** @var phpbb_auth */ + /** @var \phpbb\auth\auth */ protected $auth; /** @var string */ @@ -74,17 +76,17 @@ abstract class phpbb_feed_base /** * Constructor * - * @param phpbb_feed_helper $helper Feed helper - * @param phpbb_config $config Config object - * @param phpbb_db_driver $db Database connection - * @param phpbb_cache_driver_driver_interface $cache Cache object - * @param phpbb_user $user User object - * @param phpbb_auth $auth Auth object - * @param phpbb_content_visibility $content_visibility Auth object + * @param \phpbb\feed\helper $helper Feed helper + * @param \phpbb\config\config $config Config object + * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\cache\driver\driver_interface $cache Cache object + * @param \phpbb\user $user User object + * @param \phpbb\auth\auth $auth Auth object + * @param \phpbb\content_visibility $content_visibility Auth object * @param string $phpEx php file extension * @return null */ - function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx) + function __construct(\phpbb\feed\helper $helper, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, $phpEx) { $this->config = $config; $this->helper = $helper; diff --git a/phpBB/phpbb/feed/factory.php b/phpBB/phpbb/feed/factory.php index 63a1eb8ef0..e011b0e3a9 100644 --- a/phpBB/phpbb/feed/factory.php +++ b/phpBB/phpbb/feed/factory.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Factory class to return correct object * @package phpBB3 */ -class phpbb_feed_factory +class factory { /** * Service container object @@ -27,21 +29,21 @@ class phpbb_feed_factory */ protected $container; - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; /** * Constructor * * @param objec $container Container object - * @param phpbb_config $config Config object - * @param phpbb_db_driver $db Database connection + * @param \phpbb\config\config $config Config object + * @param \phpbb\db\driver\driver $db Database connection * @return null */ - public function __construct($container, phpbb_config $config, phpbb_db_driver $db) + public function __construct($container, \phpbb\config\config $config, \phpbb\db\driver\driver $db) { $this->container = $container; $this->config = $config; diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index b5f0dd0f8f..5f64d85625 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_forum extends phpbb_feed_post_base +class forum extends \phpbb\feed\post_base { var $forum_id = 0; var $forum_data = array(); @@ -32,7 +34,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base * Set the Forum ID * * @param int $forum_id Forum ID - * @return phpbb_feed_forum + * @return \phpbb\feed\forum */ public function set_forum_id($topic_id) { diff --git a/phpBB/phpbb/feed/forums.php b/phpBB/phpbb/feed/forums.php index 409097a9f3..6be1c68da8 100644 --- a/phpBB/phpbb/feed/forums.php +++ b/phpBB/phpbb/feed/forums.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_forums extends phpbb_feed_base +class forums extends \phpbb\feed\base { var $num_items = 0; diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index 93330aa2ad..cf8328bd5e 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -19,12 +21,12 @@ if (!defined('IN_PHPBB')) * Class with some helpful functions used in feeds * @package phpBB3 */ -class phpbb_feed_helper +class helper { - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; /** @var string */ @@ -33,12 +35,12 @@ class phpbb_feed_helper /** * Constructor * - * @param phpbb_config $config Config object - * @param phpbb_user $user User object + * @param \phpbb\config\config $config Config object + * @param \phpbb\user $user User object * @param string $phpbb_root_path Root path * @return null */ - public function __construct(phpbb_config $config, phpbb_user $user, $phpbb_root_path) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, $phpbb_root_path) { $this->config = $config; $this->user = $user; diff --git a/phpBB/phpbb/feed/news.php b/phpBB/phpbb/feed/news.php index f2d45b5165..20017a3248 100644 --- a/phpBB/phpbb/feed/news.php +++ b/phpBB/phpbb/feed/news.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_news extends phpbb_feed_topic_base +class news extends \phpbb\feed\topic_base { function get_news_forums() { diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php index 869df7cde0..7a0973a027 100644 --- a/phpBB/phpbb/feed/overall.php +++ b/phpBB/phpbb/feed/overall.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_overall extends phpbb_feed_post_base +class overall extends \phpbb\feed\post_base { function get_sql() { diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php index 1f4cb4b5ef..5588ecadb0 100644 --- a/phpBB/phpbb/feed/post_base.php +++ b/phpBB/phpbb/feed/post_base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -abstract class phpbb_feed_post_base extends phpbb_feed_base +abstract class post_base extends \phpbb\feed\base { var $num_items = 'feed_limit_post'; diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 36f958ac60..b5714e434b 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_topic extends phpbb_feed_post_base +class topic extends \phpbb\feed\post_base { var $topic_id = 0; var $forum_id = 0; @@ -32,7 +34,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base * Set the Topic ID * * @param int $topic_id Topic ID - * @return phpbb_feed_topic + * @return \phpbb\feed\topic */ public function set_topic_id($topic_id) { diff --git a/phpBB/phpbb/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php index b104a46631..f05be9223e 100644 --- a/phpBB/phpbb/feed/topic_base.php +++ b/phpBB/phpbb/feed/topic_base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -abstract class phpbb_feed_topic_base extends phpbb_feed_base +abstract class topic_base extends \phpbb\feed\base { var $num_items = 'feed_limit_topic'; diff --git a/phpBB/phpbb/feed/topics.php b/phpBB/phpbb/feed/topics.php index 31f5177773..d70195c87b 100644 --- a/phpBB/phpbb/feed/topics.php +++ b/phpBB/phpbb/feed/topics.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_topics extends phpbb_feed_topic_base +class topics extends \phpbb\feed\topic_base { function get_sql() { diff --git a/phpBB/phpbb/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php index 249dd1d66a..c6f46d67e6 100644 --- a/phpBB/phpbb/feed/topics_active.php +++ b/phpBB/phpbb/feed/topics_active.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\feed; + /** * @ignore */ @@ -24,7 +26,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_feed_topics_active extends phpbb_feed_topic_base +class topics_active extends \phpbb\feed\topic_base { var $sort_days = 7; diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php index 27cab48fb0..827e9fb139 100644 --- a/phpBB/phpbb/filesystem.php +++ b/phpBB/phpbb/filesystem.php @@ -6,6 +6,8 @@ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ + +namespace phpbb; /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) * A class with various functions that are related to paths, files and the filesystem * @package phpBB3 */ -class phpbb_filesystem +class filesystem { /** * Eliminates useless . and .. components from specified path. diff --git a/phpBB/phpbb/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php index e4ff09c703..3a8d92dbc7 100644 --- a/phpBB/phpbb/groupposition/exception.php +++ b/phpBB/phpbb/groupposition/exception.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\groupposition; + /** * @ignore */ @@ -18,6 +20,6 @@ if (!defined('IN_PHPBB')) /** * @package groupposition */ -class phpbb_groupposition_exception extends \Exception +class exception extends \Exception { } diff --git a/phpBB/phpbb/groupposition/groupposition_interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php index 0f29984588..a568785185 100644 --- a/phpBB/phpbb/groupposition/groupposition_interface.php +++ b/phpBB/phpbb/groupposition/groupposition_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\groupposition; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_groupposition_groupposition_interface +interface groupposition_interface { /** * Returns the value for a given group, if the group exists. diff --git a/phpBB/phpbb/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php index 5cbc26f528..9a1ef3d1d0 100644 --- a/phpBB/phpbb/groupposition/legend.php +++ b/phpBB/phpbb/groupposition/legend.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\groupposition; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_groupposition_legend implements phpbb_groupposition_groupposition_interface +class legend implements \phpbb\groupposition\groupposition_interface { /** * Group is not displayed @@ -32,23 +34,23 @@ class phpbb_groupposition_legend implements phpbb_groupposition_groupposition_in /** * Database object - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Constructor * - * @param phpbb_db_driver $db Database object - * @param phpbb_user $user User object + * @param \phpbb\db\driver\driver $db Database object + * @param \phpbb\user $user User object */ - public function __construct(phpbb_db_driver $db, phpbb_user $user) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\user $user) { $this->db = $db; $this->user = $user; @@ -71,7 +73,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_groupposition_in if ($current_value === false) { // Group not found. - throw new phpbb_groupposition_exception('NO_GROUP'); + throw new \phpbb\groupposition\exception('NO_GROUP'); } return (int) $current_value; diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index 6a0601da63..4cd2ae7fa8 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\groupposition; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_interface +class teampage implements \phpbb\groupposition\groupposition_interface { /** * Group is not displayed @@ -36,30 +38,30 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ /** * Database object - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Cache object - * @var phpbb_cache_driver_driver_interface + * @var \phpbb\cache\driver\driver_interface */ protected $cache; /** * Constructor * - * @param phpbb_db_driver $db Database object - * @param phpbb_user $user User object - * @param phpbb_cache_driver_driver_interface $cache Cache object + * @param \phpbb\db\driver\driver $db Database object + * @param \phpbb\user $user User object + * @param \phpbb\cache\driver\driver_interface $cache Cache object */ - public function __construct(phpbb_db_driver $db, phpbb_user $user, phpbb_cache_driver_driver_interface $cache) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\user $user, \phpbb\cache\driver\driver_interface $cache) { $this->db = $db; $this->user = $user; @@ -86,7 +88,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ if ($row === false) { // Group not found. - throw new phpbb_groupposition_exception('NO_GROUP'); + throw new \phpbb\groupposition\exception('NO_GROUP'); } return (int) $row['teampage_position']; @@ -113,7 +115,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ if ($row === false) { // Group not found. - throw new phpbb_groupposition_exception('NO_GROUP'); + throw new \phpbb\groupposition\exception('NO_GROUP'); } return $row; @@ -137,7 +139,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ if ($current_value === false) { // Group not found. - throw new phpbb_groupposition_exception('NO_GROUP'); + throw new \phpbb\groupposition\exception('NO_GROUP'); } return (int) $current_value; @@ -161,7 +163,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ if ($row === false) { // Group not found. - throw new phpbb_groupposition_exception('NO_GROUP'); + throw new \phpbb\groupposition\exception('NO_GROUP'); } return $row; @@ -261,7 +263,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ } /** - * Adds a new category + * Adds a new \category * * @param string $category_name Name of the category to be added * @return bool True if the category was added successfully @@ -431,7 +433,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new real delta + // Reset the delta, as we recalculate the new \real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { @@ -519,7 +521,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_groupposition_ $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new real delta + // Reset the delta, as we recalculate the new \real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { diff --git a/phpBB/phpbb/hook/finder.php b/phpBB/phpbb/hook/finder.php index 3f9758211d..7783efd0c7 100644 --- a/phpBB/phpbb/hook/finder.php +++ b/phpBB/phpbb/hook/finder.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\hook; + /** * @ignore */ @@ -20,20 +22,20 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_hook_finder +class finder { protected $phpbb_root_path; protected $cache; protected $php_ext; /** - * Creates a new finder instance. + * Creates a new \finder instance. * * @param string $phpbb_root_path Path to the phpbb root directory * @param string $php_ext php file extension - * @param phpbb_cache_driver_driver_interface $cache A cache instance or null + * @param \phpbb\cache\driver\driver_interface $cache A cache instance or null */ - public function __construct($phpbb_root_path, $php_ext, phpbb_cache_driver_driver_interface $cache = null) + public function __construct($phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null) { $this->phpbb_root_path = $phpbb_root_path; $this->cache = $cache; diff --git a/phpBB/phpbb/json_response.php b/phpBB/phpbb/json_response.php index 5dd904da09..fe532fc9d4 100644 --- a/phpBB/phpbb/json_response.php +++ b/phpBB/phpbb/json_response.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * JSON class * @package phpBB3 */ -class phpbb_json_response +class json_response { /** * Send the data to the client and exit the script. diff --git a/phpBB/phpbb/lock/db.php b/phpBB/phpbb/lock/db.php index 5cc0821aa0..3e15727c12 100644 --- a/phpBB/phpbb/lock/db.php +++ b/phpBB/phpbb/lock/db.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\lock; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Database locking class * @package phpBB3 */ -class phpbb_lock_db +class db { /** * Name of the config variable this lock uses @@ -42,13 +44,13 @@ class phpbb_lock_db /** * The phpBB configuration - * @var phpbb_config + * @var \phpbb\config\config */ private $config; /** * A database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ private $db; @@ -59,9 +61,9 @@ class phpbb_lock_db * * @param string $config_name A config variable to be used for locking * @param array $config The phpBB configuration - * @param phpbb_db_driver $db A database connection + * @param \phpbb\db\driver\driver $db A database connection */ - public function __construct($config_name, phpbb_config $config, phpbb_db_driver $db) + public function __construct($config_name, \phpbb\config\config $config, \phpbb\db\driver\driver $db) { $this->config_name = $config_name; $this->config = $config; diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index 17de0847c0..2a36a853ee 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\lock; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * File locking class * @package phpBB3 */ -class phpbb_lock_flock +class flock { /** * Path to the file to which access is controlled diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 0a755b5c78..7f4e52ed39 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -1,12 +1,14 @@ set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN)); $this->enable(); diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php index 2d41c9994f..427d30015d 100644 --- a/phpBB/phpbb/log/log_interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -1,12 +1,14 @@ notification_types = $notification_types; $this->notification_methods = $notification_methods; @@ -377,8 +379,8 @@ class phpbb_notification_manager // Never send notifications to the anonymous user! unset($notify_users[ANONYMOUS]); - // Make sure not to send new notifications to users who've already been notified about this item - // This may happen when an item was added, but now new users are able to see the item + // Make sure not to send new \notifications to users who've already been notified about this item + // This may happen when an item was added, but now new \users are able to see the item $sql = 'SELECT n.user_id FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt WHERE n.notification_type_id = ' . (int) $notification_type_id . ' @@ -402,7 +404,7 @@ class phpbb_notification_manager $pre_create_data = $notification->pre_create_insert_array($data, $notify_users); unset($notification); - $insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $this->notifications_table); + $insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->notifications_table); // Go through each user so we can insert a row in the DB and then notify them by their desired means foreach ($notify_users as $user => $methods) @@ -525,7 +527,7 @@ class phpbb_notification_manager { $type = $this->get_item_type_class($type_name); - if ($type instanceof phpbb_notification_type_type_interface && $type->is_available()) + if ($type instanceof \phpbb\notification\type\type_interface && $type->is_available()) { $options = array_merge(array( 'id' => $type->get_type(), @@ -561,7 +563,7 @@ class phpbb_notification_manager { $method = $this->get_method_class($method_name); - if ($method instanceof phpbb_notification_method_method_interface && $method->is_available()) + if ($method instanceof \phpbb\notification\method\method_interface && $method->is_available()) { $subscription_methods[$method_name] = array( 'id' => $method->get_type(), @@ -873,7 +875,7 @@ class phpbb_notification_manager { if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) { - throw new phpbb_notification_exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); + throw new \phpbb\notification\exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); } $sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array( diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php index fbff75b59f..327f964424 100644 --- a/phpBB/phpbb/notification/method/base.php +++ b/phpBB/phpbb/notification/method/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\method; + /** * @ignore */ @@ -19,33 +21,33 @@ if (!defined('IN_PHPBB')) * Base notifications method class * @package notifications */ -abstract class phpbb_notification_method_base implements phpbb_notification_method_method_interface +abstract class base implements \phpbb\notification\method\method_interface { - /** @var phpbb_notification_manager */ + /** @var \phpbb\notification\manager */ protected $notification_manager; - /** @var phpbb_user_loader */ + /** @var \phpbb\user_loader */ protected $user_loader; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_cache_driver_driver_interface */ + /** @var \phpbb\cache\driver\driver_interface */ protected $cache; - /** @var phpbb_template */ + /** @var \phpbb\template\template */ protected $template; - /** @var phpbb_extension_manager */ + /** @var \phpbb\extension\manager */ protected $extension_manager; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; - /** @var phpbb_auth */ + /** @var \phpbb\auth\auth */ protected $auth; - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; /** @var string */ @@ -64,17 +66,17 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth /** * Notification Method Base Constructor * - * @param phpbb_user_loader $user_loader - * @param phpbb_db_driver $db - * @param phpbb_cache_driver_driver_interface $cache - * @param phpbb_user $user - * @param phpbb_auth $auth - * @param phpbb_config $config + * @param \phpbb\user_loader $user_loader + * @param \phpbb\db\driver\driver $db + * @param \phpbb\cache\driver\driver_interface $cache + * @param \phpbb\user $user + * @param \phpbb\auth\auth $auth + * @param \phpbb\config\config $config * @param string $phpbb_root_path * @param string $php_ext - * @return phpbb_notification_method_base + * @return \phpbb\notification\method\base */ - public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\user_loader $user_loader, \phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, $user, \phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path, $php_ext) { $this->user_loader = $user_loader; $this->db = $db; @@ -89,9 +91,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth /** * Set notification manager (required) * - * @param phpbb_notification_manager $notification_manager + * @param \phpbb\notification\manager $notification_manager */ - public function set_notification_manager(phpbb_notification_manager $notification_manager) + public function set_notification_manager(\phpbb\notification\manager $notification_manager) { $this->notification_manager = $notification_manager; } @@ -99,9 +101,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth /** * Add a notification to the queue * - * @param phpbb_notification_type_type_interface $notification + * @param \phpbb\notification\type\type_interface $notification */ - public function add_to_queue(phpbb_notification_type_type_interface $notification) + public function add_to_queue(\phpbb\notification\type\type_interface $notification) { $this->queue[] = $notification; } diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index 571b0ec656..b761eb5a28 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\method; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_method_email extends phpbb_notification_method_messenger_base +class email extends \phpbb\notification\method\messenger_base { /** * Get notification method name diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php index d3b756d020..6ec21bb735 100644 --- a/phpBB/phpbb/notification/method/jabber.php +++ b/phpBB/phpbb/notification/method/jabber.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\method; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base +class jabber extends \phpbb\notification\method\messenger_base { /** * Get notification method name diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 4966aa94bc..b1b30f29b7 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\method; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base +abstract class messenger_base extends \phpbb\notification\method\base { /** * Notify using phpBB messenger @@ -60,7 +62,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati { include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); } - $messenger = new messenger(); + $messenger = new \messenger(); $board_url = generate_board_url(); // Time to go through the queue and send emails diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php index bd21d924e4..0131a8bde0 100644 --- a/phpBB/phpbb/notification/method/method_interface.php +++ b/phpBB/phpbb/notification/method/method_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\method; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Base notifications method interface * @package notifications */ -interface phpbb_notification_method_method_interface +interface method_interface { /** * Get notification method name @@ -37,9 +39,9 @@ interface phpbb_notification_method_method_interface /** * Add a notification to the queue * - * @param phpbb_notification_type_type_interface $notification + * @param \phpbb\notification\type\type_interface $notification */ - public function add_to_queue(phpbb_notification_type_type_interface $notification); + public function add_to_queue(\phpbb\notification\type\type_interface $notification); /** * Parse the queue and notify the users diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index 1a30781c35..cf4ec57989 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_approve_post extends phpbb_notification_type_post +class approve_post extends \phpbb\notification\type\post { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php index e728e9ac30..ca5bb67754 100644 --- a/phpBB/phpbb/notification/type/approve_topic.php +++ b/phpBB/phpbb/notification/type/approve_topic.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic +class approve_topic extends \phpbb\notification\type\topic { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index a7434fc9a7..1605f59c55 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -19,30 +21,30 @@ if (!defined('IN_PHPBB')) * Base notifications class * @package notifications */ -abstract class phpbb_notification_type_base implements phpbb_notification_type_type_interface +abstract class base implements \phpbb\notification\type\type_interface { - /** @var phpbb_notification_manager */ + /** @var \phpbb\notification\manager */ protected $notification_manager; - /** @var phpbb_user_loader */ + /** @var \phpbb\user_loader */ protected $user_loader; - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_cache_driver_driver_interface */ + /** @var \phpbb\cache\driver\driver_interface */ protected $cache; - /** @var phpbb_template */ + /** @var \phpbb\template\template */ protected $template; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; - /** @var phpbb_auth */ + /** @var \phpbb\auth\auth */ protected $auth; - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $config; /** @var string */ @@ -94,20 +96,20 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_t /** * Notification Type Base Constructor * - * @param phpbb_user_loader $user_loader - * @param phpbb_db_driver $db - * @param phpbb_cache_driver_driver_interface $cache - * @param phpbb_user $user - * @param phpbb_auth $auth - * @param phpbb_config $config + * @param \phpbb\user_loader $user_loader + * @param \phpbb\db\driver\driver $db + * @param \phpbb\cache\driver\driver_interface $cache + * @param \phpbb\user $user + * @param \phpbb\auth\auth $auth + * @param \phpbb\config\config $config * @param string $phpbb_root_path * @param string $php_ext * @param string $notification_types_table * @param string $notifications_table * @param string $user_notifications_table - * @return phpbb_notification_type_base + * @return \phpbb\notification\type\base */ - public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) + public function __construct(\phpbb\user_loader $user_loader, \phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, $user, \phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) { $this->user_loader = $user_loader; $this->db = $db; @@ -127,9 +129,9 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_t /** * Set notification manager (required) * - * @param phpbb_notification_manager $notification_manager + * @param \phpbb\notification\manager $notification_manager */ - public function set_notification_manager(phpbb_notification_manager $notification_manager) + public function set_notification_manager(\phpbb\notification\manager $notification_manager) { $this->notification_manager = $notification_manager; @@ -143,7 +145,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_t */ public function set_initial_data($data = array()) { - // The row from the database (unless this is a new notification we're going to add) + // The row from the database (unless this is a new \notification we're going to add) $this->data = $data; $this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array(); } @@ -220,9 +222,9 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_t { // Defaults $this->data = array_merge(array( - 'item_id' => static::get_item_id($type_data), + 'item_id' => \static::get_item_id($type_data), 'notification_type_id' => $this->notification_type_id, - 'item_parent_id' => static::get_item_parent_id($type_data), + 'item_parent_id' => \static::get_item_parent_id($type_data), 'notification_time' => time(), 'notification_read' => false, diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index ae2e75d3eb..5b021eb71a 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_bookmark extends phpbb_notification_type_post +class bookmark extends \phpbb\notification\type\post { /** * Get notification type name @@ -112,7 +114,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new notification + // Do not create a new \notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php index 951c7e0254..0c9162ec5c 100644 --- a/phpBB/phpbb/notification/type/disapprove_post.php +++ b/phpBB/phpbb/notification/type/disapprove_post.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post +class disapprove_post extends \phpbb\notification\type\approve_post { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php index 038e528797..dde6f83ec4 100644 --- a/phpBB/phpbb/notification/type/disapprove_topic.php +++ b/phpBB/phpbb/notification/type/disapprove_topic.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic +class disapprove_topic extends \phpbb\notification\type\approve_topic { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php index b3db7ad5ad..bed0807b0f 100644 --- a/phpBB/phpbb/notification/type/pm.php +++ b/phpBB/phpbb/notification/type/pm.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_pm extends phpbb_notification_type_base +class pm extends \phpbb\notification\type\base { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index 9207fd866e..24ce0cc145 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_post extends phpbb_notification_type_base +class post extends \phpbb\notification\type\base { /** * Get notification type name @@ -147,7 +149,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new notification + // Do not create a new \notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); diff --git a/phpBB/phpbb/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php index bc4b15cdc3..f05ed1ce9a 100644 --- a/phpBB/phpbb/notification/type/post_in_queue.php +++ b/phpBB/phpbb/notification/type/post_in_queue.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post +class post_in_queue extends \phpbb\notification\type\post { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index 0ed13f36fb..d59f7caf8e 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_quote extends phpbb_notification_type_post +class quote extends \phpbb\notification\type\post { /** * Get notification type name @@ -131,7 +133,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new notification + // Do not create a new \notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); @@ -166,7 +168,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post } $this->db->sql_freeresult($result); - // Find the new users to notify + // Find the new \users to notify $notifications = $this->find_users_for_notification($post); // Find the notifications we must delete diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 3fa73bab41..fd3f754f8a 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_report_pm extends phpbb_notification_type_pm +class report_pm extends \phpbb\notification\type\pm { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php index 63dfa92064..2e4a1ceb30 100644 --- a/phpBB/phpbb/notification/type/report_pm_closed.php +++ b/phpBB/phpbb/notification/type/report_pm_closed.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_pm +class report_pm_closed extends \phpbb\notification\type\pm { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php index de5c54a291..c2dad6f1bb 100644 --- a/phpBB/phpbb/notification/type/report_post.php +++ b/phpBB/phpbb/notification/type/report_post.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_report_post extends phpbb_notification_type_post_in_queue +class report_post extends \phpbb\notification\type\post_in_queue { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php index 3916cd8db7..270ccf0a1a 100644 --- a/phpBB/phpbb/notification/type/report_post_closed.php +++ b/phpBB/phpbb/notification/type/report_post_closed.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_report_post_closed extends phpbb_notification_type_post +class report_post_closed extends \phpbb\notification\type\post { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index 22436d3fb1..9042a21017 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -17,11 +19,11 @@ if (!defined('IN_PHPBB')) /** * Topic notifications class -* This class handles notifications for new topics +* This class handles notifications for new \topics * * @package notifications */ -class phpbb_notification_type_topic extends phpbb_notification_type_base +class topic extends \phpbb\notification\type\base { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php index f735e10c00..056651bc53 100644 --- a/phpBB/phpbb/notification/type/topic_in_queue.php +++ b/phpBB/phpbb/notification/type/topic_in_queue.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -21,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic +class topic_in_queue extends \phpbb\notification\type\topic { /** * Get notification type name diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php index f9c65f7286..cfc6cd461e 100644 --- a/phpBB/phpbb/notification/type/type_interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Base notifications interface * @package notifications */ -interface phpbb_notification_type_type_interface +interface type_interface { /** * Get notification type name diff --git a/phpBB/phpbb/php/ini.php b/phpBB/phpbb/php/ini.php index 17e8c54a57..8767091aba 100644 --- a/phpBB/phpbb/php/ini.php +++ b/phpBB/phpbb/php/ini.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\php; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB */ -class phpbb_php_ini +class ini { /** * Simple wrapper for ini_get() diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php index 9ca0f462b4..4d4417229e 100644 --- a/phpBB/phpbb/request/deactivated_super_global.php +++ b/phpBB/phpbb/request/deactivated_super_global.php @@ -1,12 +1,14 @@ request = $request; $this->name = $name; @@ -84,7 +86,7 @@ class phpbb_request_deactivated_super_global implements ArrayAccess, Countable, } /**#@+ - * Part of the ArrayAccess implementation, will always result in a FATAL error. + * Part of the \ArrayAccess implementation, will always result in a FATAL error. */ public function offsetGet($offset) { @@ -103,7 +105,7 @@ class phpbb_request_deactivated_super_global implements ArrayAccess, Countable, /**#@-*/ /** - * Part of the Countable implementation, will always result in a FATAL error + * Part of the \Countable implementation, will always result in a FATAL error */ public function count() { diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index 8c5bc12d96..b36ac3711a 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -1,12 +1,14 @@ '_POST', - phpbb_request_request_interface::GET => '_GET', - phpbb_request_request_interface::REQUEST => '_REQUEST', - phpbb_request_request_interface::COOKIE => '_COOKIE', - phpbb_request_request_interface::SERVER => '_SERVER', - phpbb_request_request_interface::FILES => '_FILES', + \phpbb\request\request_interface::POST => '_POST', + \phpbb\request\request_interface::GET => '_GET', + \phpbb\request\request_interface::REQUEST => '_REQUEST', + \phpbb\request\request_interface::COOKIE => '_COOKIE', + \phpbb\request\request_interface::SERVER => '_SERVER', + \phpbb\request\request_interface::FILES => '_FILES', ); /** @@ -53,15 +55,15 @@ class phpbb_request implements phpbb_request_request_interface protected $input; /** - * @var phpbb_request_type_cast_helper_interface An instance of a type cast helper providing convenience methods for type conversions. + * @var \phpbb\request\type_cast_helper_interface An instance of a type cast helper providing convenience methods for type conversions. */ protected $type_cast_helper; /** * Initialises the request class, that means it stores all input data in {@link $input input} - * and then calls {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global} + * and then calls {@link \phpbb\request\deactivated_super_global \phpbb\request\deactivated_super_global} */ - public function __construct(phpbb_request_type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true) + public function __construct(\phpbb\request\type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true) { if ($type_cast_helper) { @@ -69,7 +71,7 @@ class phpbb_request implements phpbb_request_request_interface } else { - $this->type_cast_helper = new phpbb_request_type_cast_helper(); + $this->type_cast_helper = new \phpbb\request\type_cast_helper(); } foreach ($this->super_globals as $const => $super_global) @@ -78,8 +80,8 @@ class phpbb_request implements phpbb_request_request_interface } // simulate request_order = GP - $this->original_request = $this->input[phpbb_request_request_interface::REQUEST]; - $this->input[phpbb_request_request_interface::REQUEST] = $this->input[phpbb_request_request_interface::POST] + $this->input[phpbb_request_request_interface::GET]; + $this->original_request = $this->input[\phpbb\request\request_interface::REQUEST]; + $this->input[\phpbb\request\request_interface::REQUEST] = $this->input[\phpbb\request\request_interface::POST] + $this->input[\phpbb\request\request_interface::GET]; if ($disable_super_globals) { @@ -99,7 +101,7 @@ class phpbb_request implements phpbb_request_request_interface /** * Disables access of super globals specified in $super_globals. - * This is achieved by overwriting the super globals with instances of {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global} + * This is achieved by overwriting the super globals with instances of {@link \phpbb\request\deactivated_super_global \phpbb\request\deactivated_super_global} */ public function disable_super_globals() { @@ -108,7 +110,7 @@ class phpbb_request implements phpbb_request_request_interface foreach ($this->super_globals as $const => $super_global) { unset($GLOBALS[$super_global]); - $GLOBALS[$super_global] = new phpbb_request_deactivated_super_global($this, $super_global, $const); + $GLOBALS[$super_global] = new \phpbb\request\deactivated_super_global($this, $super_global, $const); } $this->super_globals_disabled = true; @@ -144,10 +146,10 @@ class phpbb_request implements phpbb_request_request_interface * @param string $var_name The name of the variable that shall be overwritten * @param mixed $value The value which the variable shall contain. * If this is null the variable will be unset. - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global shall be changed */ - public function overwrite($var_name, $value, $super_global = phpbb_request_request_interface::REQUEST) + public function overwrite($var_name, $value, $super_global = \phpbb\request\request_interface::REQUEST) { if (!isset($this->super_globals[$super_global])) { @@ -193,13 +195,13 @@ class phpbb_request implements phpbb_request_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST) + public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST) { return $this->_variable($var_name, $default, $multibyte, $super_global, true); } @@ -217,13 +219,13 @@ class phpbb_request implements phpbb_request_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_request_interface::REQUEST) + public function untrimmed_variable($var_name, $default, $multibyte, $super_global = \phpbb\request\request_interface::REQUEST) { return $this->_variable($var_name, $default, $multibyte, $super_global, false); } @@ -234,8 +236,8 @@ class phpbb_request implements phpbb_request_request_interface * Also fall back to getenv(), some CGI setups may need it (probably not, but * whatever). * - * @param string|array $var_name See phpbb_request_request_interface::variable - * @param mixed $Default See phpbb_request_request_interface::variable + * @param string|array $var_name See \phpbb\request\request_interface::variable + * @param mixed $Default See \phpbb\request\request_interface::variable * * @return mixed The server variable value. */ @@ -243,9 +245,9 @@ class phpbb_request implements phpbb_request_request_interface { $multibyte = true; - if ($this->is_set($var_name, phpbb_request_request_interface::SERVER)) + if ($this->is_set($var_name, \phpbb\request\request_interface::SERVER)) { - return $this->variable($var_name, $default, $multibyte, phpbb_request_request_interface::SERVER); + return $this->variable($var_name, $default, $multibyte, \phpbb\request\request_interface::SERVER); } else { @@ -259,7 +261,7 @@ class phpbb_request implements phpbb_request_request_interface * Shortcut method to retrieve the value of client HTTP headers. * * @param string|array $header_name The name of the header to retrieve. - * @param mixed $default See phpbb_request_request_interface::variable + * @param mixed $default See \phpbb\request\request_interface::variable * * @return mixed The header value. */ @@ -279,7 +281,7 @@ class phpbb_request implements phpbb_request_request_interface */ public function file($form_name) { - return $this->variable($form_name, array('name' => 'none'), false, phpbb_request_request_interface::FILES); + return $this->variable($form_name, array('name' => 'none'), false, \phpbb\request\request_interface::FILES); } /** @@ -294,7 +296,7 @@ class phpbb_request implements phpbb_request_request_interface */ public function is_set_post($name) { - return $this->is_set($name, phpbb_request_request_interface::POST); + return $this->is_set($name, \phpbb\request\request_interface::POST); } /** @@ -302,12 +304,12 @@ class phpbb_request implements phpbb_request_request_interface * arrays. * * @param string $var Name of the variable - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies the super global which shall be checked * * @return bool True if the variable was sent as input */ - public function is_set($var, $super_global = phpbb_request_request_interface::REQUEST) + public function is_set($var, $super_global = \phpbb\request\request_interface::REQUEST) { return isset($this->input[$super_global][$var]); } @@ -335,13 +337,13 @@ class phpbb_request implements phpbb_request_request_interface /** * Returns all variable names for a given super global * - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * The super global from which names shall be taken * * @return array All variable names that are set for the super global. * Pay attention when using these, they are unsanitised! */ - public function variable_names($super_global = phpbb_request_request_interface::REQUEST) + public function variable_names($super_global = \phpbb\request\request_interface::REQUEST) { if (!isset($this->input[$super_global])) { @@ -362,14 +364,14 @@ class phpbb_request implements phpbb_request_request_interface * This function will always return a value of the same type as the default. * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param phpbb_request_request_interface::POST|GET|REQUEST|COOKIE $super_global + * @param \phpbb\request\request_interface::POST|GET|REQUEST|COOKIE $super_global * Specifies which super global should be used * @param bool $trim Indicates whether trim() should be applied to string values. * * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ - protected function _variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST, $trim = true) + protected function _variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST, $trim = true) { $path = false; diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php index 2c804cd7fd..3281e1ca03 100644 --- a/phpBB/phpbb/request/request_interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -1,12 +1,14 @@ get('_search_results_' . $search_key))) { diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 7dc4da8ffe..8663af5969 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Fulltext search for MySQL * @package search */ -class phpbb_search_fulltext_mysql extends phpbb_search_base +class fulltext_mysql extends \phpbb\search\base { /** * Associative array holding index stats @@ -36,19 +38,19 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base /** * Config object - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -74,7 +76,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base /** * Constructor - * Creates a new phpbb_search_fulltext_mysql, which is used as a search backend + * Creates a new \phpbb\search\fulltext_mysql, which is used as a search backend * * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false */ @@ -701,7 +703,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base } /** - * Destroys cached search results, that contained one of the new words in a post so the results won't be outdated + * Destroys cached search results, that contained one of the new \words in a post so the results won't be outdated * * @param string $mode contains the post mode: edit, post, reply, quote ... * @param int $post_id contains the post id of the post to index @@ -712,7 +714,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base */ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) { - // Split old and new post/subject to obtain array of words + // Split old and new \post/subject to obtain array of words $split_text = $this->split_message($message); $split_title = ($subject) ? $this->split_message($subject) : array(); diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 730c3a6c2d..006b88e07a 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * phpBB's own db driven fulltext search, version 2 * @package search */ -class phpbb_search_fulltext_native extends phpbb_search_base +class fulltext_native extends \phpbb\search\base { /** * Associative array holding index stats @@ -80,19 +82,19 @@ class phpbb_search_fulltext_native extends phpbb_search_base /** * Config object - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -1222,7 +1224,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base return; } - // Split old and new post/subject to obtain array of 'words' + // Split old and new \post/subject to obtain array of 'words' $split_text = $this->split_message($message); $split_title = $this->split_message($subject); @@ -1269,7 +1271,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base // We now have unique arrays of all words to be added and removed and // individual arrays of added and removed words for text and title. What - // we need to do now is add the new words (if they don't already exist) + // we need to do now is add the new \words (if they don't already exist) // and then add (or remove) matches between the words and this post if (sizeof($unique_add_words)) { @@ -1306,7 +1308,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base $this->db->sql_transaction('begin'); } - // now update the search match table, remove links to removed words and add links to new words + // now update the search match table, remove links to removed words and add links to new \words foreach ($words['del'] as $word_in => $word_ary) { $title_match = ($word_in == 'title') ? 1 : 0; @@ -1466,7 +1468,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base WHERE ' . $this->db->sql_in_set('word_id', $sql_in); $this->db->sql_query($sql); - // by setting search_last_gc to the new time here we make sure that if a user reloads because the + // by setting search_last_gc to the new \time here we make sure that if a user reloads because the // following query takes too long, he won't run into it again set_config('search_last_gc', time(), true); @@ -1556,7 +1558,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base * @param string $encoding Text encoding * @return string Cleaned up text, only alphanumeric chars are left * - * @todo normalizer::cleanup being able to be used? + * @todo \normalizer::cleanup being able to be used? */ protected function cleanup($text, $allowed_chars = null, $encoding = 'utf-8') { @@ -1588,7 +1590,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base * If we use it more widely, an instance of that class should be held in a * a global variable instead */ - utf_normalizer::nfc($text); + \utf_normalizer::nfc($text); /** * The first thing we do is: diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index 6b4b310f2e..ba9215fcfd 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * Fulltext search for PostgreSQL * @package search */ -class phpbb_search_fulltext_postgres extends phpbb_search_base +class fulltext_postgres extends \phpbb\search\base { /** * Associative array holding index stats @@ -61,19 +63,19 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base /** * Config object - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -99,7 +101,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base /** * Constructor - * Creates a new phpbb_search_fulltext_postgres, which is used as a search backend + * Creates a new \phpbb\search\fulltext_postgres, which is used as a search backend * * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false */ @@ -731,7 +733,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base } /** - * Destroys cached search results, that contained one of the new words in a post so the results won't be outdated + * Destroys cached search results, that contained one of the new \words in a post so the results won't be outdated * * @param string $mode contains the post mode: edit, post, reply, quote ... * @param int $post_id contains the post id of the post to index @@ -742,7 +744,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base */ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) { - // Split old and new post/subject to obtain array of words + // Split old and new \post/subject to obtain array of words $split_text = $this->split_message($message); $split_title = ($subject) ? $this->split_message($subject) : array(); diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index 4f3f852664..81cb31e6e2 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search; + /** */ if (!defined('IN_PHPBB')) @@ -26,7 +28,7 @@ define('SPHINX_CONNECT_WAIT_TIME', 300); * Fulltext search based on the sphinx search deamon * @package search */ -class phpbb_search_fulltext_sphinx +class fulltext_sphinx { /** * Associative array holding index stats @@ -73,25 +75,25 @@ class phpbb_search_fulltext_sphinx /** * Auth object - * @var phpbb_auth + * @var \phpbb\auth\auth */ protected $auth; /** * Config object - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Database connection - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * Database Tools object - * @var phpbb_db_tools + * @var \phpbb\db\tools */ protected $db_tools; @@ -103,7 +105,7 @@ class phpbb_search_fulltext_sphinx /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -122,7 +124,7 @@ class phpbb_search_fulltext_sphinx /** * Constructor - * Creates a new phpbb_search_fulltext_postgres, which is used as a search backend + * Creates a new \phpbb\search\fulltext_postgres, which is used as a search backend * * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false */ @@ -135,8 +137,8 @@ class phpbb_search_fulltext_sphinx $this->db = $db; $this->auth = $auth; - // Initialize phpbb_db_tools object - $this->db_tools = new phpbb_db_tools($this->db); + // Initialize \phpbb\db\tools object + $this->db_tools = new \phpbb\db\tools($this->db); if(!$this->config['fulltext_sphinx_id']) { @@ -151,7 +153,7 @@ class phpbb_search_fulltext_sphinx } // Initialize sphinx client - $this->sphinx = new SphinxClient(); + $this->sphinx = new \SphinxClient(); $this->sphinx->SetServer(($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost'), ($this->config['fulltext_sphinx_port'] ? (int) $this->config['fulltext_sphinx_port'] : 9312)); @@ -250,7 +252,7 @@ class phpbb_search_fulltext_sphinx /* Now that we're sure everything was entered correctly, generate a config for the index. We use a config value fulltext_sphinx_id for this, as it should be unique. */ - $config_object = new phpbb_search_sphinx_config($this->config_file_data); + $config_object = new \phpbb\search\sphinx\config($this->config_file_data); $config_data = array( 'source source_phpbb_' . $this->id . '_main' => array( array('type', $this->dbtype . ' # mysql or pgsql'), @@ -420,7 +422,7 @@ class phpbb_search_fulltext_sphinx $this->sphinx->SetMatchMode(SPH_MATCH_ANY); } - // Keep quotes and new lines + // Keep quotes and new \lines $keywords = str_replace(array('"', "\n"), array('"', ' '), trim($keywords)); if (strlen($keywords) > 0) diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index f1864f0c8c..2468022428 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search\sphinx; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) } /** -* phpbb_search_sphinx_config +* \phpbb\search\sphinx\config * An object representing the sphinx configuration * Can read it from file and write it back out after modification * @package search */ -class phpbb_search_sphinx_config +class config { private $sections = array(); @@ -44,7 +46,7 @@ class phpbb_search_sphinx_config * Get a section object by its name * * @param string $name The name of the section that shall be returned - * @return phpbb_search_sphinx_config_section The section object or null if none was found + * @return \phpbb\search\sphinx\config_section The section object or null if none was found * * @access public */ @@ -53,7 +55,7 @@ class phpbb_search_sphinx_config for ($i = 0, $size = sizeof($this->sections); $i < $size; $i++) { // Make sure this is really a section object and not a comment - if (($this->sections[$i] instanceof phpbb_search_sphinx_config_section) && $this->sections[$i]->get_name() == $name) + if (($this->sections[$i] instanceof \phpbb\search\sphinx\config_section) && $this->sections[$i]->get_name() == $name) { return $this->sections[$i]; } @@ -61,16 +63,16 @@ class phpbb_search_sphinx_config } /** - * Appends a new empty section to the end of the config + * Appends a new \empty section to the end of the config * - * @param string $name The name for the new section - * @return phpbb_search_sphinx_config_section The newly created section object + * @param string $name The name for the new \section + * @return \phpbb\search\sphinx\config_section The newly created section object * * @access public */ function add_section($name) { - $this->sections[] = new phpbb_search_sphinx_config_section($name, ''); + $this->sections[] = new \phpbb\search\sphinx\config_section($name, ''); return $this->sections[sizeof($this->sections) - 1]; } @@ -109,7 +111,7 @@ class phpbb_search_sphinx_config // that way they're not deleted when reassembling the file from the sections if (!$line || $line[0] == '#') { - $this->sections[] = new phpbb_search_sphinx_config_comment($config_file[$i]); + $this->sections[] = new \phpbb\search\sphinx\config_comment($config_file[$i]); continue; } else @@ -141,9 +143,9 @@ class phpbb_search_sphinx_config $section_name .= $line[$j]; } - // And then we create the new section object + // And then we create the new \section object $section_name = trim($section_name); - $section = new phpbb_search_sphinx_config_section($section_name, $section_name_comment); + $section = new \phpbb\search\sphinx\config_section($section_name, $section_name_comment); } } else @@ -158,7 +160,7 @@ class phpbb_search_sphinx_config // of this section so they're not deleted on reassembly if (!$line || $line[0] == '#') { - $section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i])); + $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } @@ -174,7 +176,7 @@ class phpbb_search_sphinx_config } else { - $section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i])); + $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } } @@ -240,10 +242,10 @@ class phpbb_search_sphinx_config } // If a name and an equal sign were found then we have append a - // new variable object to the section + // new \variable object to the section if ($name && $found_assignment) { - $section->add_variable(new phpbb_search_sphinx_config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); + $section->add_variable(new \phpbb\search\sphinx\config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); continue; } @@ -262,7 +264,7 @@ class phpbb_search_sphinx_config // If we did not find anything meaningful up to here, then just treat it // as a comment $comment = ($skip_first) ? "\t" . substr(ltrim($config_file[$i]), 1) : $config_file[$i]; - $section->add_variable(new phpbb_search_sphinx_config_comment($comment)); + $section->add_variable(new \phpbb\search\sphinx\config_comment($comment)); } } diff --git a/phpBB/phpbb/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php index 7f695dbf0c..66000e4031 100644 --- a/phpBB/phpbb/search/sphinx/config_comment.php +++ b/phpBB/phpbb/search/sphinx/config_comment.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search\sphinx; + /** * @ignore */ @@ -16,15 +18,15 @@ if (!defined('IN_PHPBB')) } /** -* phpbb_search_sphinx_config_comment +* \phpbb\search\sphinx\config_comment * Represents a comment inside the sphinx configuration */ -class phpbb_search_sphinx_config_comment +class config_comment { private $exact_string; /** - * Create a new comment + * Create a new \comment * * @param string $exact_string The content of the comment including newlines, leading whitespace, etc. * diff --git a/phpBB/phpbb/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php index 79c9c8563d..3a5631ca21 100644 --- a/phpBB/phpbb/search/sphinx/config_section.php +++ b/phpBB/phpbb/search/sphinx/config_section.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search\sphinx; + /** * @ignore */ @@ -16,10 +18,10 @@ if (!defined('IN_PHPBB')) } /** -* phpbb_search_sphinx_config_section +* \phpbb\search\sphinx\config_section * Represents a single section inside the sphinx configuration */ -class phpbb_search_sphinx_config_section +class config_section { private $name; private $comment; @@ -27,7 +29,7 @@ class phpbb_search_sphinx_config_section private $variables = array(); /** - * Construct a new section + * Construct a new \section * * @param string $name Name of the section * @param string $comment Comment that should be appended after the name in the @@ -45,7 +47,7 @@ class phpbb_search_sphinx_config_section /** * Add a variable object to the list of variables in this section * - * @param phpbb_search_sphinx_config_variable $variable The variable object + * @param \phpbb\search\sphinx\config_variable $variable The variable object * * @access public */ @@ -82,7 +84,7 @@ class phpbb_search_sphinx_config_section * Get a variable object by its name * * @param string $name The name of the variable that shall be returned - * @return phpbb_search_sphinx_config_section The first variable object from this section with the + * @return \phpbb\search\sphinx\config_section The first variable object from this section with the * given name or null if none was found * * @access public @@ -92,7 +94,7 @@ class phpbb_search_sphinx_config_section for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++) { // Make sure this is a variable object and not a comment - if (($this->variables[$i] instanceof phpbb_search_sphinx_config_variable) && $this->variables[$i]->get_name() == $name) + if (($this->variables[$i] instanceof \phpbb\search\sphinx\config_variable) && $this->variables[$i]->get_name() == $name) { return $this->variables[$i]; } @@ -111,7 +113,7 @@ class phpbb_search_sphinx_config_section for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++) { // Make sure this is a variable object and not a comment - if (($this->variables[$i] instanceof phpbb_search_sphinx_config_variable) && $this->variables[$i]->get_name() == $name) + if (($this->variables[$i] instanceof \phpbb\search\sphinx\config_variable) && $this->variables[$i]->get_name() == $name) { array_splice($this->variables, $i, 1); $i--; @@ -120,17 +122,17 @@ class phpbb_search_sphinx_config_section } /** - * Create a new variable object and append it to the variable list of this section + * Create a new \variable object and append it to the variable list of this section * - * @param string $name The name for the new variable - * @param string $value The value for the new variable - * @return phpbb_search_sphinx_config_variable Variable object that was created + * @param string $name The name for the new \variable + * @param string $value The value for the new \variable + * @return \phpbb\search\sphinx\config_variable Variable object that was created * * @access public */ function create_variable($name, $value) { - $this->variables[] = new phpbb_search_sphinx_config_variable($name, $value, ''); + $this->variables[] = new \phpbb\search\sphinx\config_variable($name, $value, ''); return $this->variables[sizeof($this->variables) - 1]; } diff --git a/phpBB/phpbb/search/sphinx/config_variable.php b/phpBB/phpbb/search/sphinx/config_variable.php index 2c1d35a49c..afe4190068 100644 --- a/phpBB/phpbb/search/sphinx/config_variable.php +++ b/phpBB/phpbb/search/sphinx/config_variable.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\search\sphinx; + /** * @ignore */ @@ -16,17 +18,17 @@ if (!defined('IN_PHPBB')) } /** -* phpbb_search_sphinx_config_variable +* \phpbb\search\sphinx\config_variable * Represents a single variable inside the sphinx configuration */ -class phpbb_search_sphinx_config_variable +class config_variable { private $name; private $value; private $comment; /** - * Constructs a new variable object + * Constructs a new \variable object * * @param string $name Name of the variable * @param string $value Value of the variable diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 3bff91e275..782ef60c52 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Session class * @package phpBB3 */ -class phpbb_session +class session { var $cookie_data = array(); var $page = array(); @@ -197,7 +199,7 @@ class phpbb_session * This is where all session activity begins. We gather various pieces of * information from the client and server. We test to see if a session already * exists. If it does, fine and dandy. If it doesn't we'll go on to create a - * new one ... pretty logical heh? We also examine the system load (if we're + * new \one ... pretty logical heh? We also examine the system load (if we're * running on a system which makes such information readily available) and * halt if it's above an admin definable limit. * @@ -243,7 +245,7 @@ class phpbb_session $this->forwarded_for = ''; } - if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_request_interface::COOKIE)) + if ($request->is_set($config['cookie_name'] . '_sid', \phpbb\request\request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', \phpbb\request\request_interface::COOKIE)) { $this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true); $this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true); @@ -401,13 +403,13 @@ class phpbb_session $session_expired = false; // Check whether the session is still valid if we have one - $method = basename(trim($config['auth_method'])); + $method = basename(trim($config['auth_method'])); $provider = $phpbb_container->get('auth.provider.' . $method); - if (!($provider instanceof phpbb_auth_provider_provider_interface)) + if (!($provider instanceof \phpbb\auth\provider\provider_interface)) { - throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_provider_interface'); + throw new \RuntimeException($provider . ' must implement \phpbb\auth\provider\provider_interface'); } $ret = $provider->validate_session($this->data); @@ -492,18 +494,18 @@ class phpbb_session } } - // If we reach here then no (valid) session exists. So we'll create a new one + // If we reach here then no (valid) session exists. So we'll create a new \one return $this->session_create(); } /** - * Create a new session + * Create a new \session * * If upon trying to start a session we discover there is nothing existing we * jump here. Additionally this method is called directly during login to regenerate * the session for the specific user. In this method we carry out a number of tasks; * garbage collection, (search)bot checking, banned user comparison. Basically - * though this method will result in a new session for a specific user. + * though this method will result in a new \session for a specific user. */ function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) { @@ -773,7 +775,7 @@ class phpbb_session if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())) { - // Limit new sessions in 1 minute period (if required) + // Limit new \sessions in 1 minute period (if required) if (empty($this->data['session_time']) && $config['active_sessions']) { // $db->sql_return_on_error(false); @@ -799,7 +801,7 @@ class phpbb_session // Something quite important: session_page always holds the *last* page visited, except for the *first* visit. // We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case. - // If the session id is empty, we have a completely new one and will set an "identifier" here. This identifier is able to be checked later. + // If the session id is empty, we have a completely new \one and will set an "identifier" here. This identifier is able to be checked later. if (empty($this->data['session_id'])) { // This is a temporary variable, only set for the very first visit @@ -1022,7 +1024,7 @@ class phpbb_session { include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx); } - phpbb_captcha_factory::garbage_collect($config['captcha_plugin']); + \phpbb_captcha_factory::garbage_collect($config['captcha_plugin']); $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . ' WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']); diff --git a/phpBB/phpbb/style/extension_path_provider.php b/phpBB/phpbb/style/extension_path_provider.php index ec1d85f821..104cda757b 100644 --- a/phpBB/phpbb/style/extension_path_provider.php +++ b/phpBB/phpbb/style/extension_path_provider.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\style; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_style_extension_path_provider extends phpbb_extension_provider implements phpbb_style_path_provider_interface +class extension_path_provider extends \phpbb\extension\provider implements \phpbb\style\path_provider_interface { /** * Optional prefix for style paths searched within extensions. @@ -36,7 +38,7 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple /** * A provider of paths to be searched for styles - * @var phpbb_style_path_provider + * @var \phpbb\style\path_provider */ protected $base_path_provider; @@ -46,12 +48,12 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple /** * Constructor stores extension manager * - * @param phpbb_extension_manager $extension_manager phpBB extension manager - * @param phpbb_style_path_provider $base_path_provider A simple path provider + * @param \phpbb\extension\manager $extension_manager phpBB extension manager + * @param \phpbb\style\path_provider $base_path_provider A simple path provider * to provide paths to be located in extensions * @param string $phpbb_root_path phpBB root path */ - public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider, $phpbb_root_path) + public function __construct(\phpbb\extension\manager $extension_manager, \phpbb\style\path_provider $base_path_provider, $phpbb_root_path) { parent::__construct($extension_manager); $this->base_path_provider = $base_path_provider; diff --git a/phpBB/phpbb/style/path_provider.php b/phpBB/phpbb/style/path_provider.php index 731d682e88..0a5906d0a8 100644 --- a/phpBB/phpbb/style/path_provider.php +++ b/phpBB/phpbb/style/path_provider.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\style; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_provider_interface +class path_provider implements \IteratorAggregate, \phpbb\style\path_provider_interface { protected $paths = array(); @@ -57,6 +59,6 @@ class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_p */ public function getIterator() { - return new ArrayIterator($this->paths); + return new \ArrayIterator($this->paths); } } diff --git a/phpBB/phpbb/style/path_provider_interface.php b/phpBB/phpbb/style/path_provider_interface.php index 1a6153a4d3..beb0da29df 100644 --- a/phpBB/phpbb/style/path_provider_interface.php +++ b/phpBB/phpbb/style/path_provider_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\style; + /** * @ignore */ @@ -22,7 +24,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_style_path_provider_interface extends Traversable +interface path_provider_interface extends \Traversable { /** * Defines a prefix to use for style paths in extensions diff --git a/phpBB/phpbb/style/resource_locator.php b/phpBB/phpbb/style/resource_locator.php index 4cf767c062..848624ee69 100644 --- a/phpBB/phpbb/style/resource_locator.php +++ b/phpBB/phpbb/style/resource_locator.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\style; + /** * @ignore */ @@ -30,7 +32,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_style_resource_locator implements phpbb_template_locator +class resource_locator implements \phpbb\template\locator { /** * Paths to style directories. diff --git a/phpBB/phpbb/style/style.php b/phpBB/phpbb/style/style.php index 034f518091..d3bacdb1ec 100644 --- a/phpBB/phpbb/style/style.php +++ b/phpBB/phpbb/style/style.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\style; + /** * @ignore */ @@ -19,12 +21,12 @@ if (!defined('IN_PHPBB')) * Base Style class. * @package phpBB3 */ -class phpbb_style +class style { /** * Template class. * Handles everything related to templates. - * @var phpbb_template + * @var \phpbb\template\template */ private $template; @@ -42,25 +44,25 @@ class phpbb_style /** * phpBB config instance - * @var phpbb_config + * @var \phpbb\config\config */ private $config; /** * Current user - * @var phpbb_user + * @var \phpbb\user */ private $user; /** * Style resource locator - * @var phpbb_style_resource_locator + * @var \phpbb\style\resource_locator */ private $locator; /** * Style path provider - * @var phpbb_style_path_provider + * @var \phpbb\style\path_provider */ private $provider; @@ -69,11 +71,11 @@ class phpbb_style * * @param string $phpbb_root_path phpBB root path * @param user $user current user - * @param phpbb_style_resource_locator $locator style resource locator - * @param phpbb_style_path_provider $provider style path provider - * @param phpbb_template $template template + * @param \phpbb\style\resource_locator $locator style resource locator + * @param \phpbb\style\path_provider $provider style path provider + * @param \phpbb\template\template $template template */ - public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_template $template) + public function __construct($phpbb_root_path, $php_ext, $config, $user, \phpbb\style\resource_locator $locator, \phpbb\style\path_provider_interface $provider, \phpbb\template\template $template) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 7c322cd971..aa4b25aa7f 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_template_asset +class asset { protected $components = array(); diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index c5ce7422b9..263f77a1b8 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_template_context +class context { /** * variable that holds all the data we'll be substituting into @@ -86,7 +88,7 @@ class phpbb_template_context * Returns a reference to template data array. * * This function is public so that template renderer may invoke it. - * Users should alter template variables via functions in phpbb_template. + * Users should alter template variables via functions in \phpbb\template\template. * * Note: modifying returned array will affect data stored in the context. * @@ -158,7 +160,7 @@ class phpbb_template_context } // Now we add the block that we're actually assigning to. - // We're adding a new iteration to this block with the given + // We're adding a new \iteration to this block with the given // variable assignments. $str[$blocks[$blockcount]][] = $vararray; @@ -190,7 +192,7 @@ class phpbb_template_context unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']); } - // Add a new iteration to this block with the variable assignments we were given. + // Add a new \iteration to this block with the variable assignments we were given. $this->tpldata[$blockname][] = $vararray; // Set S_NUM_ROWS @@ -223,7 +225,7 @@ class phpbb_template_context * @param string $mode Mode to execute (valid modes are 'insert' and 'change') * * If insert, the vararray is inserted at the given position (position counting from zero). - * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value). + * If change, the current block gets merged with the vararray (resulting in new \key/value pairs be added and existing keys be replaced by the new \value). * * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars) diff --git a/phpBB/phpbb/template/locator.php b/phpBB/phpbb/template/locator.php index f6fd20bcc2..c930609b80 100644 --- a/phpBB/phpbb/template/locator.php +++ b/phpBB/phpbb/template/locator.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -33,7 +35,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_template_locator +interface locator { /** * Sets the template filenames for handles. $filename_array diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php index 89a01e924d..4b337f9980 100644 --- a/phpBB/phpbb/template/template.php +++ b/phpBB/phpbb/template/template.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -15,13 +17,13 @@ if (!defined('IN_PHPBB')) exit; } -interface phpbb_template +interface template { /** * Clear the cache * - * @return phpbb_template + * @return \phpbb\template\template */ public function clear_cache(); @@ -29,7 +31,7 @@ interface phpbb_template * Sets the template filenames for handles. * * @param array $filename_array Should be a hash of handle => filename pairs. - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function set_filenames(array $filename_array); @@ -39,14 +41,14 @@ interface phpbb_template * * @param array $style_names List of style names in inheritance tree order * @param array $style_paths List of style paths in inheritance tree order - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function set_style_names(array $style_names, array $style_paths); /** * Clears all variables and blocks assigned to this template. * - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function destroy(); @@ -54,7 +56,7 @@ interface phpbb_template * Reset/empty complete block * * @param string $blockname Name of block to destroy - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function destroy_block_vars($blockname); @@ -66,7 +68,7 @@ interface phpbb_template * This function calls hooks. * * @param string $handle Handle to display - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function display($handle); @@ -77,7 +79,7 @@ interface phpbb_template * @param string $handle Handle to operate on * @param string $template_var Template variable to assign compiled handle to * @param bool $return_content If true return compiled handle, otherwise assign to $template_var - * @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this + * @return \phpbb\template\template|string if $return_content is true return string of the compiled handle, otherwise return $this */ public function assign_display($handle, $template_var = '', $return_content = true); @@ -85,7 +87,7 @@ interface phpbb_template * Assign key variable pairs from an array * * @param array $vararray A hash of variable name => value pairs - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_vars(array $vararray); @@ -96,7 +98,7 @@ interface phpbb_template * * @param string $varname Variable name * @param string $varval Value to assign to variable - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_var($varname, $varval); @@ -107,7 +109,7 @@ interface phpbb_template * * @param string $varname Variable name * @param string $varval Value to append to variable - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function append_var($varname, $varval); @@ -115,7 +117,7 @@ interface phpbb_template * Assign key variable pairs from an array to a specified block * @param string $blockname Name of block to assign $vararray to * @param array $vararray A hash of variable name => value pairs - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_block_vars($blockname, array $vararray); @@ -139,7 +141,7 @@ interface phpbb_template * @param string $mode Mode to execute (valid modes are 'insert' and 'change') * * If insert, the vararray is inserted at the given position (position counting from zero). - * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value). + * If change, the current block gets merged with the vararray (resulting in new \key/value pairs be added and existing keys be replaced by the new \value). * * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars) diff --git a/phpBB/phpbb/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php index 6557b209eb..2490a43f81 100644 --- a/phpBB/phpbb/template/twig/definition.php +++ b/phpBB/phpbb/template/twig/definition.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -18,7 +20,7 @@ if (!defined('IN_PHPBB')) /** * This class holds all DEFINE variables from the current page load */ -class phpbb_template_twig_definition +class definition { /** @var array **/ protected $definitions = array(); @@ -39,7 +41,7 @@ class phpbb_template_twig_definition * * @param string $name * @param mixed $value - * @return phpbb_template_twig_definition + * @return \phpbb\template\twig\definition */ public function set($name, $value) { @@ -53,7 +55,7 @@ class phpbb_template_twig_definition * * @param string $name * @param string $value - * @return phpbb_template_twig_definition + * @return \phpbb\template\twig\definition */ public function append($name, $value) { diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index b60cd72325..64f3ace52d 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -15,12 +17,12 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_template_twig_environment extends Twig_Environment +class environment extends \Twig_Environment { /** @var array */ protected $phpbb_extensions; - /** @var phpbb_config */ + /** @var \phpbb\config\config */ protected $phpbb_config; /** @var string */ @@ -32,13 +34,13 @@ class phpbb_template_twig_environment extends Twig_Environment /** * Constructor * - * @param phpbb_config $phpbb_config + * @param \phpbb\config\config $phpbb_config * @param array $phpbb_extensions Array of enabled extensions (name => path) * @param string $phpbb_root_path * @param Twig_LoaderInterface $loader * @param array $options Array of options to pass to Twig */ - public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array()) + public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, \Twig_LoaderInterface $loader = null, $options = array()) { $this->phpbb_config = $phpbb_config; $this->phpbb_extensions = $phpbb_extensions; @@ -62,7 +64,7 @@ class phpbb_template_twig_environment extends Twig_Environment /** * Get phpBB config * - * @return phpbb_config + * @return \phpbb\config\config */ public function get_phpbb_config() { @@ -124,7 +126,7 @@ class phpbb_template_twig_environment extends Twig_Environment return parent::loadTemplate('@' . $namespace . '/' . $name, $index); } - catch (Twig_Error_Loader $e) + catch (\Twig_Error_Loader $e) { } } diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 2adee07c8c..1ddb97369e 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -15,22 +17,22 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_template_twig_extension extends Twig_Extension +class extension extends \Twig_Extension { - /** @var phpbb_template_context */ + /** @var \phpbb\template\context */ protected $context; - /** @var phpbb_user */ + /** @var \phpbb\user */ protected $user; /** * Constructor * - * @param phpbb_template_context $context - * @param phpbb_user $user - * @return phpbb_template_twig_extension + * @param \phpbb\template\context $context + * @param \phpbb\user $user + * @return \phpbb\template\twig\extension */ - public function __construct(phpbb_template_context $context, $user) + public function __construct(\phpbb\template\context $context, $user) { $this->context = $context; $this->user = $user; @@ -54,13 +56,13 @@ class phpbb_template_twig_extension extends Twig_Extension public function getTokenParsers() { return array( - new phpbb_template_twig_tokenparser_defineparser, - new phpbb_template_twig_tokenparser_includeparser, - new phpbb_template_twig_tokenparser_includejs, - new phpbb_template_twig_tokenparser_includecss, - new phpbb_template_twig_tokenparser_event, - new phpbb_template_twig_tokenparser_includephp, - new phpbb_template_twig_tokenparser_php, + new \phpbb\template\twig\tokenparser\defineparser, + new \phpbb\template\twig\tokenparser\includeparser, + new \phpbb\template\twig\tokenparser\includejs, + new \phpbb\template\twig\tokenparser\includecss, + new \phpbb\template\twig\tokenparser\event, + new \phpbb\template\twig\tokenparser\includephp, + new \phpbb\template\twig\tokenparser\php, ); } @@ -72,8 +74,8 @@ class phpbb_template_twig_extension extends Twig_Extension public function getFilters() { return array( - new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)), - new Twig_SimpleFilter('addslashes', 'addslashes'), + new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)), + new \Twig_SimpleFilter('addslashes', 'addslashes'), ); } @@ -85,7 +87,7 @@ class phpbb_template_twig_extension extends Twig_Extension public function getFunctions() { return array( - new Twig_SimpleFunction('lang', array($this, 'lang')), + new \Twig_SimpleFunction('lang', array($this, 'lang')), ); } @@ -102,26 +104,26 @@ class phpbb_template_twig_extension extends Twig_Extension ), array( // precedence settings are copied from similar operators in Twig core extension - '||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - '&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + '||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + '&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), - 'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + 'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), - 'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'neq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - '<>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + 'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'neq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + '<>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), - '===' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_equalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - '!==' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_notequalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + '===' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\equalequal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + '!==' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\notequalequal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), - 'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'ge' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - 'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + 'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'ge' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), + 'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), - 'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + 'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), ), ); } @@ -137,7 +139,7 @@ class phpbb_template_twig_extension extends Twig_Extension * * @return mixed The sliced variable */ - function loop_subset(Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false) + function loop_subset(\Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false) { // We do almost the same thing as Twig's slice (array_slice), except when $end is positive if ($end >= 1) diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php index 46412ad048..4f10e9594f 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_template_twig_lexer extends Twig_Lexer +class lexer extends \Twig_Lexer { public function tokenize($code, $filename = null) { diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php index 247b908337..ec084d0f7d 100644 --- a/phpBB/phpbb/template/twig/node/definenode.php +++ b/phpBB/phpbb/template/twig/node/definenode.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node; + /** * @ignore */ @@ -16,9 +18,9 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_definenode extends Twig_Node +class definenode extends \Twig_Node { - public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null) + public function __construct($capture, \Twig_NodeInterface $name, \Twig_NodeInterface $value, $lineno, $tag = null) { parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag); } @@ -28,7 +30,7 @@ class phpbb_template_twig_node_definenode extends Twig_Node * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); @@ -38,7 +40,7 @@ class phpbb_template_twig_node_definenode extends Twig_Node ->subcompile($this->getNode('value')) ; - $compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n"); + $compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new \Twig_Markup(\$value, \$this->env->getCharset());\n"); } else { diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php index 971dea14fa..a55e68fb04 100644 --- a/phpBB/phpbb/template/twig/node/event.php +++ b/phpBB/phpbb/template/twig/node/event.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_event extends Twig_Node +class event extends \Twig_Node { /** @var Twig_Environment */ protected $environment; - public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null) + public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null) { $this->environment = $environment; @@ -33,7 +35,7 @@ class phpbb_template_twig_node_event extends Twig_Node * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); @@ -48,7 +50,7 @@ class phpbb_template_twig_node_event extends Twig_Node // If debug mode is enabled, lets check for new/removed EVENT // templates on page load rather than at compile. This is // slower, but makes developing extensions easier (no need to - // purge the cache when a new event template file is added) + // purge the cache when a new \event template file is added) $compiler ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") ->indent() diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php index 8ec2069114..48d8b814b8 100644 --- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php +++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node\expression\binary; + /** * @ignore */ @@ -16,9 +18,9 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary +class equalequal extends \Twig_Node_Expression_Binary { - public function operator(Twig_Compiler $compiler) + public function operator(\Twig_Compiler $compiler) { return $compiler->raw('==='); } diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php index 96f32c502e..87585dfb4c 100644 --- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php +++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node\expression\binary; + /** * @ignore */ @@ -16,9 +18,9 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary +class notequalequal extends \Twig_Node_Expression_Binary { - public function operator(Twig_Compiler $compiler) + public function operator(\Twig_Compiler $compiler) { return $compiler->raw('!=='); } diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index 990b1c984f..f5c6413617 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -7,12 +7,14 @@ * */ -class phpbb_template_twig_node_includeasset extends Twig_Node +namespace phpbb\template\twig\node; + +class includeasset extends \Twig_Node { /** @var Twig_Environment */ protected $environment; - public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null) + public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null) { $this->environment = $environment; @@ -23,7 +25,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); @@ -33,7 +35,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$asset = new phpbb_template_asset(\$asset_file);\n") + ->write("\$asset = new \phpbb\template\asset(\$asset_file);\n") ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php index 01fda44aad..45ff9107a0 100644 --- a/phpBB/phpbb/template/twig/node/includecss.php +++ b/phpBB/phpbb/template/twig/node/includecss.php @@ -7,7 +7,9 @@ * */ -class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset +namespace phpbb\template\twig\node; + +class includecss extends \phpbb\template\twig\node\includeasset { public function get_definition_name() { @@ -19,7 +21,7 @@ class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_inclu * * @param Twig_Compiler A Twig_Compiler instance */ - public function append_asset(Twig_Compiler $compiler) + public function append_asset(\Twig_Compiler $compiler) { $compiler ->raw("environment->get_phpbb_config(); diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php index c5d1c6be51..77fe7f3acb 100644 --- a/phpBB/phpbb/template/twig/node/includenode.php +++ b/phpBB/phpbb/template/twig/node/includenode.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node; + /** * @ignore */ @@ -16,14 +18,14 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_includenode extends Twig_Node_Include +class includenode extends \Twig_Node_Include { /** * Compiles the node to PHP. * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php index dbe54f0e1a..4024cf0cc8 100644 --- a/phpBB/phpbb/template/twig/node/includephp.php +++ b/phpBB/phpbb/template/twig/node/includephp.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_includephp extends Twig_Node +class includephp extends \Twig_Node { /** @var Twig_Environment */ protected $environment; - public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null) + public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $ignoreMissing = false, $lineno, $tag = null) { $this->environment = $environment; @@ -33,7 +35,7 @@ class phpbb_template_twig_node_includephp extends Twig_Node * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); @@ -80,7 +82,7 @@ class phpbb_template_twig_node_includephp extends Twig_Node if ($this->getAttribute('ignore_missing')) { $compiler ->outdent() - ->write("} catch (Twig_Error_Loader \$e) {\n") + ->write("} catch (\Twig_Error_Loader \$e) {\n") ->indent() ->write("// ignore missing template\n") ->outdent() diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php index c11539ea7f..b37759303d 100644 --- a/phpBB/phpbb/template/twig/node/php.php +++ b/phpBB/phpbb/template/twig/node/php.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\node; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_php extends Twig_Node +class php extends \Twig_Node { /** @var Twig_Environment */ protected $environment; - public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null) + public function __construct(\Twig_Node_Text $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null) { $this->environment = $environment; @@ -33,7 +35,7 @@ class phpbb_template_twig_node_php extends Twig_Node * * @param Twig_Compiler A Twig_Compiler instance */ - public function compile(Twig_Compiler $compiler) + public function compile(\Twig_Compiler $compiler) { $compiler->addDebugInfo($this); diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index db023c67bf..688afec191 100644 --- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_defineparser extends Twig_TokenParser +class defineparser extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -25,31 +27,31 @@ class phpbb_template_twig_tokenparser_defineparser extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $lineno = $token->getLine(); $stream = $this->parser->getStream(); $name = $this->parser->getExpressionParser()->parseExpression(); $capture = false; - if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) { + if ($stream->test(\Twig_Token::OPERATOR_TYPE, '=')) { $stream->next(); $value = $this->parser->getExpressionParser()->parseExpression(); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); } else { $capture = true; - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); $value = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); } - return new phpbb_template_twig_node_definenode($capture, $name, $value, $lineno, $this->getTag()); + return new \phpbb\template\twig\node\definenode($capture, $name, $value, $lineno, $this->getTag()); } - public function decideBlockEnd(Twig_Token $token) + public function decideBlockEnd(\Twig_Token $token) { return $token->test('ENDDEFINE'); } diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php index e4dddd6dcc..7cf4000909 100644 --- a/phpBB/phpbb/template/twig/tokenparser/event.php +++ b/phpBB/phpbb/template/twig/tokenparser/event.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_event extends Twig_TokenParser +class event extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -25,14 +27,14 @@ class phpbb_template_twig_tokenparser_event extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); $stream = $this->parser->getStream(); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); } /** diff --git a/phpBB/phpbb/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php index 6c24dda647..7bf4c610b1 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includecss.php +++ b/phpBB/phpbb/template/twig/tokenparser/includecss.php @@ -7,7 +7,9 @@ * */ -class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser +namespace phpbb\template\twig\tokenparser; + +class includecss extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -16,14 +18,14 @@ class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); $stream = $this->parser->getStream(); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); } /** diff --git a/phpBB/phpbb/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php index b02b2f89ba..30a99f3279 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includejs.php +++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser +class includejs extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -25,14 +27,14 @@ class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); $stream = $this->parser->getStream(); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); } /** diff --git a/phpBB/phpbb/template/twig/tokenparser/includeparser.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php index 79c53630d0..715c0ec84d 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includeparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_includeparser extends Twig_TokenParser_Include +class includeparser extends \Twig_TokenParser_Include { /** * Parses a token and returns a node. @@ -25,13 +27,13 @@ class phpbb_template_twig_tokenparser_includeparser extends Twig_TokenParser_Inc * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); list($variables, $only, $ignoreMissing) = $this->parseArguments(); - return new phpbb_template_twig_node_includenode($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\includenode($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); } /** diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php index 13fe6de8a6..d906837590 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includephp.php +++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser +class includephp extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -25,23 +27,23 @@ class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $expr = $this->parser->getExpressionParser()->parseExpression(); $stream = $this->parser->getStream(); $ignoreMissing = false; - if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) { + if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore')) { $stream->next(); - $stream->expect(Twig_Token::NAME_TYPE, 'missing'); + $stream->expect(\Twig_Token::NAME_TYPE, 'missing'); $ignoreMissing = true; } - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag()); } /** diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php index 197980a59a..e4f70fb9b1 100644 --- a/phpBB/phpbb/template/twig/tokenparser/php.php +++ b/phpBB/phpbb/template/twig/tokenparser/php.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig\tokenparser; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_php extends Twig_TokenParser +class php extends \Twig_TokenParser { /** * Parses a token and returns a node. @@ -25,20 +27,20 @@ class phpbb_template_twig_tokenparser_php extends Twig_TokenParser * * @return Twig_NodeInterface A Twig_NodeInterface instance */ - public function parse(Twig_Token $token) + public function parse(\Twig_Token $token) { $stream = $this->parser->getStream(); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); $body = $this->parser->subparse(array($this, 'decideEnd'), true); - $stream->expect(Twig_Token::BLOCK_END_TYPE); + $stream->expect(\Twig_Token::BLOCK_END_TYPE); - return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); + return new \phpbb\template\twig\node\php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag()); } - public function decideEnd(Twig_Token $token) + public function decideEnd(\Twig_Token $token) { return $token->test('ENDPHP'); } diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 92a37d1634..2ba6f66a35 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -19,12 +21,12 @@ if (!defined('IN_PHPBB')) * Twig Template class. * @package phpBB3 */ -class phpbb_template_twig implements phpbb_template +class twig implements \phpbb\template\template { /** * Template context. * Stores template data used during template rendering. - * @var phpbb_template_context + * @var \phpbb\template\context */ protected $context; @@ -57,20 +59,20 @@ class phpbb_template_twig implements phpbb_template /** * phpBB config instance - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * Current user - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Extension manager. * - * @var phpbb_extension_manager + * @var \phpbb\extension\manager */ protected $extension_manager; @@ -103,13 +105,13 @@ class phpbb_template_twig implements phpbb_template * * @param string $phpbb_root_path phpBB root path * @param string $php_ext php extension (typically 'php') - * @param phpbb_config $config - * @param phpbb_user $user - * @param phpbb_template_context $context template context - * @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked + * @param \phpbb\config\config $config + * @param \phpbb\user $user + * @param \phpbb\template\context $context template context + * @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked * @param string $adm_relative_path relative path to adm directory */ - public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null) + public function __construct($phpbb_root_path, $php_ext, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null, $adm_relative_path = null) { $this->phpbb_root_path = $phpbb_root_path; $this->adm_relative_path = $adm_relative_path; @@ -122,9 +124,9 @@ class phpbb_template_twig implements phpbb_template $this->cachepath = $phpbb_root_path . 'cache/twig/'; // Initiate the loader, __main__ namespace paths will be setup later in set_style_names() - $loader = new Twig_Loader_Filesystem(''); + $loader = new \Twig_Loader_Filesystem(''); - $this->twig = new phpbb_template_twig_environment( + $this->twig = new \phpbb\template\twig\environment( $this->config, ($this->extension_manager) ? $this->extension_manager->all_enabled() : array(), $this->phpbb_root_path, @@ -138,13 +140,13 @@ class phpbb_template_twig implements phpbb_template ); $this->twig->addExtension( - new phpbb_template_twig_extension( + new \phpbb\template\twig\extension( $this->context, $this->user ) ); - $lexer = new phpbb_template_twig_lexer($this->twig); + $lexer = new \phpbb\template\twig\lexer($this->twig); $this->twig->setLexer($lexer); } @@ -152,7 +154,7 @@ class phpbb_template_twig implements phpbb_template /** * Clear the cache * - * @return phpbb_template + * @return \phpbb\template\template */ public function clear_cache() { @@ -168,7 +170,7 @@ class phpbb_template_twig implements phpbb_template * Sets the template filenames for handles. * * @param array $filename_array Should be a hash of handle => filename pairs. - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function set_filenames(array $filename_array) { @@ -185,7 +187,7 @@ class phpbb_template_twig implements phpbb_template * @param array $style_paths List of style paths in inheritance tree order * @param bool $is_core True if the style names are the "core" styles for this page load * Core means the main phpBB template files - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function set_style_names(array $style_names, array $style_paths, $is_core = false) { @@ -194,7 +196,7 @@ class phpbb_template_twig implements phpbb_template // Set as __main__ namespace $this->twig->getLoader()->setPaths($style_paths); - // Core style namespace from phpbb_style::set_style() + // Core style namespace from \phpbb\style\style::set_style() if ($is_core) { $this->twig->getLoader()->setPaths($style_paths, 'core'); @@ -207,7 +209,7 @@ class phpbb_template_twig implements phpbb_template } // Add all namespaces for all extensions - if ($this->extension_manager instanceof phpbb_extension_manager) + if ($this->extension_manager instanceof \phpbb\extension\manager) { $style_names[] = 'all'; @@ -237,7 +239,7 @@ class phpbb_template_twig implements phpbb_template /** * Clears all variables and blocks assigned to this template. * - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function destroy() { @@ -250,7 +252,7 @@ class phpbb_template_twig implements phpbb_template * Reset/empty complete block * * @param string $blockname Name of block to destroy - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function destroy_block_vars($blockname) { @@ -267,7 +269,7 @@ class phpbb_template_twig implements phpbb_template * This function calls hooks. * * @param string $handle Handle to display - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function display($handle) { @@ -311,7 +313,7 @@ class phpbb_template_twig implements phpbb_template * @param string $handle Handle to operate on * @param string $template_var Template variable to assign compiled handle to * @param bool $return_content If true return compiled handle, otherwise assign to $template_var - * @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this + * @return \phpbb\template\template|string if $return_content is true return string of the compiled handle, otherwise return $this */ public function assign_display($handle, $template_var = '', $return_content = true) { @@ -329,7 +331,7 @@ class phpbb_template_twig implements phpbb_template * Assign key variable pairs from an array * * @param array $vararray A hash of variable name => value pairs - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_vars(array $vararray) { @@ -348,7 +350,7 @@ class phpbb_template_twig implements phpbb_template * * @param string $varname Variable name * @param string $varval Value to assign to variable - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_var($varname, $varval) { @@ -364,7 +366,7 @@ class phpbb_template_twig implements phpbb_template * * @param string $varname Variable name * @param string $varval Value to append to variable - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function append_var($varname, $varval) { @@ -377,7 +379,7 @@ class phpbb_template_twig implements phpbb_template * Assign key variable pairs from an array to a specified block * @param string $blockname Name of block to assign $vararray to * @param array $vararray A hash of variable name => value pairs - * @return phpbb_template $this + * @return \phpbb\template\template $this */ public function assign_block_vars($blockname, array $vararray) { @@ -406,7 +408,7 @@ class phpbb_template_twig implements phpbb_template * @param string $mode Mode to execute (valid modes are 'insert' and 'change') * * If insert, the vararray is inserted at the given position (position counting from zero). - * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value). + * If change, the current block gets merged with the vararray (resulting in new \key/value pairs be added and existing keys be replaced by the new \value). * * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars) @@ -431,7 +433,7 @@ class phpbb_template_twig implements phpbb_template $context_vars['.'][0], // To get normal vars $context_vars, // To get loops array( - 'definition' => new phpbb_template_twig_definition(), + 'definition' => new \phpbb\template\twig\definition(), 'user' => $this->user, ) ); diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php index 79853eeaa1..171dae4d14 100644 --- a/phpBB/phpbb/tree/nestedset.php +++ b/phpBB/phpbb/tree/nestedset.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\tree; + /** * @ignore */ @@ -15,12 +17,12 @@ if (!defined('IN_PHPBB')) exit; } -abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface +abstract class nestedset implements \phpbb\tree\tree_interface { - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db; - /** @var phpbb_lock_db */ + /** @var \phpbb\lock\db */ protected $lock; /** @var string */ @@ -58,15 +60,15 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface /** * Construct * - * @param phpbb_db_driver $db Database connection - * @param phpbb_lock_db $lock Lock class used to lock the table when moving forums around + * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around * @param string $table_name Table name * @param string $message_prefix Prefix for the messages thrown by exceptions * @param string $sql_where Additional SQL restrictions for the queries * @param array $item_basic_data Array with basic item data that is stored in item_parents * @param array $columns Array with column names to overwrite */ - public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array()) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array()) { $this->db = $db; $this->lock = $lock; @@ -116,7 +118,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!$this->lock->acquire()) { - throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE'); + throw new \RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE'); } return true; @@ -184,7 +186,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface $item_id = (int) $item_id; if (!$item_id) { - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $items = $this->get_subtree_data($item_id); @@ -192,7 +194,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (empty($items) || !isset($items[$item_id])) { - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $this->remove_subset($item_ids, $items[$item_id]); @@ -242,7 +244,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!$item) { $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } /** @@ -364,7 +366,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!$current_parent_id) { - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $this->acquire_lock(); @@ -373,7 +375,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!isset($item_data[$current_parent_id])) { $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $current_parent = $item_data[$current_parent_id]; @@ -389,7 +391,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (in_array($new_parent_id, $move_items)) { $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); } $diff = sizeof($move_items) * 2; @@ -413,7 +415,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface { $this->db->sql_transaction('rollback'); $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); } $new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true); @@ -470,7 +472,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!$item_id) { - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $this->acquire_lock(); @@ -479,7 +481,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (!isset($item_data[$item_id])) { $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); } $item = $item_data[$item_id]; @@ -488,7 +490,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface if (in_array($new_parent_id, $move_items)) { $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); } $diff = sizeof($move_items) * 2; @@ -512,7 +514,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_tree_interface { $this->db->sql_transaction('rollback'); $this->lock->release(); - throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); + throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); } $new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true); diff --git a/phpBB/phpbb/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php index ff09ef55d0..2fee5b097e 100644 --- a/phpBB/phpbb/tree/nestedset_forum.php +++ b/phpBB/phpbb/tree/nestedset_forum.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\tree; + /** * @ignore */ @@ -15,16 +17,16 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset +class nestedset_forum extends \phpbb\tree\nestedset { /** * Construct * - * @param phpbb_db_driver $db Database connection - * @param phpbb_lock_db $lock Lock class used to lock the table when moving forums around + * @param \phpbb\db\driver\driver $db Database connection + * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around * @param string $table_name Table name */ - public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name) { parent::__construct( $db, diff --git a/phpBB/phpbb/tree/tree_interface.php b/phpBB/phpbb/tree/tree_interface.php index 80d3c4377c..b0a1e08ec6 100644 --- a/phpBB/phpbb/tree/tree_interface.php +++ b/phpBB/phpbb/tree/tree_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\tree; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -interface phpbb_tree_tree_interface +interface tree_interface { /** * Inserts an item into the database table and into the tree. @@ -67,7 +69,7 @@ interface phpbb_tree_tree_interface /** * Moves all children of one item to another item * - * If the new parent already has children, the new children are appended + * If the new parent already has children, the new \children are appended * to the list. * * @param int $current_parent_id The current parent item @@ -79,7 +81,7 @@ interface phpbb_tree_tree_interface /** * Change parent item * - * Moves the item to the bottom of the new parent's list of children + * Moves the item to the bottom of the new \parent's list of children * * @param int $item_id The item to be moved * @param int $new_parent_id The new parent item diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 5530fe3f03..5a9aa21e8a 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * @ignore */ @@ -23,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_user extends phpbb_session +class user extends \phpbb\session { var $lang = array(); var $help = array(); @@ -41,7 +43,7 @@ class phpbb_user extends phpbb_session var $img_lang; var $img_array = array(); - // Able to add new options (up to id 31) + // Able to add new \options (up to id 31) var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17); /** @@ -151,12 +153,12 @@ class phpbb_user extends phpbb_session try { - $this->timezone = new DateTimeZone($user_timezone); + $this->timezone = new \DateTimeZone($user_timezone); } - catch (Exception $e) + catch (\Exception $e) { // If the timezone the user has selected is invalid, we fall back to UTC. - $this->timezone = new DateTimeZone('UTC'); + $this->timezone = new \DateTimeZone('UTC'); } // We include common language file here to not load it every time a custom language file is included @@ -649,27 +651,27 @@ class phpbb_user extends phpbb_session if (!isset($utc)) { - $utc = new DateTimeZone('UTC'); + $utc = new \DateTimeZone('UTC'); } - $time = new phpbb_datetime($this, "@$gmepoch", $utc); + $time = new \phpbb\datetime($this, "@$gmepoch", $utc); $time->setTimezone($this->timezone); return $time->format($format, $forcedate); } /** - * Create a phpbb_datetime object in the context of the current user + * Create a \phpbb\datetime object in the context of the current user * * @since 3.1 * @param string $time String in a format accepted by strtotime(). * @param DateTimeZone $timezone Time zone of the time. - * @return phpbb_datetime Date time object linked to the current users locale + * @return \phpbb\datetime Date time object linked to the current users locale */ - public function create_datetime($time = 'now', DateTimeZone $timezone = null) + public function create_datetime($time = 'now', \DateTimeZone $timezone = null) { $timezone = $timezone ?: $this->timezone; - return new phpbb_datetime($this, $time, $timezone); + return new \phpbb\datetime($this, $time, $timezone); } /** @@ -680,10 +682,10 @@ class phpbb_user extends phpbb_session * @param DateTimeZone $timezone Timezone of the date/time, falls back to timezone of current user * @return int Returns the unix timestamp */ - public function get_timestamp_from_format($format, $time, DateTimeZone $timezone = null) + public function get_timestamp_from_format($format, $time, \DateTimeZone $timezone = null) { $timezone = $timezone ?: $this->timezone; - $date = DateTime::createFromFormat($format, $time, $timezone); + $date = \DateTime::createFromFormat($format, $time, $timezone); return ($date !== false) ? $date->format('U') : false; } diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 37bf9648c1..78620ab1b9 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** */ if (!defined('IN_PHPBB')) @@ -22,9 +24,9 @@ if (!defined('IN_PHPBB')) * have to query the same user multiple times in * different services. */ -class phpbb_user_loader +class user_loader { - /** @var phpbb_db_driver */ + /** @var \phpbb\db\driver\driver */ protected $db = null; /** @var string */ @@ -46,12 +48,12 @@ class phpbb_user_loader /** * User loader constructor * - * @param phpbb_db_driver $db A database connection + * @param \phpbb\db\driver\driver $db A database connection * @param string $phpbb_root_path Path to the phpbb includes directory. * @param string $php_ext php file extension * @param string $users_table The name of the database table (phpbb_users) */ - public function __construct(phpbb_db_driver $db, $phpbb_root_path, $php_ext, $users_table) + public function __construct(\phpbb\db\driver\driver $db, $phpbb_root_path, $php_ext, $users_table) { $this->db = $db; diff --git a/phpBB/posting.php b/phpBB/posting.php index f9d5295320..942821a233 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -697,7 +697,7 @@ if ($submit || $preview || $refresh) $message_parser->message = utf8_normalize_nfc(request_var('message', '', true)); $post_data['username'] = utf8_normalize_nfc(request_var('username', $post_data['username'], true)); - $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, phpbb_request_request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc(request_var('edit_reason', '', true)) : ''; + $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, \phpbb\request\request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc(request_var('edit_reason', '', true)) : ''; $post_data['orig_topic_type'] = $post_data['topic_type']; $post_data['topic_type'] = request_var('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL)); diff --git a/phpBB/search.php b/phpBB/search.php index 6da74b954f..fe6535c3d1 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -683,7 +683,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($config['load_anon_lastread'] || ($user->data['is_registered'] && !$config['load_db_lastread'])) { - $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_request_interface::COOKIE); + $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, \phpbb\request\request_interface::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } diff --git a/phpBB/ucp.php b/phpBB/ucp.php index b1e576fee8..ee0584c081 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -139,9 +139,9 @@ switch ($mode) { $set_time = time() - 31536000; - foreach ($request->variable_names(phpbb_request_request_interface::COOKIE) as $cookie_name) + foreach ($request->variable_names(\phpbb\request\request_interface::COOKIE) as $cookie_name) { - $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_request_interface::COOKIE); + $cookie_data = $request->variable($cookie_name, '', true, \phpbb\request\request_interface::COOKIE); // Only delete board cookies, no other ones... if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 5a59e021b3..e991f9dba8 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -191,7 +191,7 @@ if ($mark_read == 'topics') 'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TEXT' => $user->lang['TOPICS_MARKED'] ); - $json_response = new phpbb_json_response(); + $json_response = new \phpbb\json_response(); $json_response->send($data); } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index fb4fcf42bf..d3581b5fa2 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -716,9 +716,9 @@ if (!empty($topic_data['poll_start'])) // Cookie based guest tracking ... I don't like this but hum ho // it's oft requested. This relies on "nice" users who don't feel // the need to delete cookies to mess with results. - if ($request->is_set($config['cookie_name'] . '_poll_' . $topic_id, phpbb_request_request_interface::COOKIE)) + if ($request->is_set($config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE)) { - $cur_voted_id = explode(',', $request->variable($config['cookie_name'] . '_poll_' . $topic_id, '', true, phpbb_request_request_interface::COOKIE)); + $cur_voted_id = explode(',', $request->variable($config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE)); $cur_voted_id = array_map('intval', $cur_voted_id); } } diff --git a/tests/acp_board/auth_provider/valid.php b/tests/acp_board/auth_provider/valid.php index 42b14cb0af..cfc3c24833 100644 --- a/tests/acp_board/auth_provider/valid.php +++ b/tests/acp_board/auth_provider/valid.php @@ -7,7 +7,7 @@ * */ -class phpbb_auth_provider_acp_board_valid extends phpbb_auth_provider_base +class phpbb_auth_provider_acp_board_valid extends \phpbb\auth\provider\base { public function login($username, $password) { diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 9aa5f676d1..e135a1f002 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -22,11 +22,11 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case global $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array()); - $this->request = $this->getMock('phpbb_request'); - $this->user = $this->getMock('phpbb_user'); + $config = new \phpbb\config\config(array()); + $this->request = $this->getMock('\phpbb\request\request'); + $this->user = $this->getMock('\phpbb\user'); - $this->provider = new phpbb_auth_provider_apache($db, $config, $this->request, $this->user, $phpbb_root_path, $phpEx); + $this->provider = new \phpbb\auth\provider\apache($db, $config, $this->request, $this->user, $phpbb_root_path, $phpEx); } public function getDataSet() @@ -43,7 +43,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_request_interface::SERVER) + \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->once()) ->method('server') @@ -61,7 +61,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_request_interface::SERVER) + \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->at(1)) ->method('server') @@ -93,7 +93,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_request_interface::SERVER) + \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->at(1)) ->method('server') @@ -194,7 +194,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $this->request->expects($this->once()) ->method('is_set') ->with('PHP_AUTH_USER', - phpbb_request_request_interface::SERVER) + \phpbb\request\request_interface::SERVER) ->will($this->returnValue(true)); $this->request->expects($this->once()) ->method('server') diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index d876683f84..140a28cd3d 100644 --- a/tests/auth/provider_db_test.php +++ b/tests/auth/provider_db_test.php @@ -21,14 +21,14 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case global $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array( + $config = new \phpbb\config\config(array( 'ip_login_limit_max' => 0, 'ip_login_limit_use_forwarded' => 0, 'max_login_attempts' => 0, )); - $request = $this->getMock('phpbb_request'); - $user = $this->getMock('phpbb_user'); - $provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + $request = $this->getMock('\phpbb\request\request'); + $user = $this->getMock('\phpbb\user'); + $provider = new \phpbb\auth\provider\db($db, $config, $request, $user, $phpbb_root_path, $phpEx); $expected = array( 'status' => LOGIN_SUCCESS, diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php index 0b701a4d70..12a3943d6c 100644 --- a/tests/avatar/driver/barfoo.php +++ b/tests/avatar/driver/barfoo.php @@ -1,6 +1,6 @@ will($this->returnArgument(0)); // Prepare dependencies for avatar manager and driver - $config = new phpbb_config(array()); - $request = $this->getMock('phpbb_request'); - $cache = $this->getMock('phpbb_cache_driver_driver_interface'); + $config = new \phpbb\config\config(array()); + $request = $this->getMock('\phpbb\request\request'); + $cache = $this->getMock('\phpbb\cache\driver\driver_interface'); // $this->avatar_foobar will be needed later on $this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); @@ -52,7 +52,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase $config['allow_avatar_' . get_class($this->avatar_barfoo)] = false; // Set up avatar manager - $this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container); + $this->manager = new \phpbb\avatar\manager($config, $avatar_drivers, $this->phpbb_container); } protected function avatar_drivers() @@ -203,7 +203,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase { $cleaned_row = array(); - $cleaned_row = phpbb_avatar_manager::clean_row($input); + $cleaned_row = \phpbb\avatar\manager::clean_row($input); foreach ($output as $key => $null) { $this->assertArrayHasKey($key, $cleaned_row); @@ -222,7 +222,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase public function test_localize_errors() { - $user = $this->getMock('phpbb_user'); + $user = $this->getMock('\phpbb\user'); $lang_array = array( array('FOOBAR_OFF', 'foobar_off'), array('FOOBAR_EXPLAIN', 'FOOBAR_EXPLAIN %s'), diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php index 3380762878..51f3ac24b6 100644 --- a/tests/cache/apc_driver_test.php +++ b/tests/cache/apc_driver_test.php @@ -30,7 +30,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case self::markTestSkipped('APC extension is not loaded'); } - $php_ini = new phpbb_php_ini; + $php_ini = new \phpbb\php\ini; if (!$php_ini->get_bool('apc.enabled')) { @@ -47,7 +47,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case { parent::setUp(); - $this->driver = new phpbb_cache_driver_apc; + $this->driver = new \phpbb\cache\driver\apc; $this->driver->purge(); } } diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php index a5bc2bfda9..09190abc95 100644 --- a/tests/cache/common_test_case.php +++ b/tests/cache/common_test_case.php @@ -65,11 +65,11 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $db = $this->new_dbal(); - $cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); @@ -77,16 +77,16 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case $expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); $this->assertEquals($expected, $first_result); - $sql = 'DELETE FROM phpbb_config'; + $sql = 'DELETE FROM \phpbb\config\config'; $result = $db->sql_query($sql); - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); $this->assertEquals($expected, $db->sql_fetchrow($result)); - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql); diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index 745c6bb081..c0843e8ed9 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -36,7 +36,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case } $this->create_cache_dir(); - $this->driver = new phpbb_cache_driver_file($this->cache_dir); + $this->driver = new \phpbb\cache\driver\file($this->cache_dir); } protected function tearDown() diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php index 43a0cc806c..ce78f333dd 100644 --- a/tests/cache/null_driver_test.php +++ b/tests/cache/null_driver_test.php @@ -20,7 +20,7 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case { parent::setUp(); - $this->driver = new phpbb_cache_driver_null; + $this->driver = new \phpbb\cache\driver\null; } public function test_get_put() @@ -48,23 +48,23 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $db = $this->new_dbal(); - $cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); $first_result = $db->sql_fetchrow($result); $expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); $this->assertEquals($expected, $first_result); - $sql = 'DELETE FROM phpbb_config'; + $sql = 'DELETE FROM \phpbb\config\config'; $result = $db->sql_query($sql); // As null cache driver does not actually cache, // this should return no results - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php index 1308519a18..3d954dc0db 100644 --- a/tests/cache/redis_driver_test.php +++ b/tests/cache/redis_driver_test.php @@ -43,7 +43,7 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case { parent::setUp(); - $this->driver = new phpbb_cache_driver_redis(self::$config['host'], self::$config['port']); + $this->driver = new \phpbb\cache\driver\redis(self::$config['host'], self::$config['port']); $this->driver->purge(); } } diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index 2b55c1ff8d..19f9280ec1 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -30,7 +30,7 @@ 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/'; @@ -71,8 +71,8 @@ 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 . '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/'; diff --git a/tests/config/config_test.php b/tests/config/config_test.php index 5845cc4590..5373fcef5f 100644 --- a/tests/config/config_test.php +++ b/tests/config/config_test.php @@ -11,7 +11,7 @@ class phpbb_config_test extends phpbb_test_case { public function test_offset_exists() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $this->assertTrue(isset($config['foo'])); $this->assertFalse(isset($config['foobar'])); @@ -19,19 +19,19 @@ class phpbb_config_test extends phpbb_test_case public function test_offset_get() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $this->assertEquals('bar', $config['foo']); } public function test_offset_get_missing() { - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $this->assertEquals('', $config['foo']); } public function test_offset_set() { - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $config['foo'] = 'x'; $this->assertEquals('x', $config['foo']); } @@ -39,20 +39,20 @@ class phpbb_config_test extends phpbb_test_case public function test_offset_unset_fails() { $this->setExpectedTriggerError(E_USER_ERROR); - $config = new phpbb_config(array('foo' => 'x')); + $config = new \phpbb\config\config(array('foo' => 'x')); unset($config['foo']); } public function test_count() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $this->assertEquals(1, count($config)); } public function test_iterate() { $vars = array('foo' => '23', 'bar' => '42'); - $config = new phpbb_config($vars); + $config = new \phpbb\config\config($vars); $count = 0; foreach ($config as $key => $value) @@ -68,42 +68,42 @@ class phpbb_config_test extends phpbb_test_case public function test_set_overwrite() { - $config = new phpbb_config(array('foo' => 'x')); + $config = new \phpbb\config\config(array('foo' => 'x')); $config->set('foo', 'bar'); $this->assertEquals('bar', $config['foo']); } public function test_set_new() { - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $config->set('foo', 'bar'); $this->assertEquals('bar', $config['foo']); } public function test_set_atomic_overwrite() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $this->assertTrue($config->set_atomic('foo', 'bar', '23')); $this->assertEquals('23', $config['foo']); } public function test_set_atomic_new() { - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $this->assertTrue($config->set_atomic('foo', false, '23')); $this->assertEquals('23', $config['foo']); } public function test_set_atomic_failure() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $this->assertFalse($config->set_atomic('foo', 'wrong', '23')); $this->assertEquals('bar', $config['foo']); } public function test_increment() { - $config = new phpbb_config(array('foo' => '23')); + $config = new \phpbb\config\config(array('foo' => '23')); $config->increment('foo', 3); $this->assertEquals(26, $config['foo']); $config->increment('foo', 1); @@ -112,7 +112,7 @@ class phpbb_config_test extends phpbb_test_case public function test_delete() { - $config = new phpbb_config(array('foo' => 'bar')); + $config = new \phpbb\config\config(array('foo' => 'bar')); $config->delete('foo'); $this->assertFalse(isset($config['foo'])); diff --git a/tests/config/db_test.php b/tests/config/db_test.php index 0b8f73d53a..a014c72c65 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -24,7 +24,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->cache = new phpbb_mock_cache; $this->db = $this->new_dbal(); - $this->config = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $this->config = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); } public function test_load_config() @@ -36,7 +36,7 @@ class phpbb_config_db_test extends phpbb_database_test_case public function test_load_cached() { $cache = new phpbb_mock_cache(array('config' => array('x' => 'y'))); - $this->config = new phpbb_config_db($this->db, $cache, 'phpbb_config'); + $this->config = new \phpbb\config\db($this->db, $cache, '\phpbb\config\config'); $this->assertTrue(!isset($this->config['foo'])); $this->assertEquals('42', $this->config['bar']); @@ -49,7 +49,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config['foo'] = 'x'; // temporary set $this->assertEquals('x', $this->config['foo']); - $config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); $this->assertEquals('23', $config2['foo']); } @@ -59,7 +59,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('17', $this->config['foo']); // re-read config and populate cache - $config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); $this->cache->checkVar($this, 'config', array('foo' => '17')); } @@ -68,7 +68,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config->set('bar', '17', false); // re-read config and populate cache - $config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); $this->cache->checkVar($this, 'config', array('foo' => '23')); } @@ -78,7 +78,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('5', $this->config['foobar']); // re-read config and populate cache - $config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); $this->cache->checkVar($this, 'config', array('foo' => '23', 'foobar' => '5')); } @@ -88,7 +88,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('5', $this->config['foobar']); // re-read config and populate cache - $config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); $this->cache->checkVar($this, 'config', array('foo' => '23')); } @@ -133,7 +133,7 @@ class phpbb_config_db_test extends phpbb_database_test_case // re-read config and populate cache $cache2 = new phpbb_mock_cache; - $config2 = new phpbb_config_db($this->db, $cache2, 'phpbb_config'); + $config2 = new \phpbb\config\db($this->db, $cache2, '\phpbb\config\config'); $cache2->checkVarUnset($this, 'foo'); $this->assertFalse(isset($config2['foo'])); } diff --git a/tests/config/db_text_test.php b/tests/config/db_text_test.php index 4818bba8c9..354c0efacf 100644 --- a/tests/config/db_text_test.php +++ b/tests/config/db_text_test.php @@ -22,7 +22,7 @@ class phpbb_config_db_text_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->config_text = new phpbb_config_db_text($this->db, 'phpbb_config_text'); + $this->config_text = new \phpbb\config\db_text($this->db, 'phpbb_config_text'); } public function test_get() diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php index 6234aac9ad..b2bdcb3b49 100644 --- a/tests/content_visibility/delete_post_test.php +++ b/tests/content_visibility/delete_post_test.php @@ -267,21 +267,21 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case $config['search_type'] = 'phpbb_mock_search'; $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - set_config_count(null, null, null, new phpbb_config(array('num_posts' => 3, 'num_topics' => 1))); + set_config_count(null, null, null, new \phpbb\config\config(array('num_posts' => 3, 'num_topics' => 1))); // Create auth mock - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_get') ->with($this->stringContains('_'), $this->anything()) ->will($this->returnValueMap(array( array('m_approve', 1, true), ))); - $user = $this->getMock('phpbb_user'); + $user = $this->getMock('\phpbb\user'); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); - $phpbb_container->set('content.visibility', new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); + $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason); diff --git a/tests/content_visibility/get_forums_visibility_sql_test.php b/tests/content_visibility/get_forums_visibility_sql_test.php index aa44fa4013..22f210c406 100644 --- a/tests/content_visibility/get_forums_visibility_sql_test.php +++ b/tests/content_visibility/get_forums_visibility_sql_test.php @@ -125,13 +125,13 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data $db = $this->new_dbal(); // Create auth mock - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_getf') ->with($this->stringContains('_'), $this->anything()) ->will($this->returnValueMap($permissions)); - $user = $this->getMock('phpbb_user'); - $content_visibility = new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); + $user = $this->getMock('\phpbb\user'); + $content_visibility = new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); $result = $db->sql_query('SELECT ' . $mode . '_id FROM ' . $table . ' diff --git a/tests/content_visibility/get_global_visibility_sql_test.php b/tests/content_visibility/get_global_visibility_sql_test.php index 0f019ffa50..9488a8c0b3 100644 --- a/tests/content_visibility/get_global_visibility_sql_test.php +++ b/tests/content_visibility/get_global_visibility_sql_test.php @@ -125,13 +125,13 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data $db = $this->new_dbal(); // Create auth mock - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_getf') ->with($this->stringContains('_'), $this->anything()) ->will($this->returnValueMap($permissions)); - $user = $this->getMock('phpbb_user'); - $content_visibility = new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); + $user = $this->getMock('\phpbb\user'); + $content_visibility = new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); $result = $db->sql_query('SELECT ' . $mode . '_id FROM ' . $table . ' diff --git a/tests/content_visibility/get_visibility_sql_test.php b/tests/content_visibility/get_visibility_sql_test.php index cc6c10c649..111e735650 100644 --- a/tests/content_visibility/get_visibility_sql_test.php +++ b/tests/content_visibility/get_visibility_sql_test.php @@ -72,13 +72,13 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te $db = $this->new_dbal(); // Create auth mock - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_get') ->with($this->stringContains('_'), $this->anything()) ->will($this->returnValueMap($permissions)); - $user = $this->getMock('phpbb_user'); - $content_visibility = new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); + $user = $this->getMock('\phpbb\user'); + $content_visibility = new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); $result = $db->sql_query('SELECT ' . $mode . '_id FROM ' . $table . ' diff --git a/tests/content_visibility/set_post_visibility_test.php b/tests/content_visibility/set_post_visibility_test.php index 81abf56c75..f81b83ff86 100644 --- a/tests/content_visibility/set_post_visibility_test.php +++ b/tests/content_visibility/set_post_visibility_test.php @@ -119,9 +119,9 @@ class phpbb_content_visibility_set_post_visibility_test extends phpbb_database_t $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $auth = $this->getMock('phpbb_auth'); - $user = $this->getMock('phpbb_user'); - $content_visibility = new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); + $auth = $this->getMock('\phpbb\auth\auth'); + $user = $this->getMock('\phpbb\user'); + $content_visibility = new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); $content_visibility->set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest); diff --git a/tests/content_visibility/set_topic_visibility_test.php b/tests/content_visibility/set_topic_visibility_test.php index 6b5d884a2b..92b1253a15 100644 --- a/tests/content_visibility/set_topic_visibility_test.php +++ b/tests/content_visibility/set_topic_visibility_test.php @@ -83,9 +83,9 @@ class phpbb_content_visibility_set_topic_visibility_test extends phpbb_database_ $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $auth = $this->getMock('phpbb_auth'); - $user = $this->getMock('phpbb_user'); - $content_visibility = new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); + $auth = $this->getMock('\phpbb\auth\auth'); + $user = $this->getMock('\phpbb\user'); + $content_visibility = new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE); $content_visibility->set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all); diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index dfc4f80469..9445ea53d4 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -31,7 +31,7 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_provider() { - $provider = new phpbb_controller_provider; + $provider = new \phpbb\controller\provider; $routes = $provider ->import_paths_from_finder($this->extension_manager->get_finder()) ->find('./tests/controller/'); @@ -62,7 +62,7 @@ class phpbb_controller_controller_test extends phpbb_test_case include(__DIR__.'/phpbb/controller/foo.php'); } - $resolver = new phpbb_controller_resolver(new phpbb_user, $container); + $resolver = new \phpbb\controller\resolver(new \phpbb\user, $container); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 6686b77e8f..d5d61d40d9 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -48,14 +48,14 @@ class phpbb_controller_helper_url_test extends phpbb_test_case global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $this->style_resource_locator = new phpbb_style_resource_locator(); - $this->user = $this->getMock('phpbb_user'); - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context()); - $this->style_resource_locator = new phpbb_style_resource_locator(); - $this->style_provider = new phpbb_style_path_provider(); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, new phpbb_config(array()), $this->user, $this->style_resource_locator, $this->style_provider, $this->template); + $this->style_resource_locator = new \phpbb\style\resource_locator(); + $this->user = $this->getMock('\phpbb\user'); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $this->user, new \phpbb\template\context()); + $this->style_resource_locator = new \phpbb\style\resource_locator(); + $this->style_provider = new \phpbb\style\path_provider(); + $this->style = new \phpbb\style\style($phpbb_root_path, $phpEx, new \phpbb\config\config(array()), $this->user, $this->style_resource_locator, $this->style_provider, $this->template); - $helper = new phpbb_controller_helper($this->template, $this->user, '', 'php'); + $helper = new \phpbb\controller\helper($this->template, $this->user, '', 'php'); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); } } diff --git a/tests/cron/ext/testext/cron/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php index 3e81db1895..8cdb6b09d5 100644 --- a/tests/cron/ext/testext/cron/dummy_task.php +++ b/tests/cron/ext/testext/cron/dummy_task.php @@ -7,7 +7,7 @@ * */ -class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base +class phpbb_ext_testext_cron_dummy_task extends \phpbb\cron\task\base { static public $was_run = 0; diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php index c94455603f..c34684701b 100644 --- a/tests/cron/includes/cron/task/core/dummy_task.php +++ b/tests/cron/includes/cron/task/core/dummy_task.php @@ -7,7 +7,7 @@ * */ -class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base +class phpbb_cron_task_core_dummy_task extends \phpbb\cron\task\base { static public $was_run = 0; diff --git a/tests/cron/includes/cron/task/core/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php index 77ef6f70ed..1b212ab05d 100644 --- a/tests/cron/includes/cron/task/core/second_dummy_task.php +++ b/tests/cron/includes/cron/task/core/second_dummy_task.php @@ -7,7 +7,7 @@ * */ -class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base +class phpbb_cron_task_core_second_dummy_task extends \phpbb\cron\task\base { static public $was_run = 0; diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php index 3c541be2a6..713f44c1e2 100644 --- a/tests/cron/manager_test.php +++ b/tests/cron/manager_test.php @@ -29,7 +29,7 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase public function test_manager_finds_shipped_task_by_name() { $task = $this->manager->find_task($this->task_name); - $this->assertInstanceOf('phpbb_cron_task_wrapper', $task); + $this->assertInstanceOf('\phpbb\cron\task\wrapper', $task); $this->assertEquals($this->task_name, $task->get_name()); } @@ -42,7 +42,7 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase public function test_manager_finds_one_ready_task() { $task = $this->manager->find_one_ready_task(); - $this->assertInstanceOf('phpbb_cron_task_wrapper', $task); + $this->assertInstanceOf('\phpbb\cron\task\wrapper', $task); } public function test_manager_finds_only_ready_tasks() @@ -71,6 +71,6 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase { global $phpbb_root_path, $phpEx; - return new phpbb_cron_manager($tasks, $phpbb_root_path, $phpEx); + return new \phpbb\cron\manager($tasks, $phpbb_root_path, $phpEx); } } diff --git a/tests/cron/tasks/simple_not_runnable.php b/tests/cron/tasks/simple_not_runnable.php index 56d484eacd..4951b5b4b9 100644 --- a/tests/cron/tasks/simple_not_runnable.php +++ b/tests/cron/tasks/simple_not_runnable.php @@ -1,6 +1,6 @@ timezone = new DateTimeZone($timezone); $user->lang['datetime'] = array( 'TODAY' => 'Today', diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php index 077bfad933..2196292e83 100644 --- a/tests/dbal/auto_increment_test.php +++ b/tests/dbal/auto_increment_test.php @@ -26,7 +26,7 @@ class phpbb_dbal_auto_increment_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->tools = new phpbb_db_tools($this->db); + $this->tools = new \phpbb\db\tools($this->db); $this->table_data = array( 'COLUMNS' => array( diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php index 57a1729a39..edab3525a1 100644 --- a/tests/dbal/case_test.php +++ b/tests/dbal/case_test.php @@ -19,13 +19,13 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case('1 = 1', '1', '2') . ' AS test_num - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals(1, (int) $db->sql_fetchfield('test_num')); $sql = 'SELECT ' . $db->sql_case('1 = 0', '1', '2') . ' AS test_num - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals(2, (int) $db->sql_fetchfield('test_num')); @@ -36,13 +36,13 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case('1 = 1', "'foo'", "'bar'") . ' AS test_string - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('foo', $db->sql_fetchfield('test_string')); $sql = 'SELECT ' . $db->sql_case('1 = 0', "'foo'", "'bar'") . ' AS test_string - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('bar', $db->sql_fetchfield('test_string')); @@ -53,14 +53,14 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string - FROM phpbb_config + FROM \phpbb\config\config WHERE config_name = 'config1'"; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('config1', $db->sql_fetchfield('test_string')); $sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string - FROM phpbb_config + FROM \phpbb\config\config WHERE config_value = 'bar'"; $result = $db->sql_query_limit($sql, 1); diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php index 0891fa58a0..818bde7d23 100644 --- a/tests/dbal/concatenate_test.php +++ b/tests/dbal/concatenate_test.php @@ -19,7 +19,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', "'" . $db->sql_escape('append') . "'") . ' AS string - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query($sql); $db->sql_return_on_error(false); @@ -43,7 +43,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', 'config_value') . ' AS string - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query($sql); $db->sql_return_on_error(false); diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php index 7bdbc696e7..e25335165a 100644 --- a/tests/dbal/db_tools_test.php +++ b/tests/dbal/db_tools_test.php @@ -26,7 +26,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->tools = new phpbb_db_tools($this->db); + $this->tools = new \phpbb\db\tools($this->db); $this->table_data = array( 'COLUMNS' => array( @@ -254,7 +254,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case public function test_peform_schema_changes_drop_tables() { - $db_tools = $this->getMock('phpbb_db_tools', array( + $db_tools = $this->getMock('\phpbb\db\tools', array( 'sql_table_exists', 'sql_table_drop', ), array(&$this->db)); @@ -280,7 +280,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case public function test_peform_schema_changes_drop_columns() { - $db_tools = $this->getMock('phpbb_db_tools', array( + $db_tools = $this->getMock('\phpbb\db\tools', array( 'sql_column_exists', 'sql_column_remove', ), array(&$this->db)); diff --git a/tests/dbal/migration/dummy.php b/tests/dbal/migration/dummy.php index 0ac6e733a1..3f48f22252 100644 --- a/tests/dbal/migration/dummy.php +++ b/tests/dbal/migration/dummy.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_dummy extends phpbb_db_migration +class phpbb_dbal_migration_dummy extends \phpbb\db\migration\migration { static public function depends_on() { @@ -18,7 +18,7 @@ class phpbb_dbal_migration_dummy extends phpbb_db_migration { return array( 'add_columns' => array( - 'phpbb_config' => array( + '\phpbb\config\config' => array( 'extra_column' => array('UINT', 1), ), ), diff --git a/tests/dbal/migration/fail.php b/tests/dbal/migration/fail.php index f88d8169f5..d90972720d 100644 --- a/tests/dbal/migration/fail.php +++ b/tests/dbal/migration/fail.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_fail extends phpbb_db_migration +class phpbb_dbal_migration_fail extends \phpbb\db\migration\migration { function update_schema() { diff --git a/tests/dbal/migration/if.php b/tests/dbal/migration/if.php index 83fe21bd21..bbbda60ea3 100644 --- a/tests/dbal/migration/if.php +++ b/tests/dbal/migration/if.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_if extends phpbb_db_migration +class phpbb_dbal_migration_if extends \phpbb\db\migration\migration { function update_schema() { diff --git a/tests/dbal/migration/installed.php b/tests/dbal/migration/installed.php index 01829f7a99..4b86896d9c 100644 --- a/tests/dbal/migration/installed.php +++ b/tests/dbal/migration/installed.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_installed extends phpbb_db_migration +class phpbb_dbal_migration_installed extends \phpbb\db\migration\migration { function effectively_installed() { diff --git a/tests/dbal/migration/recall.php b/tests/dbal/migration/recall.php index 6c2f04bf08..041d12ad27 100644 --- a/tests/dbal/migration/recall.php +++ b/tests/dbal/migration/recall.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_recall extends phpbb_db_migration +class phpbb_dbal_migration_recall extends \phpbb\db\migration\migration { function update_schema() { diff --git a/tests/dbal/migration/revert.php b/tests/dbal/migration/revert.php index ac01987cd4..c46dfca30d 100644 --- a/tests/dbal/migration/revert.php +++ b/tests/dbal/migration/revert.php @@ -7,13 +7,13 @@ * */ -class phpbb_dbal_migration_revert extends phpbb_db_migration +class phpbb_dbal_migration_revert extends \phpbb\db\migration\migration { function update_schema() { return array( 'add_columns' => array( - 'phpbb_config' => array( + '\phpbb\config\config' => array( 'bar_column' => array('UINT', 1), ), ), @@ -24,7 +24,7 @@ class phpbb_dbal_migration_revert extends phpbb_db_migration { return array( 'drop_columns' => array( - 'phpbb_config' => array( + '\phpbb\config\config' => array( 'bar_column', ), ), diff --git a/tests/dbal/migration/revert_with_dependency.php b/tests/dbal/migration/revert_with_dependency.php index ca2c070e8c..0b09fb784d 100644 --- a/tests/dbal/migration/revert_with_dependency.php +++ b/tests/dbal/migration/revert_with_dependency.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_revert_with_dependency extends phpbb_db_migration +class phpbb_dbal_migration_revert_with_dependency extends \phpbb\db\migration\migration { static public function depends_on() { diff --git a/tests/dbal/migration/unfulfillable.php b/tests/dbal/migration/unfulfillable.php index 6d375e6880..a1cdef9a23 100644 --- a/tests/dbal/migration/unfulfillable.php +++ b/tests/dbal/migration/unfulfillable.php @@ -7,7 +7,7 @@ * */ -class phpbb_dbal_migration_unfulfillable extends phpbb_db_migration +class phpbb_dbal_migration_unfulfillable extends \phpbb\db\migration\migration { static public function depends_on() { diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 9e55e4dd35..d336854a1c 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -33,15 +33,15 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->db_tools = new phpbb_db_tools($this->db); + $this->db_tools = new \phpbb\db\tools($this->db); - $this->config = new phpbb_config_db($this->db, new phpbb_mock_cache, 'phpbb_config'); + $this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, '\phpbb\config\config'); $tools = array( - new phpbb_db_migration_tool_config($this->config), + new \phpbb\db\migration\tool\config($this->config), ); - $this->migrator = new phpbb_db_migrator( + $this->migrator = new \phpbb\db\migrator( $this->config, $this->db, $this->db_tools, @@ -55,11 +55,11 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $container = new phpbb_mock_container_builder(); $container->set('migrator', $migrator); - $this->extension_manager = new phpbb_extension_manager( + $this->extension_manager = new \phpbb\extension\manager( $container, $this->db, $this->config, - new phpbb_filesystem(), + new \phpbb\filesystem(), 'phpbb_ext', dirname(__FILE__) . '/../../phpBB/', 'php', @@ -91,7 +91,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('extra_column' => '1')), - "SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", + "SELECT extra_column FROM \phpbb\config\config WHERE config_name = 'foo'", 'Dummy migration created extra_column with value 1 in all rows.' ); @@ -107,7 +107,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case ); // cleanup - $this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); + $this->db_tools->sql_column_remove('\phpbb\config\config', 'extra_column'); } public function test_unfulfillable() @@ -123,11 +123,11 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('extra_column' => '1')), - "SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", + "SELECT extra_column FROM \phpbb\config\config WHERE config_name = 'foo'", 'Dummy migration was run, even though an unfulfillable migration was found.' ); - $this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); + $this->db_tools->sql_column_remove('\phpbb\config\config', 'extra_column'); } public function test_if() @@ -192,7 +192,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('bar_column' => '1')), - "SELECT bar_column FROM phpbb_config WHERE config_name = 'foo'", + "SELECT bar_column FROM \phpbb\config\config WHERE config_name = 'foo'", 'Installing revert migration failed to create bar_column.' ); @@ -208,7 +208,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertFalse(isset($this->config['foobartest'])); - $sql = 'SELECT * FROM phpbb_config'; + $sql = 'SELECT * FROM \phpbb\config\config'; $result = $this->db->sql_query_limit($sql, 1); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); @@ -232,12 +232,12 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->migrator->update(); } } - catch (phpbb_db_migration_exception $e) {} + catch (\phpbb\db\migration\exception $e) {} // Failure should have caused an automatic roll-back, so this should not exist. $this->assertFalse(isset($this->config['foobar3'])); - $sql = 'SELECT * FROM phpbb_config'; + $sql = 'SELECT * FROM \phpbb\config\config'; $result = $this->db->sql_query_limit($sql, 1); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php index b82d1ef48d..a8d8966839 100644 --- a/tests/dbal/migrator_tool_config_test.php +++ b/tests/dbal/migrator_tool_config_test.php @@ -11,9 +11,9 @@ class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case { public function setup() { - $this->config = new phpbb_config(array()); + $this->config = new \phpbb\config\config(array()); - $this->tool = new phpbb_db_migration_tool_config($this->config); + $this->tool = new \phpbb\db\migration\tool\config($this->config); parent::setup(); } diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index 828fb76c65..3c23891348 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -27,15 +27,15 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case $skip_add_log = true; $db = $this->db = $this->new_dbal(); - $this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx); - $user = $this->user = new phpbb_user(); + $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\null(), new \phpbb\config\config(array()), $this->db, $phpbb_root_path, $phpEx); + $user = $this->user = new \phpbb\user(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $auth = $this->getMock('phpbb_auth'); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $auth = $this->getMock('\phpbb\auth\auth'); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); - $this->tool = new phpbb_db_migration_tool_module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules'); + $this->tool = new \phpbb\db\migration\tool\module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules'); } public function exists_data() diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php index 79d9db66da..1090b4726a 100644 --- a/tests/dbal/migrator_tool_permission_test.php +++ b/tests/dbal/migrator_tool_permission_test.php @@ -24,10 +24,10 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case parent::setup(); $db = $this->db = $this->new_dbal(); - $cache = $this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx); - $this->auth = new phpbb_auth(); + $cache = $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\null(), new \phpbb\config\config(array()), $this->db, $phpbb_root_path, $phpEx); + $this->auth = new \phpbb\auth\auth(); - $this->tool = new phpbb_db_migration_tool_permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx); + $this->tool = new \phpbb\db\migration\tool\permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx); } public function exists_data() diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php index 2a332fddba..a09daa0f76 100644 --- a/tests/dbal/schema_test.php +++ b/tests/dbal/schema_test.php @@ -21,13 +21,13 @@ class phpbb_dbal_schema_test extends phpbb_database_test_case $db = $this->new_dbal(); $value = str_repeat("\xC3\x84", 255); - $sql = "INSERT INTO phpbb_config + $sql = "INSERT INTO \phpbb\config\config (config_name, config_value) VALUES ('name', '$value')"; $result = $db->sql_query($sql); $sql = "SELECT config_value - FROM phpbb_config + FROM \phpbb\config\config WHERE config_name = 'name'"; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php index 45339a6b50..976495d195 100644 --- a/tests/dbal/sql_insert_buffer_test.php +++ b/tests/dbal/sql_insert_buffer_test.php @@ -17,7 +17,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_config', 2); + $this->buffer = new \phpbb\db\sql_insert_buffer($this->db, '\phpbb\config\config', 2); $this->assert_config_count(2); } @@ -81,7 +81,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case protected function assert_config_count($num_configs) { $sql = 'SELECT COUNT(*) AS num_configs - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $this->db->sql_query($sql); $this->assertEquals($num_configs, $this->db->sql_fetchfield('num_configs')); $this->db->sql_freeresult($result); diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index 987161a831..c0f0c271d2 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -39,11 +39,11 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary); + $sql = 'INSERT INTO \phpbb\config\config ' . $db->sql_build_array('INSERT', $sql_ary); $result = $db->sql_query($sql); $sql = "SELECT * - FROM phpbb_config + FROM \phpbb\config\config WHERE config_name = '" . $sql_ary['config_name'] . "'"; $result = $db->sql_query_limit($sql, 1); @@ -56,12 +56,12 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = "DELETE FROM phpbb_config + $sql = "DELETE FROM \phpbb\config\config WHERE config_name = 'config1'"; $result = $db->sql_query($sql); $sql = 'SELECT * - FROM phpbb_config'; + FROM \phpbb\config\config'; $result = $db->sql_query($sql); $rows = $db->sql_fetchrowset($result); @@ -76,7 +76,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case $db = $this->new_dbal(); // empty the table - $sql = 'DELETE FROM phpbb_config'; + $sql = 'DELETE FROM \phpbb\config\config'; $db->sql_query($sql); $batch_ary = array( @@ -92,10 +92,10 @@ class phpbb_dbal_write_test extends phpbb_database_test_case ), ); - $result = $db->sql_multi_insert('phpbb_config', $batch_ary); + $result = $db->sql_multi_insert('\phpbb\config\config', $batch_ary); $sql = 'SELECT * - FROM phpbb_config + FROM \phpbb\config\config ORDER BY config_name ASC'; $result = $db->sql_query($sql); @@ -155,12 +155,12 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = 'UPDATE phpbb_config + $sql = 'UPDATE \phpbb\config\config SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where; $result = $db->sql_query($sql); $sql = 'SELECT * - FROM phpbb_config + FROM \phpbb\config\config ORDER BY config_name ASC'; $result = $db->sql_query($sql); diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index b3992dbd80..ffa37d3b3d 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -16,8 +16,8 @@ class phpbb_di_container_test extends phpbb_test_case { $phpbb_root_path = __DIR__ . '/../../phpBB/'; $extensions = array( - new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), - new phpbb_di_extension_core($phpbb_root_path), + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), ); $container = phpbb_create_container($extensions, $phpbb_root_path, 'php'); @@ -28,8 +28,8 @@ class phpbb_di_container_test extends phpbb_test_case { $phpbb_root_path = __DIR__ . '/../../phpBB/'; $extensions = array( - new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), - new phpbb_di_extension_core($phpbb_root_path), + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), ); $container = phpbb_create_install_container($phpbb_root_path, 'php'); @@ -42,8 +42,8 @@ class phpbb_di_container_test extends phpbb_test_case $phpbb_root_path = __DIR__ . '/../../phpBB/'; $config_file = __DIR__ . '/fixtures/config.php'; $extensions = array( - new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), - new phpbb_di_extension_core($phpbb_root_path), + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), ); $container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php'); @@ -52,7 +52,7 @@ class phpbb_di_container_test extends phpbb_test_case } } -class phpbb_db_driver_container_mock extends phpbb_db_driver +class phpbb_db_driver_container_mock extends \phpbb\db\driver\driver { public function sql_connect() { diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php index 5033d2dc9f..04e20f63d8 100644 --- a/tests/di/fixtures/config.php +++ b/tests/di/fixtures/config.php @@ -8,4 +8,4 @@ $dbname = 'phpbb'; $dbuser = 'root'; $dbpasswd = ''; $table_prefix = 'phpbb_'; -$acm_type = 'phpbb_cache_driver_null'; +$acm_type = '\phpbb\cache\driver\null'; diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php index fceb8aa3d8..0804c64f6f 100644 --- a/tests/error_collector_test.php +++ b/tests/error_collector_test.php @@ -13,7 +13,7 @@ class phpbb_error_collector_test extends phpbb_test_case { public function test_collection() { - $collector = new phpbb_error_collector; + $collector = new \phpbb\error_collector; $collector->install(); // Cause a warning diff --git a/tests/event/dispatcher_test.php b/tests/event/dispatcher_test.php index 9b9203e06a..a76df90809 100644 --- a/tests/event/dispatcher_test.php +++ b/tests/event/dispatcher_test.php @@ -11,9 +11,9 @@ class phpbb_event_dispatcher_test extends phpbb_test_case { public function test_trigger_event() { - $dispatcher = new phpbb_event_dispatcher(new phpbb_mock_container_builder()); + $dispatcher = new \phpbb\event\dispatcher(new phpbb_mock_container_builder()); - $dispatcher->addListener('core.test_event', function (phpbb_event_data $event) { + $dispatcher->addListener('core.test_event', function (\phpbb\event\data $event) { $event['foo'] = $event['foo'] . '2'; $event['bar'] = $event['bar'] . '2'; }); diff --git a/tests/extension/ext/bar/ext.php b/tests/extension/ext/bar/ext.php index 5585edf9ac..edae25663a 100644 --- a/tests/extension/ext/bar/ext.php +++ b/tests/extension/ext/bar/ext.php @@ -1,6 +1,6 @@ extension_manager, new phpbb_filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name'); + $finder = new \phpbb\extension\finder($this->extension_manager, new \phpbb\filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name'); $files = $finder->suffix('_class.php')->get_files(); $expected_files = array( @@ -219,9 +219,9 @@ class phpbb_extension_finder_test extends phpbb_test_case 'is_dir' => false, ); - $finder = new phpbb_extension_finder( + $finder = new \phpbb\extension\finder( $this->extension_manager, - new phpbb_filesystem(), + new \phpbb\filesystem(), dirname(__FILE__) . '/', new phpbb_mock_cache(array( '_ext_finder' => array( diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index a23e5a18d9..fd9e800c02 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -90,14 +90,14 @@ class phpbb_extension_manager_test extends phpbb_database_test_case protected function create_extension_manager($with_cache = true) { - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $db = $this->new_dbal(); - $db_tools = new phpbb_db_tools($db); + $db_tools = new \phpbb\db\tools($db); $phpbb_root_path = __DIR__ . './../../phpBB/'; $php_ext = 'php'; $table_prefix = 'phpbb_'; - $migrator = new phpbb_db_migrator( + $migrator = new \phpbb\db\migrator( $config, $db, $db_tools, @@ -110,11 +110,11 @@ class phpbb_extension_manager_test extends phpbb_database_test_case $container = new phpbb_mock_container_builder(); $container->set('migrator', $migrator); - return new phpbb_extension_manager( + return new \phpbb\extension\manager( $container, $db, $config, - new phpbb_filesystem(), + new \phpbb\filesystem(), 'phpbb_ext', dirname(__FILE__) . '/', $php_ext, diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index e5bd29092e..984ae63fa2 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -30,25 +30,25 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case parent::setUp(); $this->cache = new phpbb_mock_cache(); - $this->config = new phpbb_config(array( + $this->config = new \phpbb\config\config(array( 'version' => '3.1.0', )); $this->db = $this->new_dbal(); - $this->db_tools = new phpbb_db_tools($this->db); + $this->db_tools = new \phpbb\db\tools($this->db); $this->phpbb_root_path = dirname(__FILE__) . '/'; $this->phpEx = 'php'; - $this->user = new phpbb_user(); + $this->user = new \phpbb\user(); $this->table_prefix = 'phpbb_'; - $this->template = new phpbb_template_twig( + $this->template = new \phpbb\template\twig\twig( $this->phpbb_root_path, $this->phpEx, $this->config, $this->user, - new phpbb_template_context() + new \phpbb\template\context() ); - $this->migrator = new phpbb_db_migrator( + $this->migrator = new \phpbb\db\migrator( $this->config, $this->db, $this->db_tools, @@ -61,11 +61,11 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $container = new phpbb_mock_container_builder(); $container->set('migrator', $migrator); - $this->extension_manager = new phpbb_extension_manager( + $this->extension_manager = new \phpbb\extension\manager( $container, $this->db, $this->config, - new phpbb_filesystem(), + new \phpbb\filesystem(), 'phpbb_ext', $this->phpbb_root_path, $this->phpEx, @@ -84,7 +84,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case { $manager->get_metadata(); } - catch(phpbb_extension_exception $e){} + catch(\phpbb\extension\exception $e){} $this->assertEquals((string) $e, 'The required file does not exist: ' . $this->phpbb_root_path . $this->extension_manager->get_extension_path($ext_name) . 'composer.json'); } @@ -100,7 +100,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case { $metadata = $manager->get_metadata(); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -123,7 +123,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'name\' has not been set.'); } @@ -134,7 +134,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'type\' has not been set.'); } @@ -145,7 +145,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.'); } @@ -156,7 +156,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'version\' has not been set.'); } @@ -167,7 +167,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'authors\' has not been set.'); } @@ -184,7 +184,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Required meta field \'author name\' has not been set.'); } @@ -211,7 +211,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Meta field \'name\' is invalid.'); } @@ -222,7 +222,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Meta field \'type\' is invalid.'); } @@ -233,7 +233,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.'); } @@ -244,7 +244,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->fail('Exception not triggered'); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->assertEquals((string) $e, 'Meta field \'version\' is invalid.'); } @@ -268,7 +268,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case { $this->assertEquals(true, $manager->validate('enable')); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -293,7 +293,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(false, $manager->validate_require_php()); $this->assertEquals(false, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -312,7 +312,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(true, $manager->validate_require_php()); $this->assertEquals(true, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -331,7 +331,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(false, $manager->validate_require_php()); $this->assertEquals(false, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -350,7 +350,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(false, $manager->validate_require_php()); $this->assertEquals(false, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -369,7 +369,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(true, $manager->validate_require_php()); $this->assertEquals(true, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -388,7 +388,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(true, $manager->validate_require_php()); $this->assertEquals(true, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } @@ -407,7 +407,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->assertEquals(true, $manager->validate_require_php()); $this->assertEquals(true, $manager->validate_require_phpbb()); } - catch(phpbb_extension_exception $e) + catch(\phpbb\extension\exception $e) { $this->fail($e); } diff --git a/tests/extension/style_path_provider_test.php b/tests/extension/style_path_provider_test.php index e1021c20ac..f2ee957f4c 100644 --- a/tests/extension/style_path_provider_test.php +++ b/tests/extension/style_path_provider_test.php @@ -21,9 +21,9 @@ class phpbb_extension_style_path_provider_test extends phpbb_test_case public function test_find() { - $phpbb_style_path_provider = new phpbb_style_path_provider(); + $phpbb_style_path_provider = new \phpbb\style\path_provider(); $phpbb_style_path_provider->set_styles(array($this->relative_root_path . 'styles/prosilver')); - $phpbb_style_extension_path_provider = new phpbb_style_extension_path_provider(new phpbb_mock_extension_manager( + $phpbb_style_extension_path_provider = new \phpbb\style\extension_path_provider(new phpbb_mock_extension_manager( $this->root_path, array( 'foo' => array( diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php index 50951fc88c..fedadc103b 100644 --- a/tests/filesystem/clean_path_test.php +++ b/tests/filesystem/clean_path_test.php @@ -14,7 +14,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case public function setUp() { parent::setUp(); - $this->filesystem = new phpbb_filesystem(); + $this->filesystem = new \phpbb\filesystem(); } public function clean_path_data() diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php index a3d272906f..e17f33dc96 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -91,12 +91,12 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&${object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid); $this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); - // XXX globals for phpbb_auth, refactor it later + // XXX globals for \phpbb\auth\auth, refactor it later global $db, $cache; $db = $this->get_db(); $cache = new phpbb_mock_null_cache; - $auth = new phpbb_auth; + $auth = new \phpbb\auth\auth; // XXX hardcoded id $user_data = $auth->obtain_user_data(2); $auth->acl($user_data); @@ -114,7 +114,7 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case $this->assertContains($this->lang('AUTH_UPDATED'), $crawler->text()); // check acl again - $auth = new phpbb_auth; + $auth = new \phpbb\auth\auth; // XXX hardcoded id $user_data = $auth->obtain_user_data(2); $auth->acl($user_data); diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 5a91b5f681..41b2be350b 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -5,7 +5,7 @@ class phpbb_ext_foo_bar_controller { protected $template; - public function __construct(phpbb_controller_helper $helper, phpbb_template $template) + public function __construct(\phpbb\controller\helper $helper, \phpbb\template\template $template) { $this->template = $template; $this->helper = $helper; @@ -30,6 +30,6 @@ class phpbb_ext_foo_bar_controller public function exception() { - throw new phpbb_controller_exception('Exception thrown from foo/exception route'); + throw new \phpbb\controller\exception('Exception thrown from foo/exception route'); } } diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php index 74359d51ab..b839cef36c 100644 --- a/tests/functional/fixtures/ext/foo/bar/ext.php +++ b/tests/functional/fixtures/ext/foo/bar/ext.php @@ -1,6 +1,6 @@ lang = $this->load_language(); - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $acl_get_map = array( array('u_viewonline', true), array('u_viewprofile', true), diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php index 4336fd894e..f8d52a9a6a 100644 --- a/tests/functions_user/group_user_attributes_test.php +++ b/tests/functions_user/group_user_attributes_test.php @@ -131,17 +131,17 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes $cache = new phpbb_mock_cache; $db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_clear_prefetch'); - $cache_driver = new phpbb_cache_driver_null(); + $cache_driver = new \phpbb\cache\driver\null(); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container ->expects($this->any()) ->method('get') ->with('cache.driver') ->will($this->returnValue($cache_driver)); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); group_user_attributes('default', $group_id, array($user_id), false, 'group_name', $group_row); diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php index 16e33b390c..ac54a86b8e 100644 --- a/tests/groupposition/legend_test.php +++ b/tests/groupposition/legend_test.php @@ -20,7 +20,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case return array( array(1, 0, ''), array(3, 2, ''), - array(4, 0, 'phpbb_groupposition_exception'), + array(4, 0, '\phpbb\groupposition\exception'), ); } @@ -33,7 +33,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); if ($throws_exception) @@ -41,7 +41,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $this->setExpectedException($throws_exception); } - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($expected, $test_class->get_group_value($group_id)); } @@ -51,10 +51,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals(2, $test_class->get_group_count()); } @@ -91,10 +91,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($expected_added, $test_class->add_group($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -179,10 +179,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($expected_deleted, $test_class->delete_group($group_id, $skip_group)); $result = $db->sql_query('SELECT group_id, group_legend @@ -234,10 +234,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($excepted_moved, $test_class->move_up($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -289,10 +289,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($excepted_moved, $test_class->move_down($group_id)); $result = $db->sql_query('SELECT group_id, group_legend @@ -387,10 +387,10 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_legend($db, $user); + $test_class = new \phpbb\groupposition\legend($db, $user); $this->assertEquals($excepted_moved, $test_class->move($group_id, $increment)); $result = $db->sql_query('SELECT group_id, group_legend diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php index db26cd09d5..ec89f56775 100644 --- a/tests/groupposition/teampage_test.php +++ b/tests/groupposition/teampage_test.php @@ -22,7 +22,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case return array( array(2, 3, ''), array(6, 8, ''), - array(10, 0, 'phpbb_groupposition_exception'), + array(10, 0, '\phpbb\groupposition\exception'), ); } @@ -35,7 +35,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); if ($throws_exception) @@ -43,7 +43,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $this->setExpectedException($throws_exception); } - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($expected, $test_class->get_group_value($group_id)); } @@ -53,10 +53,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals(8, $test_class->get_group_count()); } @@ -137,10 +137,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($expected_added, $test_class->add_group_teampage($group_id, $parent_id)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -180,10 +180,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($expected_added, $test_class->add_category_teampage($group_name)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -247,10 +247,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($expected_deleted, $test_class->delete_group($group_id, false)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -299,10 +299,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($expected_deleted, $test_class->delete_teampage($teampage_id, false)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -462,10 +462,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($excepted_moved, $test_class->move($group_id, $move_delta)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name @@ -625,10 +625,10 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case $cache = new phpbb_mock_cache; $db = $this->new_dbal(); - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array(); - $test_class = new phpbb_groupposition_teampage($db, $user, $cache); + $test_class = new \phpbb\groupposition\teampage($db, $user, $cache); $this->assertEquals($excepted_moved, $test_class->move_teampage($teampage_id, $move_delta)); $result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php index de7a23fd05..da689b7fa3 100644 --- a/tests/lock/db_test.php +++ b/tests/lock/db_test.php @@ -25,9 +25,9 @@ class phpbb_lock_db_test extends phpbb_database_test_case global $db, $config; $db = $this->db = $this->new_dbal(); - $config = $this->config = new phpbb_config(array('rand_seed' => '', 'rand_seed_last_update' => '0')); + $config = $this->config = new \phpbb\config\config(array('rand_seed' => '', 'rand_seed_last_update' => '0')); set_config(null, null, null, $this->config); - $this->lock = new phpbb_lock_db('test_lock', $this->config, $this->db); + $this->lock = new \phpbb\lock\db('test_lock', $this->config, $this->db); } public function test_new_lock() @@ -38,7 +38,7 @@ class phpbb_lock_db_test extends phpbb_database_test_case $this->assertTrue($this->lock->owns_lock()); $this->assertTrue(isset($this->config['test_lock']), 'Lock was created'); - $lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db); + $lock2 = new \phpbb\lock\db('test_lock', $this->config, $this->db); $this->assertFalse($lock2->acquire()); $this->assertFalse($lock2->owns_lock()); @@ -49,7 +49,7 @@ class phpbb_lock_db_test extends phpbb_database_test_case public function test_expire_lock() { - $lock = new phpbb_lock_db('foo_lock', $this->config, $this->db); + $lock = new \phpbb\lock\db('foo_lock', $this->config, $this->db); $this->assertTrue($lock->acquire()); } @@ -82,7 +82,7 @@ class phpbb_lock_db_test extends phpbb_database_test_case $this->assertFalse($this->lock->owns_lock()); $this->assertEquals('0', $this->config['test_lock'], 'First lock is released'); - $lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db); + $lock2 = new \phpbb\lock\db('test_lock', $this->config, $this->db); $this->assertTrue($lock2->acquire()); $this->assertTrue($lock2->owns_lock()); $this->assertFalse(empty($this->config['test_lock']), 'Second lock is acquired'); diff --git a/tests/lock/flock_test.php b/tests/lock/flock_test.php index 8f0b866ab3..5e5ac5aa78 100644 --- a/tests/lock/flock_test.php +++ b/tests/lock/flock_test.php @@ -13,7 +13,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $lock->release(); @@ -23,7 +23,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $this->assertTrue($lock->owns_lock()); @@ -48,11 +48,11 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock1 = new phpbb_lock_flock($path); + $lock1 = new \phpbb\lock\flock($path); $ok = $lock1->acquire(); $this->assertTrue($ok); - $lock2 = new phpbb_lock_flock($path); + $lock2 = new \phpbb\lock\flock($path); $ok = $lock2->acquire(); $this->assertFalse($ok); @@ -78,7 +78,7 @@ class phpbb_lock_flock_test extends phpbb_test_case // wait 0.5 s, acquire the lock, note how long it took sleep(1); - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $start = time(); $ok = $lock->acquire(); $delta = time() - $start; @@ -105,7 +105,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { // child // immediately acquire the lock and sleep for 2 s - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $this->assertTrue($lock->owns_lock()); diff --git a/tests/log/add_test.php b/tests/log/add_test.php index a5f93232f2..032546f002 100644 --- a/tests/log/add_test.php +++ b/tests/log/add_test.php @@ -23,10 +23,10 @@ class phpbb_log_add_test extends phpbb_database_test_case $db = $this->new_dbal(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->getMock('phpbb_user'); - $auth = $this->getMock('phpbb_auth'); + $user = $this->getMock('\phpbb\user'); + $auth = $this->getMock('\phpbb\auth\auth'); - $log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $this->assertTrue($log->is_enabled(), 'Initialise failed'); @@ -52,10 +52,10 @@ class phpbb_log_add_test extends phpbb_database_test_case $db = $this->new_dbal(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->getMock('phpbb_user'); - $auth = $this->getMock('phpbb_auth'); + $user = $this->getMock('\phpbb\user'); + $auth = $this->getMock('\phpbb\auth\auth'); - $log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $mode = 'critical'; $user_id = ANONYMOUS; diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php index 7aa42be6df..e1bcd4acaf 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -157,10 +157,10 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case $db = $this->new_dbal(); $cache = new phpbb_mock_cache; $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->getMock('phpbb_user'); - $auth = $this->getMock('phpbb_auth'); + $user = $this->getMock('\phpbb\user'); + $auth = $this->getMock('\phpbb\auth\auth'); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $user->ip = 'user_ip'; if ($user_id) diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 6827aaa1b6..017484e8a7 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -306,7 +306,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); // Create auth mock - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $acl_get_map = array( array('f_read', 23, true), array('m_', 23, true), @@ -333,7 +333,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'LOG_INSTALL_INSTALLED' => 'installed: %s', ); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $log = array(); $this->assertEquals($expected_returned, view_log($mode, $log, $log_count, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords)); diff --git a/tests/mock/cache.php b/tests/mock/cache.php index 3e45a1730b..83bbb8ef30 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -7,7 +7,7 @@ * */ -class phpbb_mock_cache implements phpbb_cache_driver_driver_interface +class phpbb_mock_cache implements \phpbb\cache\driver\driver_interface { protected $data; @@ -140,7 +140,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_driver_interface /** * {@inheritDoc} */ - public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) + public function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl) { return $query_result; } diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 10b3595206..7049cbdc50 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -7,13 +7,13 @@ * */ -class phpbb_mock_extension_manager extends phpbb_extension_manager +class phpbb_mock_extension_manager extends \phpbb\extension\manager { public function __construct($phpbb_root_path, $extensions = array()) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = 'php'; $this->extensions = $extensions; - $this->filesystem = new phpbb_filesystem(); + $this->filesystem = new \phpbb\filesystem(); } } diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php index a7fbf0681c..b6489acfa4 100644 --- a/tests/mock/metadata_manager.php +++ b/tests/mock/metadata_manager.php @@ -7,7 +7,7 @@ * */ -class phpbb_mock_metadata_manager extends phpbb_extension_metadata_manager +class phpbb_mock_metadata_manager extends \phpbb\extension\metadata_manager { public function set_metadata($metadata) { diff --git a/tests/mock/notifications_auth.php b/tests/mock/notifications_auth.php index d960acb81a..2d387d8c00 100644 --- a/tests/mock/notifications_auth.php +++ b/tests/mock/notifications_auth.php @@ -7,7 +7,7 @@ * */ -class phpbb_mock_notifications_auth extends phpbb_auth +class phpbb_mock_notifications_auth extends \phpbb\auth\auth { function acl_get_list($user_id = false, $opts = false, $forum_id = false) { diff --git a/tests/mock/request.php b/tests/mock/request.php index 04803594de..b71361e33e 100644 --- a/tests/mock/request.php +++ b/tests/mock/request.php @@ -7,33 +7,33 @@ * */ -class phpbb_mock_request implements phpbb_request_request_interface +class phpbb_mock_request implements \phpbb\request\request_interface { protected $data; public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array()) { - $this->data[phpbb_request_request_interface::GET] = $get; - $this->data[phpbb_request_request_interface::POST] = $post; - $this->data[phpbb_request_request_interface::COOKIE] = $cookie; - $this->data[phpbb_request_request_interface::REQUEST] = ($request === false) ? $post + $get : $request; - $this->data[phpbb_request_request_interface::SERVER] = $server; - $this->data[phpbb_request_request_interface::FILES] = $files; + $this->data[\phpbb\request\request_interface::GET] = $get; + $this->data[\phpbb\request\request_interface::POST] = $post; + $this->data[\phpbb\request\request_interface::COOKIE] = $cookie; + $this->data[\phpbb\request\request_interface::REQUEST] = ($request === false) ? $post + $get : $request; + $this->data[\phpbb\request\request_interface::SERVER] = $server; + $this->data[\phpbb\request\request_interface::FILES] = $files; } - public function overwrite($var_name, $value, $super_global = phpbb_request_request_interface::REQUEST) + public function overwrite($var_name, $value, $super_global = \phpbb\request\request_interface::REQUEST) { $this->data[$super_global][$var_name] = $value; } - public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_request_interface::REQUEST) + public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST) { return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; } public function server($var_name, $default = '') { - $super_global = phpbb_request_request_interface::SERVER; + $super_global = \phpbb\request\request_interface::SERVER; return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; } @@ -45,16 +45,16 @@ class phpbb_mock_request implements phpbb_request_request_interface public function file($form_name) { - $super_global = phpbb_request_request_interface::FILES; + $super_global = \phpbb\request\request_interface::FILES; return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array(); } public function is_set_post($name) { - return $this->is_set($name, phpbb_request_request_interface::POST); + return $this->is_set($name, \phpbb\request\request_interface::POST); } - public function is_set($var, $super_global = phpbb_request_request_interface::REQUEST) + public function is_set($var, $super_global = \phpbb\request\request_interface::REQUEST) { return isset($this->data[$super_global][$var]); } @@ -69,7 +69,7 @@ class phpbb_mock_request implements phpbb_request_request_interface return false; } - public function variable_names($super_global = phpbb_request_request_interface::REQUEST) + public function variable_names($super_global = \phpbb\request\request_interface::REQUEST) { return array_keys($this->data[$super_global]); } @@ -79,10 +79,10 @@ class phpbb_mock_request implements phpbb_request_request_interface public function set_header($header_name, $value) { $var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name)); - $this->data[phpbb_request_request_interface::SERVER][$var_name] = $value; + $this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value; } - public function merge($super_global = phpbb_request_request_interface::REQUEST, $values) + public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values) { $this->data[$super_global] = array_merge($this->data[$super_global], $values); } diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php index 56ff8c8b32..38e66ec67a 100644 --- a/tests/mock/session_testable.php +++ b/tests/mock/session_testable.php @@ -16,7 +16,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; * test it without warnings about sent headers. This class only stores cookie * data for later verification. */ -class phpbb_mock_session_testable extends phpbb_session +class phpbb_mock_session_testable extends \phpbb\session { private $_cookies = array(); diff --git a/tests/mock/sql_insert_buffer.php b/tests/mock/sql_insert_buffer.php index ba09aa8d7f..aa7c54dddd 100644 --- a/tests/mock/sql_insert_buffer.php +++ b/tests/mock/sql_insert_buffer.php @@ -7,7 +7,7 @@ * */ -class phpbb_mock_sql_insert_buffer extends phpbb_db_sql_insert_buffer +class phpbb_mock_sql_insert_buffer extends \phpbb\db\sql_insert_buffer { public function flush() { diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php index c038020385..e0449cef89 100644 --- a/tests/notification/convert_test.php +++ b/tests/notification/convert_test.php @@ -25,10 +25,10 @@ class phpbb_notification_convert_test extends phpbb_database_test_case $this->db = $this->new_dbal(); - $this->migration = new phpbb_db_migration_data_310_notification_options_reconvert( - new phpbb_config(array()), + $this->migration = new \phpbb\db\migration\data0\notification_options_reconvert( + new \phpbb\config\config(array()), $this->db, - new phpbb_db_tools($this->db), + new \phpbb\db\tools($this->db), $phpbb_root_path, $phpEx, 'phpbb_' diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php index 0d0c584e0d..629954efce 100644 --- a/tests/notification/ext/test/notification/type/test.php +++ b/tests/notification/ext/test/notification/type/test.php @@ -15,7 +15,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_notification_type_test extends phpbb_notification_type_base +class phpbb_notification_type_test extends \phpbb\notification\type\base { public function get_type() { diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php index 7a794f922f..95caa7c0ba 100644 --- a/tests/notification/manager_helper.php +++ b/tests/notification/manager_helper.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Notifications service class * @package notifications */ -class phpbb_notification_manager_helper extends phpbb_notification_manager +class phpbb_notification_manager_helper extends \phpbb\notification\manager { public function set_var($name, $value) { diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php index 8f7eb3b8a8..1e2ce13956 100644 --- a/tests/notification/notification_test.php +++ b/tests/notification/notification_test.php @@ -27,17 +27,17 @@ class phpbb_notification_test extends phpbb_database_test_case include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); $this->db = $this->new_dbal(); - $this->config = new phpbb_config(array( + $this->config = new \phpbb\config\config(array( 'allow_privmsg' => true, 'allow_bookmarks' => true, 'allow_topic_notify' => true, 'allow_forum_notify' => true, )); - $this->user = new phpbb_user(); - $this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $this->user = new \phpbb\user(); + $this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $this->auth = new phpbb_mock_notifications_auth(); - $this->cache = new phpbb_cache_service( - new phpbb_cache_driver_null(), + $this->cache = new \phpbb\cache\service( + new \phpbb\cache\driver\null(), $this->config, $this->db, $phpbb_root_path, diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 4e564ce23c..09cd7b4213 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -53,7 +53,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case $db = $this->db; // Auth - $auth = $this->getMock('phpbb_auth'); + $auth = $this->getMock('\phpbb\auth\auth'); $auth->expects($this->any()) ->method('acl_get') ->with($this->stringContains('_'), @@ -65,12 +65,12 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case ))); // Config - $config = new phpbb_config(array('num_topics' => 1,'num_posts' => 1,)); + $config = new \phpbb\config\config(array('num_topics' => 1,'num_posts' => 1,)); set_config(null, null, null, $config); set_config_count(null, null, null, $config); - $cache = new phpbb_cache_service( - new phpbb_cache_driver_null(), + $cache = new \phpbb\cache\service( + new \phpbb\cache\driver\null(), $config, $db, $phpbb_root_path, @@ -81,7 +81,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); // User - $user = $this->getMock('phpbb_user'); + $user = $this->getMock('\phpbb\user'); $user->ip = ''; $user->data = array( 'user_id' => 2, @@ -91,14 +91,14 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case ); // Request - $type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); - $request = $this->getMock('phpbb_request'); + $type_cast_helper = $this->getMock('\phpbb\request\type_cast_helper_interface'); + $request = $this->getMock('\phpbb\request\request'); // Container $phpbb_container = new phpbb_mock_container_builder(); - $phpbb_container->set('content.visibility', new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); + $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); - $user_loader = new phpbb_user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + $user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); // Notification Types $notification_types = array('quote', 'bookmark', 'post', 'post_in_queue', 'topic', 'approve_topic', 'approve_post'); @@ -117,7 +117,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case } // Notification Manager - $phpbb_notifications = new phpbb_notification_manager($notification_types_array, array(), + $phpbb_notifications = new \phpbb\notification\manager($notification_types_array, array(), $phpbb_container, $user_loader, $db, $cache, $user, $phpbb_root_path, $phpEx, NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE); diff --git a/tests/request/deactivated_super_global_test.php b/tests/request/deactivated_super_global_test.php index 28ba285468..d28bd87eec 100644 --- a/tests/request/deactivated_super_global_test.php +++ b/tests/request/deactivated_super_global_test.php @@ -16,7 +16,7 @@ class phpbb_deactivated_super_global_test extends phpbb_test_case public function test_write_triggers_error() { $this->setExpectedTriggerError(E_USER_ERROR); - $obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_request_interface'), 'obj', phpbb_request_request_interface::POST); + $obj = new \phpbb\request\deactivated_super_global($this->getMock('\phpbb\request\request_interface'), 'obj', \phpbb\request\request_interface::POST); $obj->offsetSet(0, 0); } } diff --git a/tests/request/request_test.php b/tests/request/request_test.php index 52c21abd2a..a25792e051 100644 --- a/tests/request/request_test.php +++ b/tests/request/request_test.php @@ -33,8 +33,8 @@ class phpbb_request_test extends phpbb_test_case $_SERVER['HTTP_ACCEPT'] = 'application/json'; $_SERVER['HTTP_SOMEVAR'] = ''; - $this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); - $this->request = new phpbb_request($this->type_cast_helper); + $this->type_cast_helper = $this->getMock('\phpbb\request\type_cast_helper_interface'); + $this->request = new \phpbb\request\request($this->type_cast_helper); } public function test_toggle_super_globals() @@ -135,7 +135,7 @@ class phpbb_request_test extends phpbb_test_case { $this->request->enable_super_globals(); $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; - $this->request = new phpbb_request($this->type_cast_helper); + $this->request = new \phpbb\request\request($this->type_cast_helper); $this->assertTrue($this->request->is_ajax()); } @@ -146,7 +146,7 @@ class phpbb_request_test extends phpbb_test_case $this->request->enable_super_globals(); $_SERVER['HTTPS'] = 'on'; - $this->request = new phpbb_request($this->type_cast_helper); + $this->request = new \phpbb\request\request($this->type_cast_helper); $this->assertTrue($this->request->is_secure()); } diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php index 0e85d4694b..d126fe1e8b 100644 --- a/tests/request/request_var_test.php +++ b/tests/request/request_var_test.php @@ -90,7 +90,7 @@ class phpbb_request_var_test extends phpbb_test_case { $this->unset_variables('var'); - // cannot set $_REQUEST directly because in phpbb_request implementation + // cannot set $_REQUEST directly because in \phpbb\request\request implementation // $_REQUEST = $_POST + $_GET $_POST['var'] = array( 0 => array( diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php index f41db005af..98f4538c08 100644 --- a/tests/request/type_cast_helper_test.php +++ b/tests/request/type_cast_helper_test.php @@ -16,7 +16,7 @@ class phpbb_type_cast_helper_test extends phpbb_test_case protected function setUp() { - $this->type_cast_helper = new phpbb_request_type_cast_helper(); + $this->type_cast_helper = new \phpbb\request\type_cast_helper(); } public function test_addslashes_recursively() diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index 3ad15bd806..c08484c78d 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -34,7 +34,7 @@ class phpbb_search_mysql_test extends phpbb_search_common_test_case $this->db = $this->new_dbal(); $error = null; - $class = self::get_search_wrapper('phpbb_search_fulltext_mysql'); + $class = self::get_search_wrapper('\phpbb\search\fulltext_mysql'); $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); } } diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 4a2c210013..18c6df2445 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -30,7 +30,7 @@ class phpbb_search_native_test extends phpbb_search_test_case $this->db = $this->new_dbal(); $error = null; - $class = self::get_search_wrapper('phpbb_search_fulltext_native'); + $class = self::get_search_wrapper('\phpbb\search\fulltext_native'); $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); } diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index 923af6f854..a59f5abc7d 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -34,7 +34,7 @@ class phpbb_search_postgres_test extends phpbb_search_common_test_case $this->db = $this->new_dbal(); $error = null; - $class = self::get_search_wrapper('phpbb_search_fulltext_postgres'); + $class = self::get_search_wrapper('\phpbb\search\fulltext_postgres'); $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); } } diff --git a/tests/security/base.php b/tests/security/base.php index 08878ad60d..8cd24ff145 100644 --- a/tests/security/base.php +++ b/tests/security/base.php @@ -39,13 +39,13 @@ abstract class phpbb_security_test_base extends phpbb_test_case $request = new phpbb_mock_request(array(), array(), array(), $server); // Set no user and trick a bit to circumvent errors - $user = new phpbb_user(); + $user = new \phpbb\user(); $user->lang = true; $user->browser = $server['HTTP_USER_AGENT']; $user->referer = ''; $user->forwarded_for = ''; $user->host = $server['HTTP_HOST']; - $user->page = phpbb_session::extract_current_page($phpbb_root_path); + $user->page = \phpbb\session::extract_current_page($phpbb_root_path); } protected function tearDown() diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index 1bf471d04f..e42f446b31 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -28,12 +28,12 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_request_interface::SERVER, array( + $request->merge(\phpbb\request\request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); - $result = phpbb_session::extract_current_page('./'); + $result = \phpbb\session::extract_current_page('./'); $label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.'; $this->assertEquals($expected, $result['query_string'], $label); @@ -46,12 +46,12 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_request_interface::SERVER, array( + $request->merge(\phpbb\request\request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); - $result = phpbb_session::extract_current_page('./'); + $result = \phpbb\session::extract_current_page('./'); $label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.'; $this->assertEquals($expected, $result['query_string'], $label); diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index e5a7f7a4a1..28019b54b5 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -56,11 +56,11 @@ class phpbb_session_continue_test extends phpbb_database_test_case global $phpbb_container, $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array()); - $request = $this->getMock('phpbb_request'); - $user = $this->getMock('phpbb_user'); + $config = new \phpbb\config\config(array()); + $request = $this->getMock('\phpbb\request\request'); + $user = $this->getMock('\phpbb\user'); - $auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + $auth_provider = new \phpbb\auth\provider\db($db, $config, $request, $user, $phpbb_root_path, $phpEx); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container->expects($this->any()) ->method('get') diff --git a/tests/session/creation_test.php b/tests/session/creation_test.php index fde76d6b06..6b1be61ade 100644 --- a/tests/session/creation_test.php +++ b/tests/session/creation_test.php @@ -23,11 +23,11 @@ class phpbb_session_creation_test extends phpbb_database_test_case global $phpbb_container, $phpbb_root_path, $phpEx; $db = $this->new_dbal(); - $config = new phpbb_config(array()); - $request = $this->getMock('phpbb_request'); - $user = $this->getMock('phpbb_user'); + $config = new \phpbb\config\config(array()); + $request = $this->getMock('\phpbb\request\request'); + $user = $this->getMock('\phpbb\user'); - $auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + $auth_provider = new \phpbb\auth\provider\db($db, $config, $request, $user, $phpbb_root_path, $phpEx); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container->expects($this->any()) ->method('get') diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php index 1e2b194ece..1a7d27b30f 100644 --- a/tests/session/testable_factory.php +++ b/tests/session/testable_factory.php @@ -59,10 +59,10 @@ class phpbb_session_testable_factory /** * Retrieve the configured session class instance * - * @param phpbb_db_driver $dbal The database connection to use for session data + * @param \phpbb\db\driver\driver $dbal The database connection to use for session data * @return phpbb_mock_session_testable A session instance */ - public function get_session(phpbb_db_driver $dbal) + public function get_session(\phpbb\db\driver\driver $dbal) { // set up all the global variables used by session global $SID, $_SID, $db, $config, $cache, $request; @@ -75,7 +75,7 @@ class phpbb_session_testable_factory ); request_var(null, null, null, null, $request); - $config = $this->config = new phpbb_config($this->get_config_data()); + $config = $this->config = new \phpbb\config\config($this->get_config_data()); set_config(null, null, null, $config); $db = $dbal; diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index f7bcd2dcc6..857807bf89 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -100,16 +100,16 @@ Zeta test event in all', global $phpbb_root_path, $phpEx, $user; $defaults = $this->config_defaults(); - $config = new phpbb_config(array_merge($defaults, $new_config)); + $config = new \phpbb\config\config(array_merge($defaults, $new_config)); $this->template_path = dirname(__FILE__) . "/datasets/$dataset/styles/silver/template"; - $this->style_resource_locator = new phpbb_style_resource_locator(); + $this->style_resource_locator = new \phpbb\style\resource_locator(); $this->extension_manager = new phpbb_mock_filesystem_extension_manager( dirname(__FILE__) . "/datasets/$dataset/" ); - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context, $this->extension_manager); - $this->style_provider = new phpbb_style_path_provider(); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context, $this->extension_manager); + $this->style_provider = new \phpbb\style\path_provider(); + $this->style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); $this->style->set_custom_style('silver', array($this->template_path), $style_names, ''); } } diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 6d87e5ebc0..97c0728875 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -63,14 +63,14 @@ class phpbb_template_template_test_case extends phpbb_test_case global $phpbb_root_path, $phpEx; $defaults = $this->config_defaults(); - $config = new phpbb_config(array_merge($defaults, $new_config)); - $this->user = new phpbb_user; + $config = new \phpbb\config\config(array_merge($defaults, $new_config)); + $this->user = new \phpbb\user; $this->template_path = $this->test_path . '/templates'; - $this->style_resource_locator = new phpbb_style_resource_locator(); - $this->style_provider = new phpbb_style_path_provider(); - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context()); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, $this->style_provider, $this->template); + $this->style_resource_locator = new \phpbb\style\resource_locator(); + $this->style_provider = new \phpbb\style\path_provider(); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $this->user, new \phpbb\template\context()); + $this->style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, $this->style_provider, $this->template); $this->style->set_custom_style('tests', $this->template_path, array(), ''); } diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 4b8cbada45..9f97e92fd2 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -16,14 +16,14 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat global $phpbb_root_path, $phpEx, $user; $defaults = $this->config_defaults(); - $config = new phpbb_config(array_merge($defaults, $new_config)); + $config = new \phpbb\config\config(array_merge($defaults, $new_config)); $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $this->style_resource_locator = new phpbb_style_resource_locator(); - $this->style_provider = new phpbb_style_path_provider(); - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); + $this->style_resource_locator = new \phpbb\style\resource_locator(); + $this->style_provider = new \phpbb\style\path_provider(); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); + $this->style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); $this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), array(), ''); } } diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index c72ea5f765..1a9edcb181 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -82,7 +82,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $db_config = $this->get_database_config(); // Firebird requires table and column names to be uppercase - if ($db_config['dbms'] == 'phpbb_db_driver_firebird') + if ($db_config['dbms'] == '\phpbb\db\driver\firebird') { $xml_data = file_get_contents($path); $xml_data = preg_replace_callback('/(?:())/', 'phpbb_database_test_case::to_upper', $xml_data); diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index c93a777701..1a31fb13d0 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -108,7 +108,7 @@ class phpbb_database_test_connection_manager // These require different connection strings on the phpBB side than they do in PDO // so you must provide a DSN string for ODBC separately - if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'phpbb_db_driver_mssql' || $this->config['dbms'] == 'phpbb_db_driver_firebird')) + if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == '\phpbb\db\driver\mssql' || $this->config['dbms'] == '\phpbb\db\driver\firebird')) { $dsn = 'odbc:' . $this->config['custom_dsn']; } @@ -117,12 +117,12 @@ class phpbb_database_test_connection_manager { switch ($this->config['dbms']) { - case 'phpbb_db_driver_mssql': - case 'phpbb_db_driver_mssql_odbc': + case '\phpbb\db\driver\mssql': + case '\phpbb\db\driver\mssql_odbc': $this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('mssql', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']); break; - case 'phpbb_db_driver_firebird': + case '\phpbb\db\driver\firebird': if (!empty($this->config['custom_dsn'])) { $this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('firebird', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']); @@ -145,8 +145,8 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case 'phpbb_db_driver_mysql': - case 'phpbb_db_driver_mysqli': + case '\phpbb\db\driver\mysql': + case '\phpbb\db\driver\mysqli': $this->pdo->exec('SET NAMES utf8'); /* @@ -187,8 +187,8 @@ class phpbb_database_test_connection_manager { switch ($this->config['dbms']) { - case 'phpbb_db_driver_sqlite': - case 'phpbb_db_driver_firebird': + case '\phpbb\db\driver\sqlite': + case '\phpbb\db\driver\firebird': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -198,7 +198,7 @@ class phpbb_database_test_connection_manager $this->purge_extras(); break; - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\oracle': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -208,7 +208,7 @@ class phpbb_database_test_connection_manager $this->purge_extras(); break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -258,38 +258,38 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case 'phpbb_db_driver_mysql': - case 'phpbb_db_driver_mysqli': + case '\phpbb\db\driver\mysql': + case '\phpbb\db\driver\mysqli': $sql = 'SHOW TABLES'; break; - case 'phpbb_db_driver_sqlite': + case '\phpbb\db\driver\sqlite': $sql = 'SELECT name FROM sqlite_master WHERE type = "table"'; break; - case 'phpbb_db_driver_mssql': - case 'phpbb_db_driver_mssql_odbc': - case 'phpbb_db_driver_mssqlnative': + case '\phpbb\db\driver\mssql': + case '\phpbb\db\driver\mssql_odbc': + case '\phpbb\db\driver\mssqlnative': $sql = "SELECT name FROM sysobjects WHERE type='U'"; break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': $sql = 'SELECT relname FROM pg_stat_user_tables'; break; - case 'phpbb_db_driver_firebird': + case '\phpbb\db\driver\firebird': $sql = 'SELECT rdb$relation_name FROM rdb$relations WHERE rdb$view_source is null AND rdb$system_flag = 0'; break; - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\oracle': $sql = 'SELECT table_name FROM USER_TABLES'; break; @@ -325,7 +325,7 @@ class phpbb_database_test_connection_manager { $schema = $this->dbms['SCHEMA']; - if ($this->config['dbms'] == 'phpbb_db_driver_mysql') + if ($this->config['dbms'] == '\phpbb\db\driver\mysql') { $sth = $this->pdo->query('SELECT VERSION() AS version'); $row = $sth->fetch(PDO::FETCH_ASSOC); @@ -359,47 +359,47 @@ class phpbb_database_test_connection_manager protected function get_dbms_data($dbms) { $available_dbms = array( - 'phpbb_db_driver_firebird' => array( + '\phpbb\db\driver\firebird' => array( 'SCHEMA' => 'firebird', 'DELIM' => ';;', 'PDO' => 'firebird', ), - 'phpbb_db_driver_mysqli' => array( + '\phpbb\db\driver\mysqli' => array( 'SCHEMA' => 'mysql_41', 'DELIM' => ';', 'PDO' => 'mysql', ), - 'phpbb_db_driver_mysql' => array( + '\phpbb\db\driver\mysql' => array( 'SCHEMA' => 'mysql', 'DELIM' => ';', 'PDO' => 'mysql', ), - 'phpbb_db_driver_mssql' => array( + '\phpbb\db\driver\mssql' => array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'odbc', ), - 'phpbb_db_driver_mssql_odbc'=> array( + '\phpbb\db\driver\mssql_odbc'=> array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'odbc', ), - 'phpbb_db_driver_mssqlnative' => array( + '\phpbb\db\driver\mssqlnative' => array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'sqlsrv', ), - 'phpbb_db_driver_oracle' => array( + '\phpbb\db\driver\oracle' => array( 'SCHEMA' => 'oracle', 'DELIM' => '/', 'PDO' => 'oci', ), - 'phpbb_db_driver_postgres' => array( + '\phpbb\db\driver\postgres' => array( 'SCHEMA' => 'postgres', 'DELIM' => ';', 'PDO' => 'pgsql', ), - 'phpbb_db_driver_sqlite' => array( + '\phpbb\db\driver\sqlite' => array( 'SCHEMA' => 'sqlite', 'DELIM' => ';', 'PDO' => 'sqlite2', @@ -428,7 +428,7 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case 'phpbb_db_driver_firebird': + case '\phpbb\db\driver\firebird': $sql = 'SELECT RDB$GENERATOR_NAME FROM RDB$GENERATORS WHERE RDB$SYSTEM_FLAG = 0'; @@ -440,7 +440,7 @@ class phpbb_database_test_connection_manager } break; - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\oracle': $sql = 'SELECT sequence_name FROM USER_SEQUENCES'; $result = $this->pdo->query($sql); @@ -451,7 +451,7 @@ class phpbb_database_test_connection_manager } break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': $sql = 'SELECT sequence_name FROM information_schema.sequences'; $result = $this->pdo->query($sql); @@ -509,7 +509,7 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case 'phpbb_db_driver_oracle': + case '\phpbb\db\driver\oracle': // Get all of the information about the sequences $sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name, s.increment_by, s.min_value FROM USER_TRIGGERS t @@ -551,7 +551,7 @@ class phpbb_database_test_connection_manager } break; - case 'phpbb_db_driver_postgres': + case '\phpbb\db\driver\postgres': // Get the sequences attached to the tables $sql = 'SELECT column_name, table_name FROM information_schema.columns WHERE table_name IN (' . implode(', ', $table_names) . ") diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index ed307c3ce2..8929e93cfb 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -150,7 +150,7 @@ class phpbb_functional_test_case extends phpbb_test_case { global $phpbb_root_path, $phpEx; // so we don't reopen an open connection - if (!($this->db instanceof phpbb_db_driver)) + if (!($this->db instanceof \phpbb\db\driver\driver)) { $dbms = self::$config['dbms']; $this->db = new $dbms(); @@ -163,7 +163,7 @@ class phpbb_functional_test_case extends phpbb_test_case { if (!$this->cache) { - $this->cache = new phpbb_cache_driver_file; + $this->cache = new \phpbb\cache\driver\file; } return $this->cache; @@ -182,11 +182,11 @@ class phpbb_functional_test_case extends phpbb_test_case { global $phpbb_root_path, $phpEx; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $db = $this->get_db(); - $db_tools = new phpbb_db_tools($db); + $db_tools = new \phpbb\db\tools($db); - $migrator = new phpbb_db_migrator( + $migrator = new \phpbb\db\migrator( $config, $db, $db_tools, @@ -199,11 +199,11 @@ class phpbb_functional_test_case extends phpbb_test_case $container = new phpbb_mock_container_builder(); $container->set('migrator', $migrator); - $extension_manager = new phpbb_extension_manager( + $extension_manager = new \phpbb\extension\manager( $container, $db, $config, - new phpbb_filesystem(), + new \phpbb\filesystem(), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', $php_ext, @@ -471,7 +471,7 @@ class phpbb_functional_test_case extends phpbb_test_case // Required by unique_id global $config; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $config['rand_seed'] = ''; $config['rand_seed_last_update'] = time() + 600; @@ -484,7 +484,7 @@ class phpbb_functional_test_case extends phpbb_test_case } $cache = new phpbb_mock_null_cache; - $cache_driver = new phpbb_cache_driver_null(); + $cache_driver = new \phpbb\cache\driver\null(); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container ->expects($this->any()) @@ -521,18 +521,18 @@ class phpbb_functional_test_case extends phpbb_test_case { global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $config['coppa_enable'] = 0; $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->getMock('phpbb_user'); - $auth = $this->getMock('phpbb_auth'); + $user = $this->getMock('\phpbb\user'); + $auth = $this->getMock('\phpbb\auth\auth'); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $cache = new phpbb_mock_null_cache; - $cache_driver = new phpbb_cache_driver_null(); + $cache_driver = new \phpbb\cache\driver\null(); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container ->expects($this->any()) @@ -563,18 +563,18 @@ class phpbb_functional_test_case extends phpbb_test_case { global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; - $config = new phpbb_config(array()); + $config = new \phpbb\config\config(array()); $config['coppa_enable'] = 0; $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->getMock('phpbb_user'); - $auth = $this->getMock('phpbb_auth'); + $user = $this->getMock('\phpbb\user'); + $auth = $this->getMock('\phpbb\auth\auth'); - $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $cache = new phpbb_mock_null_cache; - $cache_driver = new phpbb_cache_driver_null(); + $cache_driver = new \phpbb\cache\driver\null(); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container ->expects($this->any()) diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 3d9cd10f32..4463ce19de 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -107,7 +107,7 @@ class phpbb_test_case_helpers if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) { $config = array_merge($config, array( - 'dbms' => 'phpbb_db_driver_sqlite', + 'dbms' => '\phpbb\db\driver\sqlite', 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename 'dbport' => '', 'dbname' => '', diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php index 43680609f8..ce03c1fc21 100644 --- a/tests/tree/nestedset_forum_base.php +++ b/tests/tree/nestedset_forum_base.php @@ -52,11 +52,11 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case global $config; - $config = $this->config = new phpbb_config(array('nestedset_forum_lock' => 0)); + $config = $this->config = new \phpbb\config\config(array('nestedset_forum_lock' => 0)); set_config(null, null, null, $this->config); - $this->lock = new phpbb_lock_db('nestedset_forum_lock', $this->config, $this->db); - $this->set = new phpbb_tree_nestedset_forum($this->db, $this->lock, 'phpbb_forums'); + $this->lock = new \phpbb\lock\db('nestedset_forum_lock', $this->config, $this->db); + $this->set = new \phpbb\tree\nestedset_forum($this->db, $this->lock, 'phpbb_forums'); $this->set_up_forums(); } @@ -97,7 +97,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case } else { - $buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_forums'); + $buffer = new \phpbb\db\sql_insert_buffer($this->db, 'phpbb_forums'); $buffer->insert_all($forums); $buffer->flush(); diff --git a/tests/user/lang_test.php b/tests/user/lang_test.php index d7ff451a70..c7c858c59d 100644 --- a/tests/user/lang_test.php +++ b/tests/user/lang_test.php @@ -11,7 +11,7 @@ class phpbb_user_lang_test extends phpbb_test_case { public function test_user_lang_sprintf() { - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array( 'FOO' => 'BAR', 'BARZ' => 'PENG', @@ -93,7 +93,7 @@ class phpbb_user_lang_test extends phpbb_test_case $this->assertEquals($user->lang('ARRY', 1, 's', 2), '1 post'); // ticket PHPBB3-10345 - different plural rules, not just 0/1/2+ - $user = new phpbb_user; + $user = new \phpbb\user; $user->lang = array( 'PLURAL_RULE' => 13, 'ARRY' => array( diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index 5cdb654b18..13c35030f9 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -24,7 +24,7 @@ class phpbb_user_loader_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->user_loader = new phpbb_user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); + $this->user_loader = new \phpbb\user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users'); } public function test_load_get() diff --git a/tests/wrapper/phpbb_php_ini_fake.php b/tests/wrapper/phpbb_php_ini_fake.php index 49bc5936e5..d9e96447e3 100644 --- a/tests/wrapper/phpbb_php_ini_fake.php +++ b/tests/wrapper/phpbb_php_ini_fake.php @@ -7,7 +7,7 @@ * */ -class phpbb_php_ini_fake extends phpbb_php_ini +class phpbb_php_ini_fake extends \phpbb\php\ini { function get($varname) { From e1239b455fb4e8c5fcc80e9890c501e70ff8f1e4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:17:47 +0200 Subject: [PATCH 013/102] [ticket/11700] Namespaces and class names should not start with digits PHPBB3-11700 --- .../migration/data/{30x => v30x}/local_url_bbcode.php | 0 .../data/{30x/3_0_1.php => v30x/release_3_0_1.php} | 0 .../data/{30x/3_0_10.php => v30x/release_3_0_10.php} | 0 .../3_0_10_rc1.php => v30x/release_3_0_10_rc1.php} | 0 .../3_0_10_rc2.php => v30x/release_3_0_10_rc2.php} | 0 .../3_0_10_rc3.php => v30x/release_3_0_10_rc3.php} | 0 .../data/{30x/3_0_11.php => v30x/release_3_0_11.php} | 0 .../3_0_11_rc1.php => v30x/release_3_0_11_rc1.php} | 0 .../3_0_11_rc2.php => v30x/release_3_0_11_rc2.php} | 0 .../3_0_12_rc1.php => v30x/release_3_0_12_rc1.php} | 2 +- .../{30x/3_0_1_rc1.php => v30x/release_3_0_1_rc1.php} | 0 .../data/{30x/3_0_2.php => v30x/release_3_0_2.php} | 0 .../{30x/3_0_2_rc1.php => v30x/release_3_0_2_rc1.php} | 0 .../{30x/3_0_2_rc2.php => v30x/release_3_0_2_rc2.php} | 0 .../data/{30x/3_0_3.php => v30x/release_3_0_3.php} | 0 .../{30x/3_0_3_rc1.php => v30x/release_3_0_3_rc1.php} | 0 .../data/{30x/3_0_4.php => v30x/release_3_0_4.php} | 0 .../{30x/3_0_4_rc1.php => v30x/release_3_0_4_rc1.php} | 0 .../data/{30x/3_0_5.php => v30x/release_3_0_5.php} | 0 .../{30x/3_0_5_rc1.php => v30x/release_3_0_5_rc1.php} | 0 .../release_3_0_5_rc1part2.php} | 0 .../data/{30x/3_0_6.php => v30x/release_3_0_6.php} | 0 .../{30x/3_0_6_rc1.php => v30x/release_3_0_6_rc1.php} | 0 .../{30x/3_0_6_rc2.php => v30x/release_3_0_6_rc2.php} | 0 .../{30x/3_0_6_rc3.php => v30x/release_3_0_6_rc3.php} | 0 .../{30x/3_0_6_rc4.php => v30x/release_3_0_6_rc4.php} | 0 .../data/{30x/3_0_7.php => v30x/release_3_0_7.php} | 0 .../{30x/3_0_7_pl1.php => v30x/release_3_0_7_pl1.php} | 0 .../{30x/3_0_7_rc1.php => v30x/release_3_0_7_rc1.php} | 0 .../{30x/3_0_7_rc2.php => v30x/release_3_0_7_rc2.php} | 0 .../data/{30x/3_0_8.php => v30x/release_3_0_8.php} | 0 .../{30x/3_0_8_rc1.php => v30x/release_3_0_8_rc1.php} | 0 .../data/{30x/3_0_9.php => v30x/release_3_0_9.php} | 0 .../{30x/3_0_9_rc1.php => v30x/release_3_0_9_rc1.php} | 0 .../{30x/3_0_9_rc2.php => v30x/release_3_0_9_rc2.php} | 0 .../{30x/3_0_9_rc3.php => v30x/release_3_0_9_rc3.php} | 0 .../{30x/3_0_9_rc4.php => v30x/release_3_0_9_rc4.php} | 0 .../phpbb/db/migration/data/{310 => v310}/avatars.php | 4 ++-- .../db/migration/data/{310 => v310}/boardindex.php | 2 +- .../db/migration/data/{310 => v310}/config_db_text.php | 4 ++-- phpBB/phpbb/db/migration/data/{310 => v310}/dev.php | 10 +++++----- .../db/migration/data/{310 => v310}/extensions.php | 4 ++-- .../migration/data/{310 => v310}/forgot_password.php | 4 ++-- .../db/migration/data/{310 => v310}/jquery_update.php | 4 ++-- .../{310 => v310}/notification_options_reconvert.php | 4 ++-- .../db/migration/data/{310 => v310}/notifications.php | 4 ++-- .../data/{310 => v310}/notifications_schema_fix.php | 4 ++-- .../data/{310 => v310}/reported_posts_display.php | 4 ++-- .../data/{310 => v310}/signature_module_auth.php | 4 ++-- .../db/migration/data/{310 => v310}/softdelete_p1.php | 4 ++-- .../db/migration/data/{310 => v310}/softdelete_p2.php | 6 +++--- .../migration/data/{310 => v310}/style_update_p1.php | 4 ++-- .../migration/data/{310 => v310}/style_update_p2.php | 0 .../phpbb/db/migration/data/{310 => v310}/teampage.php | 4 ++-- .../phpbb/db/migration/data/{310 => v310}/timezone.php | 4 ++-- .../db/migration/data/{310 => v310}/timezone_p2.php | 4 ++-- 56 files changed, 40 insertions(+), 40 deletions(-) rename phpBB/phpbb/db/migration/data/{30x => v30x}/local_url_bbcode.php (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_1.php => v30x/release_3_0_1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_10.php => v30x/release_3_0_10.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_10_rc1.php => v30x/release_3_0_10_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_10_rc2.php => v30x/release_3_0_10_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_10_rc3.php => v30x/release_3_0_10_rc3.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_11.php => v30x/release_3_0_11.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_11_rc1.php => v30x/release_3_0_11_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_11_rc2.php => v30x/release_3_0_11_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_12_rc1.php => v30x/release_3_0_12_rc1.php} (98%) rename phpBB/phpbb/db/migration/data/{30x/3_0_1_rc1.php => v30x/release_3_0_1_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_2.php => v30x/release_3_0_2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_2_rc1.php => v30x/release_3_0_2_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_2_rc2.php => v30x/release_3_0_2_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_3.php => v30x/release_3_0_3.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_3_rc1.php => v30x/release_3_0_3_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_4.php => v30x/release_3_0_4.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_4_rc1.php => v30x/release_3_0_4_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_5.php => v30x/release_3_0_5.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_5_rc1.php => v30x/release_3_0_5_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_5_rc1part2.php => v30x/release_3_0_5_rc1part2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_6.php => v30x/release_3_0_6.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_6_rc1.php => v30x/release_3_0_6_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_6_rc2.php => v30x/release_3_0_6_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_6_rc3.php => v30x/release_3_0_6_rc3.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_6_rc4.php => v30x/release_3_0_6_rc4.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_7.php => v30x/release_3_0_7.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_7_pl1.php => v30x/release_3_0_7_pl1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_7_rc1.php => v30x/release_3_0_7_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_7_rc2.php => v30x/release_3_0_7_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_8.php => v30x/release_3_0_8.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_8_rc1.php => v30x/release_3_0_8_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_9.php => v30x/release_3_0_9.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_9_rc1.php => v30x/release_3_0_9_rc1.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_9_rc2.php => v30x/release_3_0_9_rc2.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_9_rc3.php => v30x/release_3_0_9_rc3.php} (100%) rename phpBB/phpbb/db/migration/data/{30x/3_0_9_rc4.php => v30x/release_3_0_9_rc4.php} (100%) rename phpBB/phpbb/db/migration/data/{310 => v310}/avatars.php (93%) rename phpBB/phpbb/db/migration/data/{310 => v310}/boardindex.php (91%) rename phpBB/phpbb/db/migration/data/{310 => v310}/config_db_text.php (88%) rename phpBB/phpbb/db/migration/data/{310 => v310}/dev.php (98%) rename phpBB/phpbb/db/migration/data/{310 => v310}/extensions.php (92%) rename phpBB/phpbb/db/migration/data/{310 => v310}/forgot_password.php (82%) rename phpBB/phpbb/db/migration/data/{310 => v310}/jquery_update.php (88%) rename phpBB/phpbb/db/migration/data/{310 => v310}/notification_options_reconvert.php (95%) rename phpBB/phpbb/db/migration/data/{310 => v310}/notifications.php (96%) rename phpBB/phpbb/db/migration/data/{310 => v310}/notifications_schema_fix.php (96%) rename phpBB/phpbb/db/migration/data/{310 => v310}/reported_posts_display.php (90%) rename phpBB/phpbb/db/migration/data/{310 => v310}/signature_module_auth.php (92%) rename phpBB/phpbb/db/migration/data/{310 => v310}/softdelete_p1.php (98%) rename phpBB/phpbb/db/migration/data/{310 => v310}/softdelete_p2.php (93%) rename phpBB/phpbb/db/migration/data/{310 => v310}/style_update_p1.php (98%) rename phpBB/phpbb/db/migration/data/{310 => v310}/style_update_p2.php (100%) rename phpBB/phpbb/db/migration/data/{310 => v310}/teampage.php (96%) rename phpBB/phpbb/db/migration/data/{310 => v310}/timezone.php (98%) rename phpBB/phpbb/db/migration/data/{310 => v310}/timezone_p2.php (88%) diff --git a/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php rename to phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_10.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_11.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php similarity index 98% rename from phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php index f1692f8ef7..3f851967df 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php @@ -18,7 +18,7 @@ class 3_0_12_rc1 extends \phpbb\db\migration\migration return version_compare($this->config['version'], '3.0.12-rc1', '>='); } - static public function depends_on() + static public function depends_on() { return array('phpbb_db_migration_data_30x_3_0_11'); } diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_3.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_4.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_5.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_6.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_7.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_8.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_8.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_9.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php similarity index 100% rename from phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php rename to phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php diff --git a/phpBB/phpbb/db/migration/data/310/avatars.php b/phpBB/phpbb/db/migration/data/v310/avatars.php similarity index 93% rename from phpBB/phpbb/db/migration/data/310/avatars.php rename to phpBB/phpbb/db/migration/data/v310/avatars.php index 0d539d0c75..80ce606f29 100644 --- a/phpBB/phpbb/db/migration/data/310/avatars.php +++ b/phpBB/phpbb/db/migration/data/v310/avatars.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class avatars extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class avatars extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/boardindex.php b/phpBB/phpbb/db/migration/data/v310/boardindex.php similarity index 91% rename from phpBB/phpbb/db/migration/data/310/boardindex.php rename to phpBB/phpbb/db/migration/data/v310/boardindex.php index ee403a7360..27492f2d0d 100644 --- a/phpBB/phpbb/db/migration/data/310/boardindex.php +++ b/phpBB/phpbb/db/migration/data/v310/boardindex.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class boardindex extends \phpbb\db\migration\migration { diff --git a/phpBB/phpbb/db/migration/data/310/config_db_text.php b/phpBB/phpbb/db/migration/data/v310/config_db_text.php similarity index 88% rename from phpBB/phpbb/db/migration/data/310/config_db_text.php rename to phpBB/phpbb/db/migration/data/v310/config_db_text.php index 932edf39d7..1a7ee7a9a6 100644 --- a/phpBB/phpbb/db/migration/data/310/config_db_text.php +++ b/phpBB/phpbb/db/migration/data/v310/config_db_text.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class config_db_text extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class config_db_text extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/dev.php b/phpBB/phpbb/db/migration/data/v310/dev.php similarity index 98% rename from phpBB/phpbb/db/migration/data/310/dev.php rename to phpBB/phpbb/db/migration/data/v310/dev.php index 702073bcdd..5a10e7c236 100644 --- a/phpBB/phpbb/db/migration/data/310/dev.php +++ b/phpBB/phpbb/db/migration/data/v310/dev.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class dev extends \phpbb\db\migration\migration { @@ -19,10 +19,10 @@ class dev extends \phpbb\db\migration\migration static public function depends_on() { return array( - '\phpbb\db\migration\data0\extensions', - '\phpbb\db\migration\data0\style_update_p2', - '\phpbb\db\migration\data0\timezone_p2', - '\phpbb\db\migration\data0\reported_posts_display', + '\phpbb\db\migration\data\v310\extensions', + '\phpbb\db\migration\data\v310\style_update_p2', + '\phpbb\db\migration\data\v310\timezone_p2', + '\phpbb\db\migration\data\v310\reported_posts_display', ); } diff --git a/phpBB/phpbb/db/migration/data/310/extensions.php b/phpBB/phpbb/db/migration/data/v310/extensions.php similarity index 92% rename from phpBB/phpbb/db/migration/data/310/extensions.php rename to phpBB/phpbb/db/migration/data/v310/extensions.php index fde2038cca..d8b38dbc9e 100644 --- a/phpBB/phpbb/db/migration/data/310/extensions.php +++ b/phpBB/phpbb/db/migration/data/v310/extensions.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class extensions extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class extensions extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/forgot_password.php b/phpBB/phpbb/db/migration/data/v310/forgot_password.php similarity index 82% rename from phpBB/phpbb/db/migration/data/310/forgot_password.php rename to phpBB/phpbb/db/migration/data/v310/forgot_password.php index 9a42565223..814093caa9 100644 --- a/phpBB/phpbb/db/migration/data/310/forgot_password.php +++ b/phpBB/phpbb/db/migration/data/v310/forgot_password.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class forgot_password extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class forgot_password extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/310/jquery_update.php b/phpBB/phpbb/db/migration/data/v310/jquery_update.php similarity index 88% rename from phpBB/phpbb/db/migration/data/310/jquery_update.php rename to phpBB/phpbb/db/migration/data/v310/jquery_update.php index 2b30e2dd3b..bd2de2b4d4 100644 --- a/phpBB/phpbb/db/migration/data/310/jquery_update.php +++ b/phpBB/phpbb/db/migration/data/v310/jquery_update.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class jquery_update extends \phpbb\db\migration\migration { @@ -19,7 +19,7 @@ class jquery_update extends \phpbb\db\migration\migration static public function depends_on() { return array( - '\phpbb\db\migration\data0\dev', + '\phpbb\db\migration\data\v310\dev', ); } diff --git a/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php similarity index 95% rename from phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php rename to phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php index 482051c287..bd7614e1c2 100644 --- a/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php @@ -7,13 +7,13 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class notification_options_reconvert extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data0\notifications_schema_fix'); + return array('\phpbb\db\migration\data\v310\notifications_schema_fix'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/310/notifications.php b/phpBB/phpbb/db/migration/data/v310/notifications.php similarity index 96% rename from phpBB/phpbb/db/migration/data/310/notifications.php rename to phpBB/phpbb/db/migration/data/v310/notifications.php index f5bd9ebf07..10f1392094 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class notifications extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class notifications extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\dev'); + return array('\phpbb\db\migration\data\v310\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php similarity index 96% rename from phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php rename to phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php index fa2da6fe92..8ed626d8a6 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php @@ -7,13 +7,13 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class notifications_schema_fix extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data0\notifications'); + return array('\phpbb\db\migration\data\v310\notifications'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/reported_posts_display.php b/phpBB/phpbb/db/migration/data/v310/reported_posts_display.php similarity index 90% rename from phpBB/phpbb/db/migration/data/310/reported_posts_display.php rename to phpBB/phpbb/db/migration/data/v310/reported_posts_display.php index ef35f48970..56b7a0916c 100644 --- a/phpBB/phpbb/db/migration/data/310/reported_posts_display.php +++ b/phpBB/phpbb/db/migration/data/v310/reported_posts_display.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class reported_posts_display extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class reported_posts_display extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php similarity index 92% rename from phpBB/phpbb/db/migration/data/310/signature_module_auth.php rename to phpBB/phpbb/db/migration/data/v310/signature_module_auth.php index 27585fec10..494125ea5c 100644 --- a/phpBB/phpbb/db/migration/data/310/signature_module_auth.php +++ b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class signature_module_auth extends \phpbb\db\migration\migration { @@ -27,7 +27,7 @@ class signature_module_auth extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_31x_dev'); + return array('\phpbb\db\migration\data\v31x\dev'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_p1.php b/phpBB/phpbb/db/migration/data/v310/softdelete_p1.php similarity index 98% rename from phpBB/phpbb/db/migration/data/310/softdelete_p1.php rename to phpBB/phpbb/db/migration/data/v310/softdelete_p1.php index 22ee78bb22..0418d5cc2b 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_p1.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class softdelete_p1 extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class softdelete_p1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\dev'); + return array('\phpbb\db\migration\data\v310\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php similarity index 93% rename from phpBB/phpbb/db/migration/data/310/softdelete_p2.php rename to phpBB/phpbb/db/migration/data/v310/softdelete_p2.php index 698e44fab7..0c32e474f4 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class softdelete_p2 extends \phpbb\db\migration\migration { @@ -19,8 +19,8 @@ class softdelete_p2 extends \phpbb\db\migration\migration static public function depends_on() { return array( - '\phpbb\db\migration\data0\dev', - '\phpbb\db\migration\data0\softdelete_p1', + '\phpbb\db\migration\data\v310\dev', + '\phpbb\db\migration\data\v310\softdelete_p1', ); } diff --git a/phpBB/phpbb/db/migration/data/310/style_update_p1.php b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php similarity index 98% rename from phpBB/phpbb/db/migration/data/310/style_update_p1.php rename to phpBB/phpbb/db/migration/data/v310/style_update_p1.php index fe60993f20..26f1046287 100644 --- a/phpBB/phpbb/db/migration/data/310/style_update_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class style_update_p1 extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class style_update_p1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php similarity index 100% rename from phpBB/phpbb/db/migration/data/310/style_update_p2.php rename to phpBB/phpbb/db/migration/data/v310/style_update_p2.php diff --git a/phpBB/phpbb/db/migration/data/310/teampage.php b/phpBB/phpbb/db/migration/data/v310/teampage.php similarity index 96% rename from phpBB/phpbb/db/migration/data/310/teampage.php rename to phpBB/phpbb/db/migration/data/v310/teampage.php index 605156dc41..80cc4be1c0 100644 --- a/phpBB/phpbb/db/migration/data/310/teampage.php +++ b/phpBB/phpbb/db/migration/data/v310/teampage.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class teampage extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class teampage extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\dev'); + return array('\phpbb\db\migration\data\v310\dev'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php similarity index 98% rename from phpBB/phpbb/db/migration/data/310/timezone.php rename to phpBB/phpbb/db/migration/data/v310/timezone.php index 97fea19a64..93c58819ce 100644 --- a/phpBB/phpbb/db/migration/data/310/timezone.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class timezone extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class timezone extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/310/timezone_p2.php b/phpBB/phpbb/db/migration/data/v310/timezone_p2.php similarity index 88% rename from phpBB/phpbb/db/migration/data/310/timezone_p2.php rename to phpBB/phpbb/db/migration/data/v310/timezone_p2.php index 0c174b0d56..1066ab8571 100644 --- a/phpBB/phpbb/db/migration/data/310/timezone_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone_p2.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class timezone_p2 extends \phpbb\db\migration\migration { @@ -18,7 +18,7 @@ class timezone_p2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\timezone'); + return array('\phpbb\db\migration\data\v310\timezone'); } public function update_schema() From ee735685ac98d9b1ebb11cfcce6958a5266f3e39 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:37:32 +0200 Subject: [PATCH 014/102] [ticket/11700] Fix number class names in 3.0.x migrations PHPBB3-11700 --- phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php | 4 ++-- phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php | 4 ++-- phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 6 +++--- .../phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php | 6 +++--- phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php | 6 +++--- 37 files changed, 109 insertions(+), 109 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php index 360daed437..5e6ba90336 100644 --- a/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php +++ b/phpBB/phpbb/db/migration/data/v30x/local_url_bbcode.php @@ -7,13 +7,13 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; class local_url_bbcode extends \phpbb\db\migration\migration { static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_12_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_12_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php index 2fe0addc06..26f90a18f3 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_1 extends \phpbb\db\migration\migration +class release_3_0_1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_1_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_1_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php index cdf824a9ff..5da406e115 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_10 extends \phpbb\db\migration\migration +class release_3_0_10 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_10 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_10_rc3'); + return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc3'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php index ee05fcabaa..4cde65dd72 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_10_rc1 extends \phpbb\db\migration\migration +class release_3_0_10_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_10_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_9'); + return array('\phpbb\db\migration\data\v30x\release_3_0_9'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php index f53a4b0d97..a729f45ed1 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_10_rc2 extends \phpbb\db\migration\migration +class release_3_0_10_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_10_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_10_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php index 20456e0458..4c47868c19 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_10_rc3.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_10_rc3 extends \phpbb\db\migration\migration +class release_3_0_10_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_10_rc3 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_10_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_10_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php index 5b842cba4b..f65fe178c0 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_11 extends \phpbb\db\migration\migration +class release_3_0_11 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_11 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php index 1d484a97ca..860a65052f 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_11_rc1 extends \phpbb\db\migration\migration +class release_3_0_11_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_11_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_10'); + return array('\phpbb\db\migration\data\v30x\release_3_0_10'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php index b7e475a87b..62e267ac01 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_11_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_11_rc2 extends \phpbb\db\migration\migration +class release_3_0_11_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_11_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11_rc1'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php index 3f851967df..69db096cb0 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc1.php @@ -7,11 +7,11 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/ -class 3_0_12_rc1 extends \phpbb\db\migration\migration +class release_3_0_12_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -20,7 +20,7 @@ class 3_0_12_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_11'); + return array('\phpbb\db\migration\data\v30x\release_3_0_11'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php index 0444de4ac2..990b82141e 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_1_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_1_rc1 extends \phpbb\db\migration\migration +class release_3_0_1_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php index 4f9278e2fa..abb41f38cf 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_2 extends \phpbb\db\migration\migration +class release_3_0_2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_2_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_2_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php index 8f709fb769..8661531dd9 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_2_rc1 extends \phpbb\db\migration\migration +class release_3_0_2_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_2_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php index ecbe8bf808..55055ca0a2 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_2_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_2_rc2 extends \phpbb\db\migration\migration +class release_3_0_2_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_2_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_2_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_2_rc1'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php index 5f94bd9018..49e37e9386 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_3 extends \phpbb\db\migration\migration +class release_3_0_3 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_3 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_3_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_3_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php index 631d382135..4b87933b11 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_3_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_3_rc1 extends \phpbb\db\migration\migration +class release_3_0_3_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_3_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_2'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php index 369f23f7e7..f15f806cee 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_4 extends \phpbb\db\migration\migration +class release_3_0_4 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_4 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_4_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_4_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php index f98d7a59d0..752dfd2576 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_4_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_4_rc1 extends \phpbb\db\migration\migration +class release_3_0_4_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_4_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_3'); + return array('\phpbb\db\migration\data\v30x\release_3_0_3'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php index 9265f09b39..f2d458e9c5 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_5 extends \phpbb\db\migration\migration +class release_3_0_5 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_5 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_5_rc1part2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_5_rc1part2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php index b99313de5d..81bd3db975 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_5_rc1 extends \phpbb\db\migration\migration +class release_3_0_5_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_5_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_4'); + return array('\phpbb\db\migration\data\v30x\release_3_0_4'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php index 65787f9310..1c04d814fd 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1part2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_5_rc1part2 extends \phpbb\db\migration\migration +class release_3_0_5_rc1part2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_5_rc1part2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_5_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_5_rc1'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php index 382fb6cde2..24b7dc51a5 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_6 extends \phpbb\db\migration\migration +class release_3_0_6 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_6 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_6_rc4'); + return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc4'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php index 0b54c3b195..d78a0b7eed 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_6_rc1 extends \phpbb\db\migration\migration +class release_3_0_6_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_6_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_5'); + return array('\phpbb\db\migration\data\v30x\release_3_0_5'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php index 041224d19a..d5dbf2e2a9 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_6_rc2 extends \phpbb\db\migration\migration +class release_3_0_6_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_6_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_6_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php index 3183c16efd..40fd076ff1 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc3.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_6_rc3 extends \phpbb\db\migration\migration +class release_3_0_6_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_6_rc3 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_6_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php index 7d75b12130..93b01c888f 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc4.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_6_rc4 extends \phpbb\db\migration\migration +class release_3_0_6_rc4 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_6_rc4 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_6_rc3'); + return array('\phpbb\db\migration\data\v30x\release_3_0_6_rc3'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php index 1b1e5d0373..e19cbb04fa 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_7 extends \phpbb\db\migration\migration +class release_3_0_7 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_7 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_7_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_7_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php index a45c9c3c14..0fad5f5ff5 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_pl1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_7_pl1 extends \phpbb\db\migration\migration +class release_3_0_7_pl1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_7_pl1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_7'); + return array('\phpbb\db\migration\data\v30x\release_3_0_7'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php index dab90512ab..17f97c7043 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_7_rc1 extends \phpbb\db\migration\migration +class release_3_0_7_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_7_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_6'); + return array('\phpbb\db\migration\data\v30x\release_3_0_6'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php index ea430740c6..0437e7aa7c 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_7_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_7_rc2 extends \phpbb\db\migration\migration +class release_3_0_7_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_7_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_7_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_7_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php index c08a74e5ee..ccd1b94bef 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_8 extends \phpbb\db\migration\migration +class release_3_0_8 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_8 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_8_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_8_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php index dce88e249e..be32ec0384 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_8_rc1 extends \phpbb\db\migration\migration +class release_3_0_8_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_8_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_7_pl1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_7_pl1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php index 8254ac8561..1783ee8a34 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_9 extends \phpbb\db\migration\migration +class release_3_0_9 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_9 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_9_rc4'); + return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc4'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php index 14e0fe6013..12a8c341d0 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc1.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_9_rc1 extends \phpbb\db\migration\migration +class release_3_0_9_rc1 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_9_rc1 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_8'); + return array('\phpbb\db\migration\data\v30x\release_3_0_8'); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php index 44fd789353..f6e05361b3 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc2.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_9_rc2 extends \phpbb\db\migration\migration +class release_3_0_9_rc2 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_9_rc2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_9_rc1'); + return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc1'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php index e4102fb193..29b53e56c9 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc3.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_9_rc3 extends \phpbb\db\migration\migration +class release_3_0_9_rc3 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_9_rc3 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_9_rc2'); + return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc2'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php index 5896d11ba5..4921330fdd 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_9_rc4.php @@ -7,9 +7,9 @@ * */ -namespace phpbb\db\migration\datax; +namespace phpbb\db\migration\data\v30x; -class 3_0_9_rc4 extends \phpbb\db\migration\migration +class release_3_0_9_rc4 extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -18,7 +18,7 @@ class 3_0_9_rc4 extends \phpbb\db\migration\migration static public function depends_on() { - return array('phpbb_db_migration_data_30x_3_0_9_rc3'); + return array('\phpbb\db\migration\data\v30x\release_3_0_9_rc3'); } public function update_data() From 43c5ed570fca18c5a41a6b9b2b60de4dd4235d2c Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:40:30 +0200 Subject: [PATCH 015/102] [ticket/11700] Fix avatar tests PHPBB3-11700 --- tests/avatar/driver/barfoo.php | 4 +++- tests/avatar/driver/foobar.php | 4 +++- tests/avatar/manager_test.php | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php index 12a3943d6c..11c100db36 100644 --- a/tests/avatar/driver/barfoo.php +++ b/tests/avatar/driver/barfoo.php @@ -1,6 +1,8 @@ getMock('\phpbb\cache\driver\driver_interface'); // $this->avatar_foobar will be needed later on - $this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); + $this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); $this->avatar_foobar->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.foobar')); // barfoo driver can't be mocked with constructor arguments - $this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name')); + $this->avatar_barfoo = $this->getMock('\phpbb\avatar\driver\barfoo', array('get_name')); $this->avatar_barfoo->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.barfoo')); @@ -40,7 +40,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase foreach ($this->avatar_drivers() as $driver) { - $cur_avatar = $this->getMock('phpbb_avatar_driver_' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); + $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache)); $cur_avatar->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.' . $driver)); From 1a6202d517a1cef817d2cedafdf36b0d95bb69a0 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:44:22 +0200 Subject: [PATCH 016/102] [ticket/11700] Fix config db tests after namespace mishap PHPBB3-11700 --- tests/config/db_test.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/config/db_test.php b/tests/config/db_test.php index a014c72c65..dd1c88f707 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -24,7 +24,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->cache = new phpbb_mock_cache; $this->db = $this->new_dbal(); - $this->config = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $this->config = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); } public function test_load_config() @@ -36,7 +36,7 @@ class phpbb_config_db_test extends phpbb_database_test_case public function test_load_cached() { $cache = new phpbb_mock_cache(array('config' => array('x' => 'y'))); - $this->config = new \phpbb\config\db($this->db, $cache, '\phpbb\config\config'); + $this->config = new \phpbb\config\db($this->db, $cache, 'phpbb_config'); $this->assertTrue(!isset($this->config['foo'])); $this->assertEquals('42', $this->config['bar']); @@ -49,7 +49,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config['foo'] = 'x'; // temporary set $this->assertEquals('x', $this->config['foo']); - $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); $this->assertEquals('23', $config2['foo']); } @@ -59,7 +59,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('17', $this->config['foo']); // re-read config and populate cache - $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); $this->cache->checkVar($this, 'config', array('foo' => '17')); } @@ -68,7 +68,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config->set('bar', '17', false); // re-read config and populate cache - $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); $this->cache->checkVar($this, 'config', array('foo' => '23')); } @@ -78,7 +78,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('5', $this->config['foobar']); // re-read config and populate cache - $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); $this->cache->checkVar($this, 'config', array('foo' => '23', 'foobar' => '5')); } @@ -88,7 +88,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->assertEquals('5', $this->config['foobar']); // re-read config and populate cache - $config2 = new \phpbb\config\db($this->db, $this->cache, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config'); $this->cache->checkVar($this, 'config', array('foo' => '23')); } @@ -133,7 +133,7 @@ class phpbb_config_db_test extends phpbb_database_test_case // re-read config and populate cache $cache2 = new phpbb_mock_cache; - $config2 = new \phpbb\config\db($this->db, $cache2, '\phpbb\config\config'); + $config2 = new \phpbb\config\db($this->db, $cache2, 'phpbb_config'); $cache2->checkVarUnset($this, 'foo'); $this->assertFalse(isset($config2['foo'])); } @@ -145,7 +145,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config->delete('bar'); $this->cache->checkVarUnset($this, 'bar'); $this->assertFalse(isset($this->config['bar'])); - + $this->config->set('bar', 'new bar', false); $this->assertEquals('new bar', $this->config['bar']); } @@ -157,7 +157,7 @@ class phpbb_config_db_test extends phpbb_database_test_case $this->config->delete('foo'); $this->cache->checkVarUnset($this, 'foo'); $this->assertFalse(isset($this->config['foo'])); - + $this->config->set('foo', 'new foo', true); $this->assertEquals('new foo', $this->config['foo']); } From 97012dd85151018e003aa8abf793ad04206a5627 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:52:07 +0200 Subject: [PATCH 017/102] [ticket/11700] Fix dbal tests after config namespace mishap PHPBB3-11700 --- tests/dbal/case_test.php | 12 ++++++------ tests/dbal/concatenate_test.php | 4 ++-- tests/dbal/migration/dummy.php | 2 +- tests/dbal/migration/revert.php | 4 ++-- tests/dbal/migrator_test.php | 16 ++++++++-------- tests/dbal/schema_test.php | 4 ++-- tests/dbal/sql_insert_buffer_test.php | 4 ++-- tests/dbal/write_test.php | 20 ++++++++++---------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php index edab3525a1..57a1729a39 100644 --- a/tests/dbal/case_test.php +++ b/tests/dbal/case_test.php @@ -19,13 +19,13 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case('1 = 1', '1', '2') . ' AS test_num - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals(1, (int) $db->sql_fetchfield('test_num')); $sql = 'SELECT ' . $db->sql_case('1 = 0', '1', '2') . ' AS test_num - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals(2, (int) $db->sql_fetchfield('test_num')); @@ -36,13 +36,13 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case('1 = 1', "'foo'", "'bar'") . ' AS test_string - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('foo', $db->sql_fetchfield('test_string')); $sql = 'SELECT ' . $db->sql_case('1 = 0', "'foo'", "'bar'") . ' AS test_string - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('bar', $db->sql_fetchfield('test_string')); @@ -53,14 +53,14 @@ class phpbb_dbal_case_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string - FROM \phpbb\config\config + FROM phpbb_config WHERE config_name = 'config1'"; $result = $db->sql_query_limit($sql, 1); $this->assertEquals('config1', $db->sql_fetchfield('test_string')); $sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string - FROM \phpbb\config\config + FROM phpbb_config WHERE config_value = 'bar'"; $result = $db->sql_query_limit($sql, 1); diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php index 818bde7d23..0891fa58a0 100644 --- a/tests/dbal/concatenate_test.php +++ b/tests/dbal/concatenate_test.php @@ -19,7 +19,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', "'" . $db->sql_escape('append') . "'") . ' AS string - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query($sql); $db->sql_return_on_error(false); @@ -43,7 +43,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case $db = $this->new_dbal(); $sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', 'config_value') . ' AS string - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query($sql); $db->sql_return_on_error(false); diff --git a/tests/dbal/migration/dummy.php b/tests/dbal/migration/dummy.php index 3f48f22252..041c529855 100644 --- a/tests/dbal/migration/dummy.php +++ b/tests/dbal/migration/dummy.php @@ -18,7 +18,7 @@ class phpbb_dbal_migration_dummy extends \phpbb\db\migration\migration { return array( 'add_columns' => array( - '\phpbb\config\config' => array( + 'phpbb_config' => array( 'extra_column' => array('UINT', 1), ), ), diff --git a/tests/dbal/migration/revert.php b/tests/dbal/migration/revert.php index c46dfca30d..1882b20492 100644 --- a/tests/dbal/migration/revert.php +++ b/tests/dbal/migration/revert.php @@ -13,7 +13,7 @@ class phpbb_dbal_migration_revert extends \phpbb\db\migration\migration { return array( 'add_columns' => array( - '\phpbb\config\config' => array( + 'phpbb_config' => array( 'bar_column' => array('UINT', 1), ), ), @@ -24,7 +24,7 @@ class phpbb_dbal_migration_revert extends \phpbb\db\migration\migration { return array( 'drop_columns' => array( - '\phpbb\config\config' => array( + 'phpbb_config' => array( 'bar_column', ), ), diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index d336854a1c..6679ae407b 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -35,7 +35,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->db = $this->new_dbal(); $this->db_tools = new \phpbb\db\tools($this->db); - $this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, '\phpbb\config\config'); + $this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config'); $tools = array( new \phpbb\db\migration\tool\config($this->config), @@ -91,7 +91,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('extra_column' => '1')), - "SELECT extra_column FROM \phpbb\config\config WHERE config_name = 'foo'", + "SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", 'Dummy migration created extra_column with value 1 in all rows.' ); @@ -107,7 +107,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case ); // cleanup - $this->db_tools->sql_column_remove('\phpbb\config\config', 'extra_column'); + $this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); } public function test_unfulfillable() @@ -123,11 +123,11 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('extra_column' => '1')), - "SELECT extra_column FROM \phpbb\config\config WHERE config_name = 'foo'", + "SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", 'Dummy migration was run, even though an unfulfillable migration was found.' ); - $this->db_tools->sql_column_remove('\phpbb\config\config', 'extra_column'); + $this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); } public function test_if() @@ -192,7 +192,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertSqlResultEquals( array(array('bar_column' => '1')), - "SELECT bar_column FROM \phpbb\config\config WHERE config_name = 'foo'", + "SELECT bar_column FROM phpbb_config WHERE config_name = 'foo'", 'Installing revert migration failed to create bar_column.' ); @@ -208,7 +208,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->assertFalse(isset($this->config['foobartest'])); - $sql = 'SELECT * FROM \phpbb\config\config'; + $sql = 'SELECT * FROM phpbb_config'; $result = $this->db->sql_query_limit($sql, 1); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); @@ -237,7 +237,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case // Failure should have caused an automatic roll-back, so this should not exist. $this->assertFalse(isset($this->config['foobar3'])); - $sql = 'SELECT * FROM \phpbb\config\config'; + $sql = 'SELECT * FROM phpbb_config'; $result = $this->db->sql_query_limit($sql, 1); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php index a09daa0f76..2a332fddba 100644 --- a/tests/dbal/schema_test.php +++ b/tests/dbal/schema_test.php @@ -21,13 +21,13 @@ class phpbb_dbal_schema_test extends phpbb_database_test_case $db = $this->new_dbal(); $value = str_repeat("\xC3\x84", 255); - $sql = "INSERT INTO \phpbb\config\config + $sql = "INSERT INTO phpbb_config (config_name, config_value) VALUES ('name', '$value')"; $result = $db->sql_query($sql); $sql = "SELECT config_value - FROM \phpbb\config\config + FROM phpbb_config WHERE config_name = 'name'"; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php index 976495d195..a70eea4f7e 100644 --- a/tests/dbal/sql_insert_buffer_test.php +++ b/tests/dbal/sql_insert_buffer_test.php @@ -17,7 +17,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case parent::setUp(); $this->db = $this->new_dbal(); - $this->buffer = new \phpbb\db\sql_insert_buffer($this->db, '\phpbb\config\config', 2); + $this->buffer = new \phpbb\db\sql_insert_buffer($this->db, 'phpbb_config', 2); $this->assert_config_count(2); } @@ -81,7 +81,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case protected function assert_config_count($num_configs) { $sql = 'SELECT COUNT(*) AS num_configs - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $this->db->sql_query($sql); $this->assertEquals($num_configs, $this->db->sql_fetchfield('num_configs')); $this->db->sql_freeresult($result); diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index c0f0c271d2..c069d9a796 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -39,11 +39,11 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = 'INSERT INTO \phpbb\config\config ' . $db->sql_build_array('INSERT', $sql_ary); + $sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary); $result = $db->sql_query($sql); $sql = "SELECT * - FROM \phpbb\config\config + FROM phpbb_config WHERE config_name = '" . $sql_ary['config_name'] . "'"; $result = $db->sql_query_limit($sql, 1); @@ -56,15 +56,15 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = "DELETE FROM \phpbb\config\config + $sql = "DELETE FROM phpbb_config WHERE config_name = 'config1'"; $result = $db->sql_query($sql); $sql = 'SELECT * - FROM \phpbb\config\config'; + FROM phpbb_config'; $result = $db->sql_query($sql); $rows = $db->sql_fetchrowset($result); - + $this->assertEquals(1, sizeof($rows)); $this->assertEquals('config2', $rows[0]['config_name']); @@ -76,7 +76,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case $db = $this->new_dbal(); // empty the table - $sql = 'DELETE FROM \phpbb\config\config'; + $sql = 'DELETE FROM phpbb_config'; $db->sql_query($sql); $batch_ary = array( @@ -92,10 +92,10 @@ class phpbb_dbal_write_test extends phpbb_database_test_case ), ); - $result = $db->sql_multi_insert('\phpbb\config\config', $batch_ary); + $result = $db->sql_multi_insert('phpbb_config', $batch_ary); $sql = 'SELECT * - FROM \phpbb\config\config + FROM phpbb_config ORDER BY config_name ASC'; $result = $db->sql_query($sql); @@ -155,12 +155,12 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $db = $this->new_dbal(); - $sql = 'UPDATE \phpbb\config\config + $sql = 'UPDATE phpbb_config SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where; $result = $db->sql_query($sql); $sql = 'SELECT * - FROM \phpbb\config\config + FROM phpbb_config ORDER BY config_name ASC'; $result = $db->sql_query($sql); From 76dfe153fc14e595a5f76f9d2f9aaa7b15cdc994 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:12:43 +0200 Subject: [PATCH 018/102] [ticket/11700] Fix class loader tests for namespaces PHPBB3-11700 --- tests/class_loader/class_loader_test.php | 38 ++++++++----------- tests/class_loader/phpbb/class_name.php | 4 +- tests/class_loader/phpbb/dir.php | 6 --- tests/class_loader/phpbb/dir/class_name.php | 4 +- .../phpbb/dir/subdir/class_name.php | 4 +- tests/class_loader/phpbb/dir2/dir2.php | 4 +- 6 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 tests/class_loader/phpbb/dir.php 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 @@ Date: Tue, 10 Sep 2013 15:16:35 +0200 Subject: [PATCH 019/102] [ticket/11700] Fix config namespace mishap in cache tests PHPBB3-11700 --- tests/cache/common_test_case.php | 10 +++++----- tests/cache/null_driver_test.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php index 09190abc95..3fe10c63e1 100644 --- a/tests/cache/common_test_case.php +++ b/tests/cache/common_test_case.php @@ -65,11 +65,11 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new \phpbb\config\config(array()); + $config = new phpbb\config\config(array()); $db = $this->new_dbal(); $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); @@ -77,16 +77,16 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case $expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); $this->assertEquals($expected, $first_result); - $sql = 'DELETE FROM \phpbb\config\config'; + $sql = 'DELETE FROM phpbb_config'; $result = $db->sql_query($sql); - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); $this->assertEquals($expected, $db->sql_fetchrow($result)); - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql); diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php index ce78f333dd..58e57f2b3a 100644 --- a/tests/cache/null_driver_test.php +++ b/tests/cache/null_driver_test.php @@ -48,23 +48,23 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new \phpbb\config\config(array()); + $config = new phpbb\config\config(array()); $db = $this->new_dbal(); $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); $first_result = $db->sql_fetchrow($result); $expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); $this->assertEquals($expected, $first_result); - $sql = 'DELETE FROM \phpbb\config\config'; + $sql = 'DELETE FROM phpbb_config'; $result = $db->sql_query($sql); // As null cache driver does not actually cache, // this should return no results - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); From 239381b946e20e98459dfa5f36962df37cd76d82 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:19:35 +0200 Subject: [PATCH 020/102] [ticket/11700] Fix expected class name output from dbms convert PHPBB3-11700 --- tests/functions/convert_30_dbms_to_31_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php index d08bf87f15..95fa226f42 100644 --- a/tests/functions/convert_30_dbms_to_31_test.php +++ b/tests/functions/convert_30_dbms_to_31_test.php @@ -31,7 +31,7 @@ class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case */ public function test_convert_30_dbms_to_31($input) { - $expected = "phpbb_db_driver_$input"; + $expected = "\\phpbb\\db\\driver\\$input"; $output = phpbb_convert_30_dbms_to_31($input); From 2a1207b14f7792b935ffd6ffff9d6c89fcce638b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:31:52 +0200 Subject: [PATCH 021/102] [ticket/11700] Correclty use namespaces in notifications PHPBB3-11700 --- phpBB/phpbb/notification/type/base.php | 26 +++++++++---------- tests/notification/convert_test.php | 2 +- .../ext/test/notification/type/test.php | 4 ++- tests/notification/manager_helper.php | 4 +-- tests/notification/notification_test.php | 2 +- tests/notification/submit_post_base.php | 2 +- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 1605f59c55..cc0355771b 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -95,7 +95,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Notification Type Base Constructor - * + * * @param \phpbb\user_loader $user_loader * @param \phpbb\db\driver\driver $db * @param \phpbb\cache\driver\driver_interface $cache @@ -128,7 +128,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Set notification manager (required) - * + * * @param \phpbb\notification\manager $notification_manager */ public function set_notification_manager(\phpbb\notification\manager $notification_manager) @@ -152,7 +152,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Magic method to get data from this notification - * + * * @param mixed $name * @return mixed */ @@ -164,7 +164,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Magic method to set data on this notification - * + * * @param mixed $name * @return null */ @@ -176,9 +176,9 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Magic method to get a string of this notification - * + * * Primarily for testing - * + * * @param string $name * @return mixed */ @@ -222,9 +222,9 @@ abstract class base implements \phpbb\notification\type\type_interface { // Defaults $this->data = array_merge(array( - 'item_id' => \static::get_item_id($type_data), + 'item_id' => static::get_item_id($type_data), 'notification_type_id' => $this->notification_type_id, - 'item_parent_id' => \static::get_item_parent_id($type_data), + 'item_parent_id' => static::get_item_parent_id($type_data), 'notification_time' => time(), 'notification_read' => false, @@ -285,7 +285,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Prepare to output the notification to the template - * + * * @return array Template variables */ public function prepare_for_display() @@ -333,7 +333,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Get the user's avatar (fall back) - * + * * @return string */ public function get_avatar() @@ -343,7 +343,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Get the special items to load (fall back) - * + * * @return array */ public function get_load_special() @@ -361,7 +361,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Is available (fall back) - * + * * @return bool */ public function is_available() @@ -371,7 +371,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Pre create insert array function (fall back) - * + * * @return array */ public function pre_create_insert_array($type_data, $notify_users) diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php index e0449cef89..ed1fa9b1bf 100644 --- a/tests/notification/convert_test.php +++ b/tests/notification/convert_test.php @@ -25,7 +25,7 @@ class phpbb_notification_convert_test extends phpbb_database_test_case $this->db = $this->new_dbal(); - $this->migration = new \phpbb\db\migration\data0\notification_options_reconvert( + $this->migration = new \phpbb\db\migration\data\v310\notification_options_reconvert( new \phpbb\config\config(array()), $this->db, new \phpbb\db\tools($this->db), diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php index 629954efce..cdb921ca3b 100644 --- a/tests/notification/ext/test/notification/type/test.php +++ b/tests/notification/ext/test/notification/type/test.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_notification_type_test extends \phpbb\notification\type\base +class test extends \phpbb\notification\type\base { public function get_type() { diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php index 95caa7c0ba..731dd00b7a 100644 --- a/tests/notification/manager_helper.php +++ b/tests/notification/manager_helper.php @@ -40,7 +40,7 @@ class phpbb_notification_manager_helper extends \phpbb\notification\manager */ public function get_item_type_class($item_type, $data = array()) { - $item_type = 'phpbb_notification_type_' . $item_type; + $item_type = 'phpbb\notification\type\\' . $item_type; $item = new $item_type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table); @@ -56,7 +56,7 @@ class phpbb_notification_manager_helper extends \phpbb\notification\manager */ public function get_method_class($method_name) { - $method_name = 'phpbb_notification_method_' . $method_name; + $method_name = 'phpbb\notification\method\\' . $method_name; $method = new $method_name($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table); diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php index 1e2ce13956..4c7ce9a784 100644 --- a/tests/notification/notification_test.php +++ b/tests/notification/notification_test.php @@ -83,7 +83,7 @@ class phpbb_notification_test extends phpbb_database_test_case 'topic_in_queue', ) as $type) { - $class = $this->build_type('phpbb_notification_type_' . $type); + $class = $this->build_type('\phpbb\notification\type\\' . $type); $types[$type] = $class; $this->container->set('notification.type.' . $type, $class); diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 09cd7b4213..8597c626a4 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -105,7 +105,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case $notification_types_array = array(); foreach ($notification_types as $type) { - $class_name = 'phpbb_notification_type_' . $type; + $class_name = '\phpbb\notification\type\\' . $type; $class = new $class_name( $user_loader, $db, $cache->get_driver(), $user, $auth, $config, $phpbb_root_path, $phpEx, From d122d84050e524e86f7261963c9be2be6573c36e Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:43:16 +0200 Subject: [PATCH 022/102] [ticket/11700] Use underscores for generated search test wrappers PHPBB3-11700 --- tests/test_framework/phpbb_search_test_case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php index 418d352c17..b929e740ea 100644 --- a/tests/test_framework/phpbb_search_test_case.php +++ b/tests/test_framework/phpbb_search_test_case.php @@ -11,7 +11,7 @@ abstract class phpbb_search_test_case extends phpbb_database_test_case { static protected function get_search_wrapper($class) { - $wrapped = $class . '_wrapper'; + $wrapped = str_replace('\\', '_', $class) . '_wrapper'; if (!class_exists($wrapped)) { $code = " From dc2f4a3663ef10e6d562426764db657caeb1f435 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:43:33 +0200 Subject: [PATCH 023/102] [ticket/11700] Avoid \t in double quoted strings for template code PHPBB3-11700 --- phpBB/phpbb/template/twig/node/includeasset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index f5c6413617..3c899b96e8 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -35,7 +35,7 @@ class includeasset extends \Twig_Node ->write("\$asset_file = ") ->subcompile($this->getNode('expr')) ->raw(";\n") - ->write("\$asset = new \phpbb\template\asset(\$asset_file);\n") + ->write("\$asset = new \phpbb\\template\asset(\$asset_file);\n") ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") From 9a2c29a175085a424e4c638853da22f2cb83f12d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 16:22:02 +0200 Subject: [PATCH 024/102] [ticket/11700] DI container test needs namespaces to work properly PHPBB3-11700 --- tests/di/create_container_test.php | 106 +++++++++++++++-------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index ffa37d3b3d..8d3dfea780 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -7,66 +7,72 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_container.php'; - -class phpbb_di_container_test extends phpbb_test_case +namespace { - public function test_phpbb_create_container() - { - $phpbb_root_path = __DIR__ . '/../../phpBB/'; - $extensions = array( - new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), - new \phpbb\di\extension\core($phpbb_root_path), - ); - $container = phpbb_create_container($extensions, $phpbb_root_path, 'php'); + require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; + require_once dirname(__FILE__) . '/../../phpBB/includes/functions_container.php'; - $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); - } + class phpbb_di_container_test extends phpbb_test_case + { + public function test_phpbb_create_container() + { + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + $extensions = array( + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), + ); + $container = phpbb_create_container($extensions, $phpbb_root_path, 'php'); - public function test_phpbb_create_install_container() - { - $phpbb_root_path = __DIR__ . '/../../phpBB/'; - $extensions = array( - new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), - new \phpbb\di\extension\core($phpbb_root_path), - ); - $container = phpbb_create_install_container($phpbb_root_path, 'php'); + $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); + } - $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); - $this->assertTrue($container->isFrozen()); - } + public function test_phpbb_create_install_container() + { + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + $extensions = array( + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), + ); + $container = phpbb_create_install_container($phpbb_root_path, 'php'); - public function test_phpbb_create_compiled_container() - { - $phpbb_root_path = __DIR__ . '/../../phpBB/'; - $config_file = __DIR__ . '/fixtures/config.php'; - $extensions = array( - new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), - new \phpbb\di\extension\core($phpbb_root_path), - ); - $container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php'); + $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); + $this->assertTrue($container->isFrozen()); + } - $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); - $this->assertTrue($container->isFrozen()); - } + public function test_phpbb_create_compiled_container() + { + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + $config_file = __DIR__ . '/fixtures/config.php'; + $extensions = array( + new \phpbb\di\extension\config(__DIR__ . '/fixtures/config.php'), + new \phpbb\di\extension\core($phpbb_root_path), + ); + $container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php'); + + $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); + $this->assertTrue($container->isFrozen()); + } + } } -class phpbb_db_driver_container_mock extends \phpbb\db\driver\driver +namespace phpbb\db\driver { - public function sql_connect() - { - } + class container_mock extends \phpbb\db\driver\driver + { + public function sql_connect() + { + } - public function sql_query() - { - } + public function sql_query() + { + } - public function sql_fetchrow() - { - } + public function sql_fetchrow() + { + } - public function sql_freeresult() - { - } + public function sql_freeresult() + { + } + } } From d297eb4aecc6e658987c9647d76fed4210ef77f5 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 17:13:29 +0200 Subject: [PATCH 025/102] [ticket/11700] Get the installer to run with namespaces PHPBB3-11700 --- phpBB/includes/functions.php | 4 +- phpBB/includes/functions_install.php | 52 +++++++++---------- .../migration/data/v310/style_update_p2.php | 2 +- phpBB/phpbb/extension/finder.php | 13 +++-- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 643f2d35a2..086d8b9dd0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5647,9 +5647,9 @@ function phpbb_convert_30_dbms_to_31($dbms) // true for mysqli class. // However, per the docblock any valid 3.1 driver name should be // recognized by this function, and have priority over 3.0 dbms. - if (class_exists('\phpbb\db\driver\\' . $dbms)) + if (class_exists('phpbb\db\driver\\' . $dbms)) { - return '\phpbb\db\driver\\' . $dbms; + return 'phpbb\db\driver\\' . $dbms; } if (class_exists($dbms)) diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 57a07ecccd..bfd669fdfa 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -28,7 +28,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'firebird', 'MODULE' => 'interbase', 'DELIM' => ';;', - 'DRIVER' => '\phpbb\db\driver\firebird', + 'DRIVER' => 'phpbb\db\driver\firebird', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -39,7 +39,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mysql_41', 'MODULE' => 'mysqli', 'DELIM' => ';', - 'DRIVER' => '\phpbb\db\driver\mysqli', + 'DRIVER' => 'phpbb\db\driver\mysqli', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -48,7 +48,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mysql', 'MODULE' => 'mysql', 'DELIM' => ';', - 'DRIVER' => '\phpbb\db\driver\mysql', + 'DRIVER' => 'phpbb\db\driver\mysql', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -57,7 +57,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'mssql', 'DELIM' => 'GO', - 'DRIVER' => '\phpbb\db\driver\mssql', + 'DRIVER' => 'phpbb\db\driver\mssql', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -66,7 +66,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'odbc', 'DELIM' => 'GO', - 'DRIVER' => '\phpbb\db\driver\mssql_odbc', + 'DRIVER' => 'phpbb\db\driver\mssql_odbc', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -75,7 +75,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'mssql', 'MODULE' => 'sqlsrv', 'DELIM' => 'GO', - 'DRIVER' => '\phpbb\db\driver\mssqlnative', + 'DRIVER' => 'phpbb\db\driver\mssqlnative', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -84,7 +84,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'oracle', 'MODULE' => 'oci8', 'DELIM' => '/', - 'DRIVER' => '\phpbb\db\driver\oracle', + 'DRIVER' => 'phpbb\db\driver\oracle', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -93,7 +93,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'postgres', 'MODULE' => 'pgsql', 'DELIM' => ';', - 'DRIVER' => '\phpbb\db\driver\postgres', + 'DRIVER' => 'phpbb\db\driver\postgres', 'AVAILABLE' => true, '2.0.x' => true, ), @@ -102,7 +102,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'SCHEMA' => 'sqlite', 'MODULE' => 'sqlite', 'DELIM' => ';', - 'DRIVER' => '\phpbb\db\driver\sqlite', + 'DRIVER' => 'phpbb\db\driver\sqlite', 'AVAILABLE' => true, '2.0.x' => false, ), @@ -206,14 +206,14 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, $db->sql_return_on_error(true); // Check that we actually have a database name before going any further..... - if ($dbms_details['DRIVER'] != '\phpbb\db\driver\sqlite' && $dbms_details['DRIVER'] != '\phpbb\db\driver\oracle' && $dbname === '') + if ($dbms_details['DRIVER'] != 'phpbb\db\driver\sqlite' && $dbms_details['DRIVER'] != 'phpbb\db\driver\oracle' && $dbname === '') { $error[] = $lang['INST_ERR_DB_NO_NAME']; return false; } // Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea - if ($dbms_details['DRIVER'] == '\phpbb\db\driver\sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) + if ($dbms_details['DRIVER'] == 'phpbb\db\driver\sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) { $error[] = $lang['INST_ERR_DB_FORUM_PATH']; return false; @@ -222,8 +222,8 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // Check the prefix length to ensure that index names are not too long and does not contain invalid characters switch ($dbms_details['DRIVER']) { - case '\phpbb\db\driver\mysql': - case '\phpbb\db\driver\mysqli': + case 'phpbb\db\driver\mysql': + case 'phpbb\db\driver\mysqli': if (strspn($table_prefix, '-./\\') !== 0) { $error[] = $lang['INST_ERR_PREFIX_INVALID']; @@ -232,22 +232,22 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // no break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': $prefix_length = 36; break; - case '\phpbb\db\driver\mssql': - case '\phpbb\db\driver\mssql_odbc': - case '\phpbb\db\driver\mssqlnative': + case 'phpbb\db\driver\mssql': + case 'phpbb\db\driver\mssql_odbc': + case 'phpbb\db\driver\mssqlnative': $prefix_length = 90; break; - case '\phpbb\db\driver\sqlite': + case 'phpbb\db\driver\sqlite': $prefix_length = 200; break; - case '\phpbb\db\driver\firebird': - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\firebird': + case 'phpbb\db\driver\oracle': $prefix_length = 6; break; } @@ -285,21 +285,21 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, // Make sure that the user has selected a sensible DBAL for the DBMS actually installed switch ($dbms_details['DRIVER']) { - case '\phpbb\db\driver\mysqli': + case 'phpbb\db\driver\mysqli': if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<')) { $error[] = $lang['INST_ERR_DB_NO_MYSQLI']; } break; - case '\phpbb\db\driver\sqlite': + case 'phpbb\db\driver\sqlite': if (version_compare(sqlite_libversion(), '2.8.2', '<')) { $error[] = $lang['INST_ERR_DB_NO_SQLITE']; } break; - case '\phpbb\db\driver\firebird': + case 'phpbb\db\driver\firebird': // check the version of FB, use some hackery if we can't get access to the server info if ($db->service_handle !== false && function_exists('ibase_server_info')) { @@ -380,7 +380,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, } break; - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\oracle': if ($unicode_check) { $sql = "SELECT * @@ -402,7 +402,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, } break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': if ($unicode_check) { $sql = "SHOW server_encoding;"; @@ -507,7 +507,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test 'adm_relative_path' => 'adm/', - 'acm_type' => '\phpbb\cache\driver\file', + 'acm_type' => 'phpbb\cache\driver\file', ); foreach ($config_data_array as $key => $value) diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index 3f6477b7cb..6c3b0de2a1 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -7,7 +7,7 @@ * */ -namespace phpbb\db\migration\data0; +namespace phpbb\db\migration\data\v310; class style_update_p2 extends \phpbb\db\migration\migration { diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index 0ecae7a13f..bf84728f05 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -277,9 +277,16 @@ class finder $classes = array(); foreach ($files as $file => $ext_name) { - $file = preg_replace('#^(phpbb|includes)/#', '', $file); - - $classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext))); + if (preg_match('#^includes/#', $file)) + { + $file = preg_replace('#^includes/#', '', $file); + $classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext))); + } + else + { + $file = preg_replace('#^phpbb/#', '', $file); + $classes[] = 'phpbb\\' . str_replace('/', '\\', substr($file, 0, -strlen('.' . $this->php_ext))); + } } return $classes; } From bdaf68c113162a98a2e471183a39297e1a965ad3 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 17:45:28 +0200 Subject: [PATCH 026/102] [ticket/11700] Don't prefix dbms classnames with \ PHPBB3-11700 --- .../functions/convert_30_dbms_to_31_test.php | 2 +- ...phpbb_database_test_connection_manager.php | 74 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php index 95fa226f42..4d210d7b29 100644 --- a/tests/functions/convert_30_dbms_to_31_test.php +++ b/tests/functions/convert_30_dbms_to_31_test.php @@ -31,7 +31,7 @@ class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case */ public function test_convert_30_dbms_to_31($input) { - $expected = "\\phpbb\\db\\driver\\$input"; + $expected = "phpbb\\db\\driver\\$input"; $output = phpbb_convert_30_dbms_to_31($input); diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 1a31fb13d0..b6ba4e0c8c 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -108,7 +108,7 @@ class phpbb_database_test_connection_manager // These require different connection strings on the phpBB side than they do in PDO // so you must provide a DSN string for ODBC separately - if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == '\phpbb\db\driver\mssql' || $this->config['dbms'] == '\phpbb\db\driver\firebird')) + if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'phpbb\db\driver\mssql' || $this->config['dbms'] == 'phpbb\db\driver\firebird')) { $dsn = 'odbc:' . $this->config['custom_dsn']; } @@ -117,12 +117,12 @@ class phpbb_database_test_connection_manager { switch ($this->config['dbms']) { - case '\phpbb\db\driver\mssql': - case '\phpbb\db\driver\mssql_odbc': + case 'phpbb\db\driver\mssql': + case 'phpbb\db\driver\mssql_odbc': $this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('mssql', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']); break; - case '\phpbb\db\driver\firebird': + case 'phpbb\db\driver\firebird': if (!empty($this->config['custom_dsn'])) { $this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('firebird', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']); @@ -145,8 +145,8 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case '\phpbb\db\driver\mysql': - case '\phpbb\db\driver\mysqli': + case 'phpbb\db\driver\mysql': + case 'phpbb\db\driver\mysqli': $this->pdo->exec('SET NAMES utf8'); /* @@ -187,8 +187,8 @@ class phpbb_database_test_connection_manager { switch ($this->config['dbms']) { - case '\phpbb\db\driver\sqlite': - case '\phpbb\db\driver\firebird': + case 'phpbb\db\driver\sqlite': + case 'phpbb\db\driver\firebird': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -198,7 +198,7 @@ class phpbb_database_test_connection_manager $this->purge_extras(); break; - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\oracle': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -208,7 +208,7 @@ class phpbb_database_test_connection_manager $this->purge_extras(); break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': $this->connect(); // Drop all of the tables foreach ($this->get_tables() as $table) @@ -258,38 +258,38 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case '\phpbb\db\driver\mysql': - case '\phpbb\db\driver\mysqli': + case 'phpbb\db\driver\mysql': + case 'phpbb\db\driver\mysqli': $sql = 'SHOW TABLES'; break; - case '\phpbb\db\driver\sqlite': + case 'phpbb\db\driver\sqlite': $sql = 'SELECT name FROM sqlite_master WHERE type = "table"'; break; - case '\phpbb\db\driver\mssql': - case '\phpbb\db\driver\mssql_odbc': - case '\phpbb\db\driver\mssqlnative': + case 'phpbb\db\driver\mssql': + case 'phpbb\db\driver\mssql_odbc': + case 'phpbb\db\driver\mssqlnative': $sql = "SELECT name FROM sysobjects WHERE type='U'"; break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': $sql = 'SELECT relname FROM pg_stat_user_tables'; break; - case '\phpbb\db\driver\firebird': + case 'phpbb\db\driver\firebird': $sql = 'SELECT rdb$relation_name FROM rdb$relations WHERE rdb$view_source is null AND rdb$system_flag = 0'; break; - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\oracle': $sql = 'SELECT table_name FROM USER_TABLES'; break; @@ -325,7 +325,7 @@ class phpbb_database_test_connection_manager { $schema = $this->dbms['SCHEMA']; - if ($this->config['dbms'] == '\phpbb\db\driver\mysql') + if ($this->config['dbms'] == 'phpbb\db\driver\mysql') { $sth = $this->pdo->query('SELECT VERSION() AS version'); $row = $sth->fetch(PDO::FETCH_ASSOC); @@ -359,47 +359,47 @@ class phpbb_database_test_connection_manager protected function get_dbms_data($dbms) { $available_dbms = array( - '\phpbb\db\driver\firebird' => array( + 'phpbb\db\driver\firebird' => array( 'SCHEMA' => 'firebird', 'DELIM' => ';;', 'PDO' => 'firebird', ), - '\phpbb\db\driver\mysqli' => array( + 'phpbb\db\driver\mysqli' => array( 'SCHEMA' => 'mysql_41', 'DELIM' => ';', 'PDO' => 'mysql', ), - '\phpbb\db\driver\mysql' => array( + 'phpbb\db\driver\mysql' => array( 'SCHEMA' => 'mysql', 'DELIM' => ';', 'PDO' => 'mysql', ), - '\phpbb\db\driver\mssql' => array( + 'phpbb\db\driver\mssql' => array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'odbc', ), - '\phpbb\db\driver\mssql_odbc'=> array( + 'phpbb\db\driver\mssql_odbc'=> array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'odbc', ), - '\phpbb\db\driver\mssqlnative' => array( + 'phpbb\db\driver\mssqlnative' => array( 'SCHEMA' => 'mssql', 'DELIM' => 'GO', 'PDO' => 'sqlsrv', ), - '\phpbb\db\driver\oracle' => array( + 'phpbb\db\driver\oracle' => array( 'SCHEMA' => 'oracle', 'DELIM' => '/', 'PDO' => 'oci', ), - '\phpbb\db\driver\postgres' => array( + 'phpbb\db\driver\postgres' => array( 'SCHEMA' => 'postgres', 'DELIM' => ';', 'PDO' => 'pgsql', ), - '\phpbb\db\driver\sqlite' => array( + 'phpbb\db\driver\sqlite' => array( 'SCHEMA' => 'sqlite', 'DELIM' => ';', 'PDO' => 'sqlite2', @@ -428,7 +428,7 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case '\phpbb\db\driver\firebird': + case 'phpbb\db\driver\firebird': $sql = 'SELECT RDB$GENERATOR_NAME FROM RDB$GENERATORS WHERE RDB$SYSTEM_FLAG = 0'; @@ -440,7 +440,7 @@ class phpbb_database_test_connection_manager } break; - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\oracle': $sql = 'SELECT sequence_name FROM USER_SEQUENCES'; $result = $this->pdo->query($sql); @@ -451,7 +451,7 @@ class phpbb_database_test_connection_manager } break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': $sql = 'SELECT sequence_name FROM information_schema.sequences'; $result = $this->pdo->query($sql); @@ -509,7 +509,7 @@ class phpbb_database_test_connection_manager switch ($this->config['dbms']) { - case '\phpbb\db\driver\oracle': + case 'phpbb\db\driver\oracle': // Get all of the information about the sequences $sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name, s.increment_by, s.min_value FROM USER_TRIGGERS t @@ -544,14 +544,14 @@ class phpbb_database_test_connection_manager * Since we have no objects attached to our sequencers (triggers aren't attached), this works fine. */ $queries[] = 'DROP SEQUENCE ' . $row['SEQUENCE_NAME']; - $queries[] = "CREATE SEQUENCE {$row['SEQUENCE_NAME']} - MINVALUE {$row['MIN_VALUE']} - INCREMENT BY {$row['INCREMENT_BY']} + $queries[] = "CREATE SEQUENCE {$row['SEQUENCE_NAME']} + MINVALUE {$row['MIN_VALUE']} + INCREMENT BY {$row['INCREMENT_BY']} START WITH $max_val"; } break; - case '\phpbb\db\driver\postgres': + case 'phpbb\db\driver\postgres': // Get the sequences attached to the tables $sql = 'SELECT column_name, table_name FROM information_schema.columns WHERE table_name IN (' . implode(', ', $table_names) . ") From bb395bbc50df53bf2e005d95d45f34c7c8934ff0 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 17:45:43 +0200 Subject: [PATCH 027/102] [ticket/11700] Update finder tests for namespaced classnames PHPBB3-11700 --- tests/extension/finder_test.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 2bb44c0f57..f1e7bc02b9 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -43,10 +43,10 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_default_implementation', - 'phpbb_ext_bar_my_hidden_class', - 'phpbb_ext_foo_a_class', - 'phpbb_ext_foo_b_class', + 'phpbb\default\implementation', + 'phpbb\ext\bar\my\hidden_class', + 'phpbb\ext\foo\a_class', + 'phpbb\ext\foo\b_class', ), $classes ); @@ -88,8 +88,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_default_implementation', - 'phpbb_ext_bar_my_hidden_class', + 'phpbb\default\implementation', + 'phpbb\ext\bar\my\hidden_class', ), $classes ); @@ -105,9 +105,9 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_default_implementation', - 'phpbb_ext_foo_sub_type_alternative', - 'phpbb_ext_foo_type_alternative', + 'phpbb\default\implementation', + 'phpbb\ext\foo\sub\type\alternative', + 'phpbb\ext\foo\type\alternative', ), $classes ); @@ -122,7 +122,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_ext_foo_type_alternative', + 'phpbb\ext\foo\type\alternative', ), $classes ); @@ -137,7 +137,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_ext_foo_sub_type_alternative', + 'phpbb\ext\foo\sub\type\alternative', ), $classes ); @@ -152,7 +152,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_ext_foo_sub_type_alternative', + 'phpbb\ext\foo\sub\type\alternative', ), $classes ); @@ -168,8 +168,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb_ext_foo_type_alternative', - 'phpbb_ext_foo_type_dummy_empty', + 'phpbb\ext\foo\type\alternative', + 'phpbb\ext\foo\type\dummy\empty', ), $classes ); From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 02:41:03 +0200 Subject: [PATCH 028/102] [ticket/11700] Fix tests after merging new develop code PHPBB3-11700 --- phpBB/install/index.php | 9 ---- phpBB/phpbb/auth/provider/oauth/oauth.php | 54 ++++++++++--------- .../auth/provider/oauth/service/bitly.php | 18 ++++--- .../auth/provider/oauth/token_storage.php | 14 ++--- phpBB/phpbb/cache/driver/file.php | 6 +-- phpBB/phpbb/log/null.php | 4 +- .../phpbb/notification/type/group_request.php | 4 +- .../type/group_request_approved.php | 4 +- phpBB/phpbb/template/base.php | 6 ++- phpBB/phpbb/template/twig/loader.php | 4 +- .../phpbb/template/twig/node/includeasset.php | 2 +- phpBB/phpbb/template/twig/node/includecss.php | 2 +- phpBB/phpbb/template/twig/node/includejs.php | 2 +- .../provider_oauth_token_storage_test.php | 10 ++-- tests/mock/auth_provider.php | 2 +- tests/notification/base.php | 12 ++--- tests/notification/group_request_test.php | 6 +-- tests/session/check_ban_test.php | 4 +- tests/session/testable_facade.php | 24 ++++----- .../template/template_test_case_with_tree.php | 2 +- 20 files changed, 98 insertions(+), 91 deletions(-) diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 90d840aa31..e94c393922 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -244,20 +244,11 @@ $config = new \phpbb\config\config(array( 'load_tplcompile' => '1' )); -<<<<<<< HEAD -$phpbb_style_resource_locator = new \phpbb\style\resource_locator(); -$phpbb_style_path_provider = new \phpbb\style\path_provider(); $template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); -$phpbb_style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); -$phpbb_style->set_ext_dir_prefix('adm/'); -$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); -======= -$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array_filter($paths, 'is_dir'); $template->set_custom_style('adm', $paths); ->>>>>>> github-phpbb/develop $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index be0b8bb7d6..e92462b344 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth; + /** * @ignore */ @@ -23,33 +25,33 @@ use OAuth\Common\Http\Uri\Uri; * * @package auth */ -class phpbb_auth_provider_oauth extends phpbb_auth_provider_base +class oauth extends \phpbb\auth\provider\base { /** * Database driver * - * @var phpbb_db_driver + * @var \phpbb\db\driver */ protected $db; /** * phpBB config * - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * phpBB request object * - * @var phpbb_request + * @var \phpbb\request\request_interface */ protected $request; /** * phpBB user * - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -70,7 +72,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base /** * All OAuth service providers * - * @var phpbb_di_service_collection Contains phpbb_auth_provider_oauth_service_interface + * @var \phpbb\di\service_collection Contains \phpbb\auth\provider\oauth\service_interface */ protected $service_providers; @@ -105,18 +107,18 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base /** * OAuth Authentication Constructor * - * @param phpbb_db_driver $db - * @param phpbb_config $config - * @param phpbb_request $request - * @param phpbb_user $user + * @param \phpbb\db\driver $db + * @param \phpbb\config\config $config + * @param \phpbb\request\request_interface $request + * @param \phpbb\user $user * @param string $auth_provider_oauth_token_storage_table * @param string $auth_provider_oauth_token_account_assoc - * @param phpbb_di_service_collection $service_providers Contains phpbb_auth_provider_oauth_service_interface + * @param \phpbb\di\service_collection $service_providers Contains \phpbb\auth\provider\oauth\service_interface * @param string $users_table * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, phpbb_di_service_collection $service_providers, $users_table, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver $db, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; @@ -156,7 +158,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base // Temporary workaround for only having one authentication provider available if (!$this->request->is_set('oauth_service')) { - $provider = new phpbb_auth_provider_db($this->db, $this->config, $this->request, $this->user, $this->phpbb_root_path, $this->php_ext); + $provider = new \phpbb\auth\provider\db($this->db, $this->config, $this->request, $this->user, $this->phpbb_root_path, $this->php_ext); return $provider->login($username, $password); } @@ -175,11 +177,11 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base // Get the service credentials for the given service $service_credentials = $this->service_providers[$service_name]->get_service_credentials(); - $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); + $storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); $query = 'mode=login&login=external&oauth_service=' . $service_name_original; $service = $this->get_service($service_name_original, $storage, $service_credentials, $this->service_providers[$service_name]->get_auth_scope(), $query); - if ($this->request->is_set('code', phpbb_request_interface::GET)) + if ($this->request->is_set('code', \phpbb\request\request_interface::GET)) { $this->service_providers[$service_name]->set_external_service_provider($service); $unique_id = $this->service_providers[$service_name]->perform_auth_login(); @@ -258,7 +260,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base } $uri_factory = new \OAuth\Common\Http\Uri\UriFactory(); - $current_uri = $uri_factory->createFromSuperGlobalArray($this->request->get_super_global(phpbb_request_interface::SERVER)); + $current_uri = $uri_factory->createFromSuperGlobalArray($this->request->get_super_global(\phpbb\request\request_interface::SERVER)); $current_uri->setQuery($query); $this->current_uri = $current_uri; @@ -269,15 +271,15 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base * Returns a new service object * * @param string $service_name The name of the service - * @param phpbb_auth_oauth_token_storage $storage - * @param array $service_credentials {@see phpbb_auth_provider_oauth::get_service_credentials} + * @param \phpbb\auth\provider\oauth\token_storage $storage + * @param array $service_credentials {@see \phpbb\auth\provider\oauth\oauth::get_service_credentials} * @param array $scope The scope of the request against * the api. * @param string $query The query string of the * current_uri used in redirection * @return \OAuth\Common\Service\ServiceInterface */ - protected function get_service($service_name, phpbb_auth_provider_oauth_token_storage $storage, array $service_credentials, array $scopes = array(), $query) + protected function get_service($service_name, \phpbb\auth\provider\oauth\token_storage $storage, array $service_credentials, array $scopes = array(), $query) { $current_uri = $this->get_current_uri($service_name, $query); @@ -434,7 +436,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base /** * Performs the account linking for login_link * - * @param array $link_data The same variable given to {@see phpbb_auth_provider_interface::link_account} + * @param array $link_data The same variable given to {@see \phpbb\auth\provider\provider_interface::link_account} * @param string $service_name The name of the service being used in * linking. * @return string|null Returns a language constant (string) if an error is @@ -442,7 +444,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base */ protected function link_account_login_link(array $link_data, $service_name) { - $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); + $storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); // Check for an access token, they should have one if (!$storage->has_access_token_by_session($service_name)) @@ -477,7 +479,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base /** * Performs the account linking for auth_link * - * @param array $link_data The same variable given to {@see phpbb_auth_provider_interface::link_account} + * @param array $link_data The same variable given to {@see \phpbb\auth\provider\provider_interface::link_account} * @param string $service_name The name of the service being used in * linking. * @return string|null Returns a language constant (string) if an error is @@ -485,13 +487,13 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base */ protected function link_account_auth_link(array $link_data, $service_name) { - $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); + $storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); $query = 'i=ucp_auth_link&mode=auth_link&link=1&oauth_service=' . strtolower($link_data['oauth_service']); $service_credentials = $this->service_providers[$service_name]->get_service_credentials(); $scopes = $this->service_providers[$service_name]->get_auth_scope(); $service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $scopes, $query); - if ($this->request->is_set('code', phpbb_request_interface::GET)) + if ($this->request->is_set('code', \phpbb\request\request_interface::GET)) { $this->service_providers[$service_name]->set_external_service_provider($service); $unique_id = $this->service_providers[$service_name]->perform_auth_login(); @@ -530,7 +532,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base public function logout($data, $new_session) { // Clear all tokens belonging to the user - $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); + $storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); $storage->clearAllTokens(); return; @@ -610,7 +612,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base // Clear all tokens belonging to the user on this servce $service_name = 'auth.provider.oauth.service.' . strtolower($link_data['oauth_service']); - $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); + $storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table); $storage->clearToken($service_name); return; diff --git a/phpBB/phpbb/auth/provider/oauth/service/bitly.php b/phpBB/phpbb/auth/provider/oauth/service/bitly.php index 3bafdd59ce..47cf7ee380 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/bitly.php +++ b/phpBB/phpbb/auth/provider/oauth/service/bitly.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth\service; + /** * @ignore */ @@ -20,29 +22,29 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_oauth_service_bitly extends phpbb_auth_provider_oauth_service_base +class bitly extends \phpbb\auth\provider\oauth\service\base { /** * phpBB config * - * @var phpbb_config + * @var \phpbb\config\config */ protected $config; /** * phpBB request * - * @var phpbb_request + * @var \phpbb\request\request_interface */ protected $request; /** * Constructor * - * @param phpbb_config $config - * @param phpbb_request $request + * @param \phpbb\config\config $config + * @param \phpbb\request\request_interface $request */ - public function __construct(phpbb_config $config, phpbb_request $request) + public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request) { $this->config = $config; $this->request = $request; @@ -66,7 +68,7 @@ class phpbb_auth_provider_oauth_service_bitly extends phpbb_auth_provider_oauth_ { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Bitly)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new \phpbb\auth\provider\oauth\service\exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // This was a callback request from bitly, get the token @@ -86,7 +88,7 @@ class phpbb_auth_provider_oauth_service_bitly extends phpbb_auth_provider_oauth_ { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Bitly)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new \phpbb\auth\provider\oauth\service\exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // Send a request with it diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php index d21deb8999..2ce0e32da3 100644 --- a/phpBB/phpbb/auth/provider/oauth/token_storage.php +++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth; + /** * @ignore */ @@ -27,19 +29,19 @@ use OAuth\Common\Storage\Exception\TokenNotFoundException; * * @package auth */ -class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface +class token_storage implements TokenStorageInterface { /** * Cache driver. * - * @var phpbb_db_driver + * @var \phpbb\db\driver\driver */ protected $db; /** * phpBB user * - * @var phpbb_user + * @var \phpbb\user */ protected $user; @@ -58,11 +60,11 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface /** * Creates token storage for phpBB. * - * @param phpbb_db_driver $db - * @param phpbb_user $user + * @param \phpbb\db\driver\driver $db + * @param \phpbb\user $user * @param string $auth_provider_oauth_table */ - public function __construct(phpbb_db_driver $db, phpbb_user $user, $auth_provider_oauth_table) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\user $user, $auth_provider_oauth_table) { $this->db = $db; $this->user = $user; diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index 36525e7f55..6e63b6a716 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -207,9 +207,9 @@ class file extends \phpbb\cache\driver\base function purge() { // Purge all phpbb cache files - try + try { - $iterator = new DirectoryIterator($this->cache_dir); + $iterator = new \DirectoryIterator($this->cache_dir); } catch (Exception $e) { @@ -258,7 +258,7 @@ class file extends \phpbb\cache\driver\base */ protected function remove_dir($dir) { - try + try { $iterator = new DirectoryIterator($dir); } diff --git a/phpBB/phpbb/log/null.php b/phpBB/phpbb/log/null.php index 14b5f65eec..2ef69926ee 100644 --- a/phpBB/phpbb/log/null.php +++ b/phpBB/phpbb/log/null.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\log; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_log */ -class phpbb_log_null implements phpbb_log_interface +class null implements log_interface { /** * {@inheritdoc} diff --git a/phpBB/phpbb/notification/type/group_request.php b/phpBB/phpbb/notification/type/group_request.php index 1a3b5b6992..1768a8fffa 100644 --- a/phpBB/phpbb/notification/type/group_request.php +++ b/phpBB/phpbb/notification/type/group_request.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_notification_type_group_request extends phpbb_notification_type_base +class group_request extends \phpbb\notification\type\base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/notification/type/group_request_approved.php b/phpBB/phpbb/notification/type/group_request_approved.php index ce83329ff3..be4a902acd 100644 --- a/phpBB/phpbb/notification/type/group_request_approved.php +++ b/phpBB/phpbb/notification/type/group_request_approved.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\notification\type; + /** * @ignore */ @@ -15,7 +17,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_notification_type_group_request_approved extends phpbb_notification_type_base +class group_request_approved extends \phpbb\notification\type\base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php index 3778424a96..86868707f0 100644 --- a/phpBB/phpbb/template/base.php +++ b/phpBB/phpbb/template/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -15,13 +17,13 @@ if (!defined('IN_PHPBB')) exit; } -abstract class phpbb_template_base implements phpbb_template +abstract class base implements template { /** * Template context. * Stores template data used during template rendering. * - * @var phpbb_template_context + * @var \phpbb\template\context */ protected $context; diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index 0829e519f7..910061dc0f 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Twig Template loader * @package phpBB3 */ -class phpbb_template_twig_loader extends Twig_Loader_Filesystem +class loader extends \Twig_Loader_Filesystem { protected $safe_directories = array(); diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index d632469c9e..eeedeb31f0 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -73,5 +73,5 @@ abstract class includeasset extends \Twig_Node * @param Twig_Compiler A Twig_Compiler instance * @return null */ - abstract protected function append_asset(Twig_Compiler $compiler); + abstract protected function append_asset(\Twig_Compiler $compiler); } diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php index 9601cc5155..deb279fa4a 100644 --- a/phpBB/phpbb/template/twig/node/includecss.php +++ b/phpBB/phpbb/template/twig/node/includecss.php @@ -22,7 +22,7 @@ class includecss extends \phpbb\template\twig\node\includeasset /** * {@inheritdoc} */ - public function append_asset(Twig_Compiler $compiler) + public function append_asset(\Twig_Compiler $compiler) { $compiler ->raw("environment->get_phpbb_config(); diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php index 401f049405..fdc08833a3 100644 --- a/tests/auth/provider_oauth_token_storage_test.php +++ b/tests/auth/provider_oauth_token_storage_test.php @@ -25,7 +25,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c global $phpbb_root_path, $phpEx; $this->db = $this->new_dbal(); - $this->user = $this->getMock('phpbb_user'); + $this->user = $this->getMock('\phpbb\user'); $this->service_name = 'auth.provider.oauth.service.testing'; $this->token_storage_table = 'phpbb_oauth_tokens'; @@ -36,7 +36,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c // Set the user id to anonymous $this->user->data['user_id'] = ANONYMOUS; - $this->token_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->token_storage_table); + $this->token_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->token_storage_table); } public function getDataSet() @@ -74,7 +74,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c $expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES); // Store a token in the database - $temp_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->token_storage_table); + $temp_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->token_storage_table); $temp_storage->storeAccessToken($this->service_name, $expected_token); unset($temp_storage); @@ -105,7 +105,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c $expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES); // Store a token in the database - $temp_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->token_storage_table); + $temp_storage = new \phpbb\auth\provider\oauth\token_storage($this->db, $this->user, $this->token_storage_table); $temp_storage->storeAccessToken($this->service_name, $expected_token); unset($temp_storage); @@ -196,7 +196,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c protected function get_token_row_by_session_id($session_id) { // Test that the token is stored in the database - $sql = 'SELECT * FROM phpbb_oauth_tokens + $sql = 'SELECT * FROM phpbb_oauth_tokens WHERE session_id = \'' . $this->db->sql_escape($session_id) . '\''; $result = $this->db->sql_query($sql); $row = $this->db->sql_fetchrow($result); diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php index a576ef6b67..734e682ee9 100644 --- a/tests/mock/auth_provider.php +++ b/tests/mock/auth_provider.php @@ -10,7 +10,7 @@ /** * Mock auth provider class with basic functions to help test sessions. */ -class phpbb_mock_auth_provider extends phpbb_auth_provider_base +class phpbb_mock_auth_provider extends \phpbb\auth\provider\base { public function login($username, $password) { diff --git a/tests/notification/base.php b/tests/notification/base.php index 8de162a1fb..549545f01b 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -46,17 +46,17 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case global $db, $config, $user, $auth, $cache, $phpbb_container; $db = $this->db = $this->new_dbal(); - $config = $this->config = new phpbb_config(array( + $config = $this->config = new \phpbb\config\config(array( 'allow_privmsg' => true, 'allow_bookmarks' => true, 'allow_topic_notify' => true, 'allow_forum_notify' => true, )); - $user = $this->user = new phpbb_user(); - $this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $user = $this->user = new \phpbb\user(); + $this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $auth = $this->auth = new phpbb_mock_notifications_auth(); - $cache = $this->cache = new phpbb_cache_service( - new phpbb_cache_driver_null(), + $cache = $this->cache = new \phpbb\cache\service( + new \phpbb\cache\driver\null(), $this->config, $this->db, $phpbb_root_path, @@ -87,7 +87,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case $types = array(); foreach ($this->get_notification_types() as $type) { - $class = $this->build_type('phpbb_notification_type_' . $type); + $class = $this->build_type('phpbb\notification\type\\' . $type); $types[$type] = $class; $this->container->set('notification.type.' . $type, $class); diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php index 368e4ae973..b812fff8f8 100644 --- a/tests/notification/group_request_test.php +++ b/tests/notification/group_request_test.php @@ -37,17 +37,17 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas set_config(false, false, false, $this->config); - $this->container->set('groupposition.legend', new phpbb_groupposition_legend( + $this->container->set('groupposition.legend', new \phpbb\groupposition\legend( $this->db, $this->user )); - $this->container->set('groupposition.teampage', new phpbb_groupposition_teampage( + $this->container->set('groupposition.teampage', new \phpbb\groupposition\teampage( $this->db, $this->user, $this->cache->get_driver() )); $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $phpbb_log = new phpbb_log_null(); + $phpbb_log = new \phpbb\log\null(); // Now on to the actual test diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index 8d6c9a866d..3f13b9f216 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -43,8 +43,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case // Change the global cache object for this test because // the mock cache object does not hit the database as is needed // for this test. - $cache = new phpbb_cache_service( - new phpbb_cache_driver_file(), + $cache = new \phpbb\cache\service( + new \phpbb\cache\driver\file(), $config, $this->db, $phpbb_root_path, diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php index 9f0a3c5f59..f289c48f69 100644 --- a/tests/session/testable_facade.php +++ b/tests/session/testable_facade.php @@ -14,11 +14,11 @@ require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php'; * This class exists to expose session.php's functions in a more testable way. * * Since many functions in session.php have global variables inside the function, - * this exposes those functions through a testable facade that uses - * testable_factory's mock global variables to modify global variables used in + * this exposes those functions through a testable facade that uses + * testable_factory's mock global variables to modify global variables used in * the functions. * - * This is using the facade pattern to provide a testable "front" to the + * This is using the facade pattern to provide a testable "front" to the * functions in sessions.php. * */ @@ -35,17 +35,17 @@ class phpbb_session_testable_facade function extract_current_page( $root_path, - $php_self, + $php_self, $query_string, $request_uri - ) + ) { $this->session_factory->get_session($this->db); global $request; - $request->overwrite('PHP_SELF', $php_self, phpbb_request_interface::SERVER); - $request->overwrite('QUERY_STRING', $query_string, phpbb_request_interface::SERVER); - $request->overwrite('REQUEST_URI', $request_uri, phpbb_request_interface::SERVER); - return phpbb_session::extract_current_page($root_path); + $request->overwrite('PHP_SELF', $php_self, \phpbb\request\request_interface::SERVER); + $request->overwrite('QUERY_STRING', $query_string, \phpbb\request\request_interface::SERVER); + $request->overwrite('REQUEST_URI', $request_uri, \phpbb\request\request_interface::SERVER); + return \phpbb\session::extract_current_page($root_path); } function extract_current_hostname( @@ -58,8 +58,8 @@ class phpbb_session_testable_facade global $config, $request; $config['server_name'] = $server_name_config; $config['cookie_domain'] = $cookie_domain_config; - $request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER); - $request->overwrite('Host', $host, phpbb_request_interface::SERVER); + $request->overwrite('SERVER_NAME', $host, \phpbb\request\request_interface::SERVER); + $request->overwrite('Host', $host, \phpbb\request\request_interface::SERVER); // Note: There is a php_uname function used as a fallthrough // that this function doesn't override return $session->extract_current_hostname(); @@ -135,7 +135,7 @@ class phpbb_session_testable_facade $session->host = $host; $config['force_server_vars'] = $force_server_vars; $config['server_name'] = $server_name; - $request->overwrite('SERVER_PORT', $server_port, phpbb_request_interface::SERVER); + $request->overwrite('SERVER_PORT', $server_port, \phpbb\request\request_interface::SERVER); return $session->validate_referer($check_script_path); } } diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 461534a49d..438aa66471 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -20,7 +20,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $this->template = new \phpbb\template\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); + $this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); } } From 09cfa01d589ead86cf811e27b52167539e0478ec Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 03:14:39 +0200 Subject: [PATCH 029/102] [ticket/11700] Fix installation after develop merge PHPBB3-11700 --- phpBB/config/notifications.yml | 4 ++-- phpBB/install/index.php | 6 +++--- phpBB/phpbb/cache/driver/file.php | 2 +- .../migration/data/{310 => v310}/auth_provider_oauth.php | 4 +++- .../phpbb/db/migration/data/{310 => v310}/mod_rewrite.php | 6 ++++-- .../migration/data/{310 => v310}/notifications_cron.php | 6 ++++-- .../data/{310 => v310}/softdelete_mcp_modules.php | 8 +++++--- 7 files changed, 22 insertions(+), 14 deletions(-) rename phpBB/phpbb/db/migration/data/{310 => v310}/auth_provider_oauth.php (93%) rename phpBB/phpbb/db/migration/data/{310 => v310}/mod_rewrite.php (71%) rename phpBB/phpbb/db/migration/data/{310 => v310}/notifications_cron.php (75%) rename phpBB/phpbb/db/migration/data/{310 => v310}/softdelete_mcp_modules.php (83%) diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml index 87a619661c..6fecae2aeb 100644 --- a/phpBB/config/notifications.yml +++ b/phpBB/config/notifications.yml @@ -104,7 +104,7 @@ services: - { name: notification.type } notification.type.group_request: - class: phpbb_notification_type_group_request + class: phpbb\notification\type\group_request scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader @@ -122,7 +122,7 @@ services: - { name: notification.type } notification.type.group_request_approved: - class: phpbb_notification_type_group_request_approved + class: phpbb\notification\type\group_request_approved scope: prototype # scope MUST be prototype for this to work! arguments: - @user_loader diff --git a/phpBB/install/index.php b/phpBB/install/index.php index e94c393922..ebfec4232f 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -108,11 +108,11 @@ phpbb_include_updated('includes/utf/utf_tools.' . $phpEx); phpbb_require_updated('includes/functions_install.' . $phpEx); // Setup class loader first -$phpbb_class_loader_new = new \phpbb\class_loader('phpbb_', "{$phpbb_root_path}install/update/new/phpbb/", $phpEx); +$phpbb_class_loader_new = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}install/update/new/phpbb/", $phpEx); $phpbb_class_loader_new->register(); -$phpbb_class_loader = new \phpbb\class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $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 = new \phpbb\class_loader('phpbb\\ext\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index 6e63b6a716..a64232400b 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -260,7 +260,7 @@ class file extends \phpbb\cache\driver\base { try { - $iterator = new DirectoryIterator($dir); + $iterator = new \DirectoryIterator($dir); } catch (Exception $e) { diff --git a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php similarity index 93% rename from phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php rename to phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php index cad1c16bb2..971a7e8504 100644 --- a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php +++ b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class auth_provider_oauth extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php b/phpBB/phpbb/db/migration/data/v310/mod_rewrite.php similarity index 71% rename from phpBB/phpbb/db/migration/data/310/mod_rewrite.php rename to phpBB/phpbb/db/migration/data/v310/mod_rewrite.php index 85ce25abf3..ffb790b135 100644 --- a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php +++ b/phpBB/phpbb/db/migration/data/v310/mod_rewrite.php @@ -7,12 +7,14 @@ * */ -class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class mod_rewrite extends \phpbb\db\migration\migration { static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', + '\phpbb\db\migration\data\v310\dev', ); } diff --git a/phpBB/phpbb/db/migration/data/310/notifications_cron.php b/phpBB/phpbb/db/migration/data/v310/notifications_cron.php similarity index 75% rename from phpBB/phpbb/db/migration/data/310/notifications_cron.php rename to phpBB/phpbb/db/migration/data/v310/notifications_cron.php index 454628e50e..d5fa9c58a5 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications_cron.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications_cron.php @@ -7,11 +7,13 @@ * */ -class phpbb_db_migration_data_310_notifications_cron extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class notifications_cron extends \phpbb\db\migration\migration { static public function depends_on() { - return array('phpbb_db_migration_data_310_notifications'); + return array('\phpbb\db\migration\data\v310\notifications'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php b/phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php similarity index 83% rename from phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php rename to phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php index f80f55d19a..2db9780601 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class softdelete_mcp_modules extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -26,8 +28,8 @@ class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migrat static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', - 'phpbb_db_migration_data_310_softdelete_p2', + 'phpbb\db\migration\data\v310\dev', + 'phpbb\db\migration\data\v310\softdelete_p2', ); } From 1fa673bdedcc46fda69f62b6cb967bd33812f50a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 03:22:13 +0200 Subject: [PATCH 030/102] [ticket/11700] Fix authentication acp after develop merge PHPBB3-11700 --- phpBB/config/auth_providers.yml | 10 +++++----- phpBB/phpbb/auth/provider/oauth/oauth.php | 6 +++--- .../phpbb/auth/provider/oauth/service/base.php | 4 +++- .../auth/provider/oauth/service/facebook.php | 18 ++++++++++-------- .../auth/provider/oauth/service/google.php | 18 ++++++++++-------- .../{interface.php => service_interface.php} | 8 +++++--- 6 files changed, 36 insertions(+), 28 deletions(-) rename phpBB/phpbb/auth/provider/oauth/service/{interface.php => service_interface.php} (90%) diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml index cc782376fc..e1c289334e 100644 --- a/phpBB/config/auth_providers.yml +++ b/phpBB/config/auth_providers.yml @@ -36,7 +36,7 @@ services: tags: - { name: auth.provider } auth.provider.oauth: - class: phpbb_auth_provider_oauth + class: phpbb\auth\provider\oauth\oauth arguments: - @dbal.conn - @config @@ -51,27 +51,27 @@ services: tags: - { name: auth.provider } auth.provider.oauth.service_collection: - class: phpbb_di_service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: - { name: service_collection, tag: auth.provider.oauth.service } auth.provider.oauth.service.bitly: - class: phpbb_auth_provider_oauth_service_bitly + class: phpbb\auth\provider\oauth\service\bitly arguments: - @config - @request tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.facebook: - class: phpbb_auth_provider_oauth_service_facebook + class: phpbb\auth\provider\oauth\service\facebook arguments: - @config - @request tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.google: - class: phpbb_auth_provider_oauth_service_google + class: phpbb\auth\provider\oauth\service\google arguments: - @config - @request diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index e92462b344..de81ac0d04 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -30,7 +30,7 @@ class oauth extends \phpbb\auth\provider\base /** * Database driver * - * @var \phpbb\db\driver + * @var \phpbb\db\driver\driver */ protected $db; @@ -107,7 +107,7 @@ class oauth extends \phpbb\auth\provider\base /** * OAuth Authentication Constructor * - * @param \phpbb\db\driver $db + * @param \phpbb\db\driver\driver $db * @param \phpbb\config\config $config * @param \phpbb\request\request_interface $request * @param \phpbb\user $user @@ -118,7 +118,7 @@ class oauth extends \phpbb\auth\provider\base * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(\phpbb\db\driver $db, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php index 1eb49b4265..61deb48695 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/base.php +++ b/phpBB/phpbb/auth/provider/oauth/service/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth\service; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_provider_oauth_service_interface +abstract class base implements \phpbb\auth\provider\oauth\service\service_interface { /** * External OAuth service provider diff --git a/phpBB/phpbb/auth/provider/oauth/service/facebook.php b/phpBB/phpbb/auth/provider/oauth/service/facebook.php index 49206b7654..4a4eeba6d5 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/facebook.php +++ b/phpBB/phpbb/auth/provider/oauth/service/facebook.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth\service; + /** * @ignore */ @@ -20,29 +22,29 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oauth_service_base +class facebook extends base { /** * phpBB config * - * @var phpbb_config + * @var phpbb\config\config */ protected $config; /** * phpBB request * - * @var phpbb_request + * @var phpbb\request\request_interface */ protected $request; /** * Constructor * - * @param phpbb_config $config - * @param phpbb_request $request + * @param phpbb\config\config $config + * @param phpbb\request\request_interface $request */ - public function __construct(phpbb_config $config, phpbb_request $request) + public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request) { $this->config = $config; $this->request = $request; @@ -66,7 +68,7 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Facebook)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // This was a callback request, get the token @@ -86,7 +88,7 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Facebook)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // Send a request with it diff --git a/phpBB/phpbb/auth/provider/oauth/service/google.php b/phpBB/phpbb/auth/provider/oauth/service/google.php index d4ef6e1d42..2449bbf523 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/google.php +++ b/phpBB/phpbb/auth/provider/oauth/service/google.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth\service; + /** * @ignore */ @@ -20,29 +22,29 @@ if (!defined('IN_PHPBB')) * * @package auth */ -class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth_service_base +class google extends base { /** * phpBB config * - * @var phpbb_config + * @var phpbb\config\config */ protected $config; /** * phpBB request * - * @var phpbb_request + * @var phpbb\request\request_interface */ protected $request; /** * Constructor * - * @param phpbb_config $config - * @param phpbb_request $request + * @param phpbb\config\config $config + * @param phpbb\request\request_interface $request */ - public function __construct(phpbb_config $config, phpbb_request $request) + public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request) { $this->config = $config; $this->request = $request; @@ -77,7 +79,7 @@ class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Google)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // This was a callback request, get the token @@ -97,7 +99,7 @@ class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth { if (!($this->service_provider instanceof \OAuth\OAuth2\Service\Google)) { - throw new phpbb_auth_provider_oauth_service_exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); + throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'); } // Send a request with it diff --git a/phpBB/phpbb/auth/provider/oauth/service/interface.php b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php similarity index 90% rename from phpBB/phpbb/auth/provider/oauth/service/interface.php rename to phpBB/phpbb/auth/provider/oauth/service/service_interface.php index 3bba7c0e2c..ab69fe6ef3 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/interface.php +++ b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\auth\provider\oauth\service; + /** * @ignore */ @@ -20,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -interface phpbb_auth_provider_oauth_service_interface +interface service_interface { /** * Returns an array of the scopes necessary for auth @@ -52,7 +54,7 @@ interface phpbb_auth_provider_oauth_service_interface /** * Returns the results of the authentication in json format * - * @throws phpbb_auth_provider_oauth_service_exception + * @throws \phpbb\auth\provider\oauth\service\exception * @return string The unique identifier returned by the service provider * that is used to authenticate the user with phpBB. */ @@ -62,7 +64,7 @@ interface phpbb_auth_provider_oauth_service_interface * Returns the results of the authentication in json format * Use this function when the user already has an access token * - * @throws phpbb_auth_provider_oauth_service_exception + * @throws \phpbb\auth\provider\oauth\service\exception * @return string The unique identifier returned by the service provider * that is used to authenticate the user with phpBB. */ From 8fd84ae87933a3fa537fc7d1496da08ff2be811a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 03:40:12 +0200 Subject: [PATCH 031/102] [ticket/11700] Oh dear modules. Abort! Retreat! PHPBB3-11700 --- tests/extension/modules_test.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php index fe71747c5d..96655ff90f 100644 --- a/tests/extension/modules_test.php +++ b/tests/extension/modules_test.php @@ -45,6 +45,8 @@ class phpbb_extension_modules_test extends phpbb_test_case { global $phpbb_root_path; + $this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.'); + // Correctly set the root path for this test to this directory, so the classes can be found $phpbb_root_path = dirname(__FILE__) . '/'; From 3860b37741c21576dae2f02e3754aa322c24567f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 03:50:47 +0200 Subject: [PATCH 032/102] [ticket/11700] Actually "one" in comments is not a class PHPBB3-11700 --- phpBB/phpbb/auth/auth.php | 2 +- phpBB/phpbb/db/tools.php | 2 +- phpBB/phpbb/session.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 5c76b64281..05d7d5e97b 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -1007,7 +1007,7 @@ class auth // Successful session creation if ($result === true) { - // If admin re-authentication we remove the old session entry because a new \one has been created... + // If admin re-authentication we remove the old session entry because a new one has been created... if ($admin) { // the login array is used because the user ids do not differ for re-authentication diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index f594fbe63f..8ae58e2d4b 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1072,7 +1072,7 @@ class tools { $new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')'; } - // Add a new \one or the old primary key + // Add a new one or the old primary key else if ($primary_key !== false) { $new_table_cols[] = $primary_key; diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 6925ebbc6a..2bfa55334d 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -199,7 +199,7 @@ class session * This is where all session activity begins. We gather various pieces of * information from the client and server. We test to see if a session already * exists. If it does, fine and dandy. If it doesn't we'll go on to create a - * new \one ... pretty logical heh? We also examine the system load (if we're + * new one ... pretty logical heh? We also examine the system load (if we're * running on a system which makes such information readily available) and * halt if it's above an admin definable limit. * @@ -494,7 +494,7 @@ class session } } - // If we reach here then no (valid) session exists. So we'll create a new \one + // If we reach here then no (valid) session exists. So we'll create a new one return $this->session_create(); } @@ -801,7 +801,7 @@ class session // Something quite important: session_page always holds the *last* page visited, except for the *first* visit. // We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case. - // If the session id is empty, we have a completely new \one and will set an "identifier" here. This identifier is able to be checked later. + // If the session id is empty, we have a completely new one and will set an "identifier" here. This identifier is able to be checked later. if (empty($this->data['session_id'])) { // This is a temporary variable, only set for the very first visit From acea8f5c0a5d0901b25e4055dd6dfc4b8bebe707 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 03:51:25 +0200 Subject: [PATCH 033/102] [ticket/11700] The word "them" in a comment is not a class PHPBB3-11700 --- phpBB/phpbb/auth/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 05d7d5e97b..b5cc675838 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -94,7 +94,7 @@ class auth } } - // If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew \them + // If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them if ($renew) { $this->acl_cache($userdata); From 005c5118cf89c6b09d4ff1b6e4139235e86bcdfb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 04:01:18 +0200 Subject: [PATCH 034/102] [ticket/11700] travis has hardcoded driver class names without namespaces PHPBB3-11700 --- tests/test_framework/phpbb_database_test_case.php | 2 +- travis/phpunit-mysql-travis.xml | 2 +- travis/phpunit-postgres-travis.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 1a9edcb181..4c2e9ff600 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -82,7 +82,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $db_config = $this->get_database_config(); // Firebird requires table and column names to be uppercase - if ($db_config['dbms'] == '\phpbb\db\driver\firebird') + if ($db_config['dbms'] == 'phpbb\db\driver\firebird') { $xml_data = file_get_contents($path); $xml_data = preg_replace_callback('/(?:(
))/', 'phpbb_database_test_case::to_upper', $xml_data); diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 715e66c223..5fa6c06e46 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -32,7 +32,7 @@ - + diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index c397882d3c..88d9e0f46a 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -31,7 +31,7 @@ - + From 721483cd64f4b3f600a6c5a928a3a0dc26e58228 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 04:07:30 +0200 Subject: [PATCH 035/102] [ticket/11700] Default db driver for tests must not lead with \ PHPBB3-11700 --- tests/test_framework/phpbb_test_case_helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 4463ce19de..351a3a9594 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -107,7 +107,7 @@ class phpbb_test_case_helpers if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) { $config = array_merge($config, array( - 'dbms' => '\phpbb\db\driver\sqlite', + 'dbms' => 'phpbb\db\driver\sqlite', 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename 'dbport' => '', 'dbname' => '', From ccbb070652a188fd3b2354781d57af8847015eee Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 04:19:52 +0200 Subject: [PATCH 036/102] [ticket/11700] The driver is namespaced now, so properly replace it PHPBB3-11700 --- tests/test_framework/phpbb_functional_test_case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index d5d3258b1b..8b59521dc0 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -265,7 +265,7 @@ class phpbb_functional_test_case extends phpbb_test_case self::assertContains('Database configuration', $crawler->filter('#main')->text()); $form = $crawler->selectButton('submit')->form(array( // Installer uses 3.0-style dbms name - 'dbms' => str_replace('phpbb_db_driver_', '', self::$config['dbms']), + 'dbms' => str_replace('phpbb\db\driver\\', '', self::$config['dbms']), 'dbhost' => self::$config['dbhost'], 'dbport' => self::$config['dbport'], 'dbname' => self::$config['dbname'], From d626ebaf1e3d993ba3474c8dd403b18d5faf8863 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 04:45:58 +0200 Subject: [PATCH 037/102] [ticket/11700] Fix a few more comments PHPBB3-11700 --- phpBB/phpbb/auth/provider/db.php | 2 +- phpBB/phpbb/datetime.php | 2 +- phpBB/phpbb/db/driver/driver.php | 4 ++-- phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php | 8 ++++---- phpBB/phpbb/db/migration/data/v310/dev.php | 2 +- phpBB/phpbb/db/migration/data/v310/timezone.php | 2 +- phpBB/phpbb/db/migration/exception.php | 6 +++--- phpBB/phpbb/db/migration/tool/config.php | 2 +- phpBB/phpbb/db/migration/tool/module.php | 2 +- phpBB/phpbb/db/migration/tool/permission.php | 2 +- phpBB/phpbb/db/migrator.php | 2 +- phpBB/phpbb/db/tools.php | 2 +- phpBB/phpbb/notification/manager.php | 2 +- phpBB/phpbb/notification/type/quote.php | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index f613bafc6a..a18fc258a4 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -204,7 +204,7 @@ class db extends \phpbb\auth\provider\base { $hash = phpbb_hash($password_new_format); - // Update the password in the users table to the new \format and remove user_pass_convert flag + // Update the password in the users table to the new format and remove user_pass_convert flag $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password = \'' . $this->db->sql_escape($hash) . '\', user_pass_convert = 0 diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php index 2d48c8311e..84b13202af 100644 --- a/phpBB/phpbb/datetime.php +++ b/phpBB/phpbb/datetime.php @@ -30,7 +30,7 @@ class datetime extends \DateTime static protected $format_cache = array(); /** - * Constructs a new \instance of \phpbb\datetime, expanded to include an argument to inject + * Constructs a new instance of \phpbb\datetime, expanded to include an argument to inject * the user context and modify the timezone to the users selected timezone if one is not set. * * @param string $time String in a format accepted by strtotime(). diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index a266b2aa48..cd960bc65a 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -274,7 +274,7 @@ class driver * Correctly adjust LIKE expression for special characters * Some DBMS are handling them in a different way * - * @param string $expression The expression to use. Every wildcard is escaped, \except $this->any_char and $this->one_char + * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char * @return string LIKE expression including the keyword! */ function sql_like_expression($expression) @@ -452,7 +452,7 @@ class driver * @param string $field name of the sql column that shall be compared * @param array $array array of values that are allowed (IN) or not allowed (NOT IN) * @param bool $negate true for NOT IN (), false for IN () (default) - * @param bool $allow_empty_set If true, \allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. + * @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. */ function sql_in_set($field, $array, $negate = false, $allow_empty_set = false) { diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php index 712d54a723..87d5e490f8 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php @@ -216,7 +216,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration $group_id = $this->db->sql_nextid(); } - // Insert new \user role... at the end of the chain + // Insert new user role... at the end of the chain $sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . " WHERE role_name = 'ROLE_USER_NEW_MEMBER' @@ -241,7 +241,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration $u_role = $this->db->sql_nextid(); // Now add the correct data to the roles... - // The standard role says that new \users are not able to send a PM, Mass PM, are not able to PM groups + // The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups $sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')"; $this->sql_query($sql); @@ -250,7 +250,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration $this->sql_query($sql); } - // Insert new \forum role + // Insert new forum role $sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . " WHERE role_name = 'ROLE_FORUM_NEW_MEMBER' @@ -278,7 +278,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration $this->sql_query($sql); } - // Set every members user_new \column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once) + // Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once) $sql = 'SELECT 1 FROM ' . USERS_TABLE . ' WHERE user_new = 0'; diff --git a/phpBB/phpbb/db/migration/data/v310/dev.php b/phpBB/phpbb/db/migration/data/v310/dev.php index 5a10e7c236..c1db883616 100644 --- a/phpBB/phpbb/db/migration/data/v310/dev.php +++ b/phpBB/phpbb/db/migration/data/v310/dev.php @@ -185,7 +185,7 @@ class dev extends \phpbb\db\migration\migration public function move_customise_modules() { - // Move language management to new \location in the Customise tab + // Move language management to new location in the Customise tab // First get language module id $sql = 'SELECT module_id FROM ' . MODULES_TABLE . " WHERE module_basename = 'acp_language'"; diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php index 93c58819ce..e3b1912049 100644 --- a/phpBB/phpbb/db/migration/data/v310/timezone.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone.php @@ -65,7 +65,7 @@ class timezone extends \phpbb\db\migration\migration } /** - * Determine the new \timezone for a given phpBB 3.0 timezone and + * Determine the new timezone for a given phpBB 3.0 timezone and * "Daylight Saving Time" option * * @param $timezone float Users timezone in 3.0 diff --git a/phpBB/phpbb/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php index 8bf18dec68..58e29b5218 100644 --- a/phpBB/phpbb/db/migration/exception.php +++ b/phpBB/phpbb/db/migration/exception.php @@ -18,7 +18,7 @@ if (!defined('IN_PHPBB')) } /** -* The migrator is responsible for applying new \migrations in the correct order. +* The migrator is responsible for applying new migrations in the correct order. * * @package db */ @@ -66,8 +66,8 @@ class exception extends \Exception } /** - * Get localised message (\with $user->lang()) - * + * Get localised message (with $user->lang()) + * * @param \phpbb\user $user * @return string */ diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php index 6ff69bbd2b..f2149dc59a 100644 --- a/phpBB/phpbb/db/migration/tool/config.php +++ b/phpBB/phpbb/db/migration/tool/config.php @@ -80,7 +80,7 @@ class config implements \phpbb\db\migration\tool\tool_interface * current config value * * @param string $compare If equal to the current config value, will be - * updated to the new \config value, otherwise not + * updated to the new config value, otherwise not * @param string $config_name The name of the config setting you would * like to update * @param mixed $config_value The value of the config setting diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index ecb1176bd4..9869dd4230 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -131,7 +131,7 @@ class module implements \phpbb\db\migration\tool\tool_interface /** * Module Add * - * Add a new \module + * Add a new module * * @param string $class The module class(acp|mcp|ucp) * @param int|string $parent The parent module_id|module_langname (0 for no parent) diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 51b0996c30..dfb32f79f4 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -238,7 +238,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface } /** - * Add a new \permission role + * Add a new permission role * * @param string $role_name The new \role name * @param sting $role_type The type (u_, m_, a_) diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 0b9463a622..d7d2b3df59 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -18,7 +18,7 @@ if (!defined('IN_PHPBB')) } /** -* The migrator is responsible for applying new \migrations in the correct order. +* The migrator is responsible for applying new migrations in the correct order. * * @package db */ diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 8ae58e2d4b..d6ea7cc97b 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1703,7 +1703,7 @@ class tools } /** - * Add new \column + * Add new column */ function sql_column_add($table_name, $column_name, $column_data, $inline = false) { diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index a865f7d6b9..1c95b928cf 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -380,7 +380,7 @@ class manager unset($notify_users[ANONYMOUS]); // Make sure not to send new \notifications to users who've already been notified about this item - // This may happen when an item was added, but now new \users are able to see the item + // This may happen when an item was added, but now new users are able to see the item $sql = 'SELECT n.user_id FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt WHERE n.notification_type_id = ' . (int) $notification_type_id . ' diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index d59f7caf8e..b33766023e 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -168,7 +168,7 @@ class quote extends \phpbb\notification\type\post } $this->db->sql_freeresult($result); - // Find the new \users to notify + // Find the new users to notify $notifications = $this->find_users_for_notification($post); // Find the notifications we must delete From ee1c15fe7e1d0c823026d2b63ceab276eb878ab0 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 04:47:39 +0200 Subject: [PATCH 038/102] [ticket/11700] Fix another case of non-namespaced classnames PHPBB3-11700 --- tests/test_framework/phpbb_functional_test_case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 8b59521dc0..3b13d35f97 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -532,7 +532,7 @@ class phpbb_functional_test_case extends phpbb_test_case $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $cache = new phpbb_mock_null_cache; - $cache_driver = new phpbb_cache_driver_null(); + $cache_driver = new \phpbb\cache\driver\null(); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); From 390dc86344c23b658085bae4a719399e5eb579f0 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 05:00:18 +0200 Subject: [PATCH 039/102] [ticket/11700] And some last comments with backslashes PHPBB3-11700 --- phpBB/phpbb/db/tools.php | 14 +++++++------- phpBB/phpbb/groupposition/teampage.php | 4 ++-- phpBB/phpbb/notification/manager.php | 2 +- phpBB/phpbb/notification/type/base.php | 2 +- phpBB/phpbb/search/base.php | 2 +- phpBB/phpbb/search/fulltext_native.php | 6 +++--- phpBB/phpbb/search/sphinx/config.php | 14 +++++++------- phpBB/phpbb/session.php | 6 +++--- phpBB/phpbb/template/context.php | 4 ++-- phpBB/phpbb/template/twig/node/event.php | 4 ++-- phpBB/phpbb/user.php | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index d6ea7cc97b..1f156fbb04 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -505,7 +505,7 @@ class tools trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR); } - // here we add the definition of the new \column to the list of columns + // here we add the definition of the new column to the list of columns switch ($this->sql_layer) { case 'mssql': @@ -992,7 +992,7 @@ class tools $column_list[] = $entities[0]; } - // note down the primary key notation because sqlite only supports adding it to the end for the new \table + // note down the primary key notation because sqlite only supports adding it to the end for the new table $primary_key = false; $_new_cols = array(); @@ -1080,7 +1080,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1812,7 +1812,7 @@ class tools $new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols; - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1927,7 +1927,7 @@ class tools $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2119,7 +2119,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2485,7 +2485,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index 4cd2ae7fa8..dc12768ddb 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -433,7 +433,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new \real delta + // Reset the delta, as we recalculate the new real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { @@ -521,7 +521,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new \real delta + // Reset the delta, as we recalculate the new real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index 1c95b928cf..c42c84fb1f 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -379,7 +379,7 @@ class manager // Never send notifications to the anonymous user! unset($notify_users[ANONYMOUS]); - // Make sure not to send new \notifications to users who've already been notified about this item + // Make sure not to send new notifications to users who've already been notified about this item // This may happen when an item was added, but now new users are able to see the item $sql = 'SELECT n.user_id FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index cc0355771b..3c44468bb8 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -145,7 +145,7 @@ abstract class base implements \phpbb\notification\type\type_interface */ public function set_initial_data($data = array()) { - // The row from the database (unless this is a new \notification we're going to add) + // The row from the database (unless this is a new notification we're going to add) $this->data = $data; $this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array(); } diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index 2f6b225b99..f2f982c31b 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -183,7 +183,7 @@ class base $store_ids = array_slice($id_ary, 0, $length); - // create a new \resultset if there is none for this search_key yet + // create a new resultset if there is none for this search_key yet // or add the ids to the existing resultset if (!($store = $cache->get('_search_results_' . $search_key))) { diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 006b88e07a..50cf588a46 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -1271,7 +1271,7 @@ class fulltext_native extends \phpbb\search\base // We now have unique arrays of all words to be added and removed and // individual arrays of added and removed words for text and title. What - // we need to do now is add the new \words (if they don't already exist) + // we need to do now is add the new words (if they don't already exist) // and then add (or remove) matches between the words and this post if (sizeof($unique_add_words)) { @@ -1308,7 +1308,7 @@ class fulltext_native extends \phpbb\search\base $this->db->sql_transaction('begin'); } - // now update the search match table, remove links to removed words and add links to new \words + // now update the search match table, remove links to removed words and add links to new words foreach ($words['del'] as $word_in => $word_ary) { $title_match = ($word_in == 'title') ? 1 : 0; @@ -1468,7 +1468,7 @@ class fulltext_native extends \phpbb\search\base WHERE ' . $this->db->sql_in_set('word_id', $sql_in); $this->db->sql_query($sql); - // by setting search_last_gc to the new \time here we make sure that if a user reloads because the + // by setting search_last_gc to the new time here we make sure that if a user reloads because the // following query takes too long, he won't run into it again set_config('search_last_gc', time(), true); diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index 2468022428..8462298e01 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -65,7 +65,7 @@ class config /** * Appends a new \empty section to the end of the config * - * @param string $name The name for the new \section + * @param string $name The name for the new section * @return \phpbb\search\sphinx\config_section The newly created section object * * @access public @@ -143,7 +143,7 @@ class config $section_name .= $line[$j]; } - // And then we create the new \section object + // And then we create the new section object $section_name = trim($section_name); $section = new \phpbb\search\sphinx\config_section($section_name, $section_name_comment); } @@ -163,7 +163,7 @@ class config $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } - + // As long as we haven't yet actually found an opening bracket for this section // we treat everything as comments so it's not deleted either if (!$found_opening_bracket) @@ -182,7 +182,7 @@ class config } } - // If we did not find a comment in this line or still add to the previous + // If we did not find a comment in this line or still add to the previous // line's value ... if ($line || $in_value) { @@ -241,8 +241,8 @@ class config } } - // If a name and an equal sign were found then we have append a - // new \variable object to the section + // If a name and an equal sign were found then we have append a + // new variable object to the section if ($name && $found_assignment) { $section->add_variable(new \phpbb\search\sphinx\config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); @@ -250,7 +250,7 @@ class config } /* If we found a closing curly bracket this section has been completed - and we can append it to the section list and continue with looking for + and we can append it to the section list and continue with looking for the next section */ if ($end_section) { diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 2bfa55334d..543369a3ab 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -499,13 +499,13 @@ class session } /** - * Create a new \session + * Create a new session * * If upon trying to start a session we discover there is nothing existing we * jump here. Additionally this method is called directly during login to regenerate * the session for the specific user. In this method we carry out a number of tasks; * garbage collection, (search)bot checking, banned user comparison. Basically - * though this method will result in a new \session for a specific user. + * though this method will result in a new session for a specific user. */ function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) { @@ -775,7 +775,7 @@ class session if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())) { - // Limit new \sessions in 1 minute period (if required) + // Limit new sessions in 1 minute period (if required) if (empty($this->data['session_time']) && $config['active_sessions']) { // $db->sql_return_on_error(false); diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index 263f77a1b8..f978f82d33 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -160,7 +160,7 @@ class context } // Now we add the block that we're actually assigning to. - // We're adding a new \iteration to this block with the given + // We're adding a new iteration to this block with the given // variable assignments. $str[$blocks[$blockcount]][] = $vararray; @@ -192,7 +192,7 @@ class context unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']); } - // Add a new \iteration to this block with the variable assignments we were given. + // Add a new iteration to this block with the variable assignments we were given. $this->tpldata[$blockname][] = $vararray; // Set S_NUM_ROWS diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php index 1fc85ab4a2..202db775ee 100644 --- a/phpBB/phpbb/template/twig/node/event.php +++ b/phpBB/phpbb/template/twig/node/event.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) class event extends \Twig_Node { - /** + /** * The subdirectory in which all template listener files must be placed * @var string */ @@ -56,7 +56,7 @@ class event extends \Twig_Node // If debug mode is enabled, lets check for new/removed EVENT // templates on page load rather than at compile. This is // slower, but makes developing extensions easier (no need to - // purge the cache when a new \event template file is added) + // purge the cache when a new event template file is added) $compiler ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") ->indent() diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index a5b3308288..f97cc94d40 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -43,7 +43,7 @@ class user extends \phpbb\session var $img_lang; var $img_array = array(); - // Able to add new \options (up to id 31) + // Able to add new options (up to id 31) var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17); /** From 8b8ba3d7ac45447f82fe43e50a0d6c921922d214 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 05:03:41 +0200 Subject: [PATCH 040/102] [ticket/11700] Check for ALLOW_REMOTE_UPLOAD in acp output as expected PHPBB3-11700 --- tests/functional/common_avatar_test.php | 2 +- tests/functional/common_groups_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/common_avatar_test.php b/tests/functional/common_avatar_test.php index c0f21d07c2..1fd8f2ed6f 100644 --- a/tests/functional/common_avatar_test.php +++ b/tests/functional/common_avatar_test.php @@ -32,7 +32,7 @@ abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid); // Check the default entries we should have $this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text()); - $this->assertContainsLang('ALLOW_REMOTE', $crawler->text()); + $this->assertContainsLang('ALLOW_REMOTE_UPLOAD', $crawler->text()); $this->assertContainsLang('ALLOW_AVATARS', $crawler->text()); $this->assertContainsLang('ALLOW_LOCAL', $crawler->text()); diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php index 6c6572af62..950db24767 100644 --- a/tests/functional/common_groups_test.php +++ b/tests/functional/common_groups_test.php @@ -43,7 +43,7 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test $crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid); // Check the default entries we should have - $this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text()); + $this->assertContains($this->lang('ALLOW_REMOTE_UPLOAD'), $crawler->text()); $this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text()); $this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text()); From d905358e2be11cc3fe040036b1138e54be7f30dc Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 05:20:27 +0200 Subject: [PATCH 041/102] [ticket/11700] Fix leftover backslashes in comments PHPBB3-11700 --- phpBB/phpbb/auth/provider/provider_interface.php | 2 +- phpBB/phpbb/config/db.php | 2 +- phpBB/phpbb/db/migration/data/v310/timezone.php | 2 +- phpBB/phpbb/db/migration/tool/permission.php | 4 ++-- phpBB/phpbb/extension/finder.php | 2 +- phpBB/phpbb/hook/finder.php | 2 +- phpBB/phpbb/request/deactivated_super_global.php | 2 +- phpBB/phpbb/search/fulltext_mysql.php | 6 +++--- phpBB/phpbb/search/fulltext_postgres.php | 2 +- phpBB/phpbb/search/sphinx/config.php | 2 +- phpBB/phpbb/search/sphinx/config_section.php | 6 +++--- phpBB/phpbb/search/sphinx/config_variable.php | 2 +- phpBB/phpbb/tree/tree_interface.php | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 46245d34ca..31368a0286 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -77,7 +77,7 @@ interface provider_interface * options with whatever configuraton values are passed to it as an array. * It then returns the name of the acp file related to this authentication * provider. - * @param array $new_config Contains the new \configuration values that + * @param array $new_config Contains the new configuration values that * have been set in acp_board. * @return array|null Returns null if not implemented or an array with * the template file name and an array of the vars diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php index 7174327ef3..0a490af14f 100644 --- a/phpBB/phpbb/config/db.php +++ b/phpBB/phpbb/config/db.php @@ -178,7 +178,7 @@ class db extends \phpbb\config\config /** * Increments an integer config value directly in the database. * - * Using this method instead of setting the new \value directly avoids race + * Using this method instead of setting the new value directly avoids race * conditions and unlike set_atomic it cannot fail. * * @param string $key The configuration option's name diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php index e3b1912049..dd0c6a2093 100644 --- a/phpBB/phpbb/db/migration/data/v310/timezone.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone.php @@ -70,7 +70,7 @@ class timezone extends \phpbb\db\migration\migration * * @param $timezone float Users timezone in 3.0 * @param $dst int Users daylight saving time - * @return string Users new \php Timezone which is used since 3.1 + * @return string Users new php Timezone which is used since 3.1 */ public function convert_phpbb30_timezone($timezone, $dst) { diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index dfb32f79f4..fd2de9c8fb 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -240,7 +240,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface /** * Add a new permission role * - * @param string $role_name The new \role name + * @param string $role_name The new role name * @param sting $role_type The type (u_, m_, a_) * @return null */ @@ -279,7 +279,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface * Update the name on a permission role * * @param string $old_role_name The old role name - * @param string $new_role_name The new \role name + * @param string $new_role_name The new role name * @return null */ public function role_update($old_role_name, $new_role_name) diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index bf84728f05..338f1cdeb9 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -52,7 +52,7 @@ class finder protected $cached_queries; /** - * Creates a new \finder instance with its dependencies + * Creates a new finder instance with its dependencies * * @param \phpbb\extension\manager $extension_manager An extension manager * instance that provides the finder with a list of active diff --git a/phpBB/phpbb/hook/finder.php b/phpBB/phpbb/hook/finder.php index 7783efd0c7..d5eb1f8186 100644 --- a/phpBB/phpbb/hook/finder.php +++ b/phpBB/phpbb/hook/finder.php @@ -29,7 +29,7 @@ class finder protected $php_ext; /** - * Creates a new \finder instance. + * Creates a new finder instance. * * @param string $phpbb_root_path Path to the phpbb root directory * @param string $php_ext php file extension diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php index 4d4417229e..8f39960477 100644 --- a/phpBB/phpbb/request/deactivated_super_global.php +++ b/phpBB/phpbb/request/deactivated_super_global.php @@ -18,7 +18,7 @@ if (!defined('IN_PHPBB')) } /** -* Replacement for a superglobal (\like $_GET or $_POST) which calls +* Replacement for a superglobal (like $_GET or $_POST) which calls * trigger_error on all operations but isset, overloads the [] operator with SPL. * * @package \phpbb\request\request diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index a4812c139a..2508ab6d9a 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -41,13 +41,13 @@ class fulltext_mysql extends \phpbb\search\base * @var \phpbb\config\config */ protected $config; - + /** * Database connection * @var \phpbb\db\driver\driver */ protected $db; - + /** * User object * @var \phpbb\user @@ -703,7 +703,7 @@ class fulltext_mysql extends \phpbb\search\base } /** - * Destroys cached search results, that contained one of the new \words in a post so the results won't be outdated + * Destroys cached search results, that contained one of the new words in a post so the results won't be outdated * * @param string $mode contains the post mode: edit, post, reply, quote ... * @param int $post_id contains the post id of the post to index diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index ba9215fcfd..383645920a 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -733,7 +733,7 @@ class fulltext_postgres extends \phpbb\search\base } /** - * Destroys cached search results, that contained one of the new \words in a post so the results won't be outdated + * Destroys cached search results, that contained one of the new words in a post so the results won't be outdated * * @param string $mode contains the post mode: edit, post, reply, quote ... * @param int $post_id contains the post id of the post to index diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index 8462298e01..262d6008cc 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -63,7 +63,7 @@ class config } /** - * Appends a new \empty section to the end of the config + * Appends a new empty section to the end of the config * * @param string $name The name for the new section * @return \phpbb\search\sphinx\config_section The newly created section object diff --git a/phpBB/phpbb/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php index 3a5631ca21..7e6939576b 100644 --- a/phpBB/phpbb/search/sphinx/config_section.php +++ b/phpBB/phpbb/search/sphinx/config_section.php @@ -122,10 +122,10 @@ class config_section } /** - * Create a new \variable object and append it to the variable list of this section + * Create a new variable object and append it to the variable list of this section * - * @param string $name The name for the new \variable - * @param string $value The value for the new \variable + * @param string $name The name for the new variable + * @param string $value The value for the new variable * @return \phpbb\search\sphinx\config_variable Variable object that was created * * @access public diff --git a/phpBB/phpbb/search/sphinx/config_variable.php b/phpBB/phpbb/search/sphinx/config_variable.php index afe4190068..c8f40bfb5f 100644 --- a/phpBB/phpbb/search/sphinx/config_variable.php +++ b/phpBB/phpbb/search/sphinx/config_variable.php @@ -28,7 +28,7 @@ class config_variable private $comment; /** - * Constructs a new \variable object + * Constructs a new variable object * * @param string $name Name of the variable * @param string $value Value of the variable diff --git a/phpBB/phpbb/tree/tree_interface.php b/phpBB/phpbb/tree/tree_interface.php index b0a1e08ec6..162c1e5e29 100644 --- a/phpBB/phpbb/tree/tree_interface.php +++ b/phpBB/phpbb/tree/tree_interface.php @@ -69,7 +69,7 @@ interface tree_interface /** * Moves all children of one item to another item * - * If the new parent already has children, the new \children are appended + * If the new parent already has children, the new children are appended * to the list. * * @param int $current_parent_id The current parent item From fcd36ddd1f7c8a8b224423dca7599addbdaf1f57 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 05:36:21 +0200 Subject: [PATCH 042/102] [ticket/11700] Correctly generate lang key from avatar driver class PHPBB3-11700 --- phpBB/phpbb/avatar/manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 717ba00ed7..5d7f8f1b8f 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -264,7 +264,7 @@ class manager $config_name = $this->get_driver_config_name($driver); return array( - 'allow_avatar_' . $config_name => array('lang' => 'ALLOW_' . strtoupper($config_name), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), + 'allow_avatar_' . $config_name => array('lang' => 'ALLOW_' . strtoupper(str_replace('\\', '_', $config_name)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), ); } From 6e6681fa59a55393c52350d0086806662ba820fd Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 05:58:40 +0200 Subject: [PATCH 043/102] [ticket/11700] Load avatar explanations correctly from namespaces PHPBB3-11700 --- phpBB/phpbb/avatar/manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 5d7f8f1b8f..894ed080e6 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -277,7 +277,7 @@ class manager */ public function get_driver_config_name($driver) { - return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver)); + return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($driver)); } /** From 3634ff14a05b607a73136d0d2cdefeebb7b0ee5f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 06:16:53 +0200 Subject: [PATCH 044/102] [ticket/11700] Correct service definitions with namespaces PHPBB3-11700 --- phpBB/config/services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f991fea554..1dba6048e9 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -9,7 +9,7 @@ imports: services: acl.permissions: - class: phpbb_permissions + class: phpbb\permissions arguments: - @dispatcher - @user @@ -42,7 +42,7 @@ services: class_loader: class: phpbb\class_loader arguments: - - phpbb_ + - phpbb\ - %core.root_path%includes/ - %core.php_ext% calls: @@ -52,7 +52,7 @@ services: class_loader.ext: class: phpbb\class_loader arguments: - - phpbb_ext_ + - phpbb\ext\ - %core.root_path%ext/ - %core.php_ext% calls: @@ -247,7 +247,7 @@ services: - %tables.user_notifications% php_ini: - class: phpbb_php_ini + class: phpbb\php\ini request: class: phpbb\request\request From 570b83b046d47c7de3c4f85a1e4f6bee7b4593f7 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 06:30:50 +0200 Subject: [PATCH 045/102] [ticket/11700] namespacify phpbb_permissions class PHPBB3-11700 --- phpBB/phpbb/permissions.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 0fbacdad8a..d0405471bc 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + /** * DO NOT CHANGE */ @@ -15,28 +17,28 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_permissions +class permissions { /** * Event dispatcher object - * @var phpbb_event_dispatcher + * @var \phpbb\event\dispatcher */ protected $dispatcher; /** * User object - * @var phpbb_user + * @var \phpbb\user */ protected $user; /** * Constructor * - * @param phpbb_event_dispatcher $phpbb_dispatcher Event dispatcher - * @param phpbb_user $user User Object + * @param \phpbb\event\dispatcher $phpbb_dispatcher Event dispatcher + * @param \phpbb\user $user User Object * @return null */ - public function __construct(phpbb_event_dispatcher $phpbb_dispatcher, phpbb_user $user) + public function __construct(\phpbb\event\dispatcher $phpbb_dispatcher, \phpbb\user $user) { $this->dispatcher = $phpbb_dispatcher; $this->user = $user; @@ -241,14 +243,14 @@ class phpbb_permissions // Forum Permissions 'f_list' => array('lang' => 'ACL_F_LIST', 'cat' => 'actions'), - 'f_read' => array('lang' => 'ACL_F_READ', 'cat' => 'actions'), + 'f_read' => array('lang' => 'ACL_F_READ', 'cat' => 'actions'), 'f_search' => array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'), 'f_subscribe' => array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'), - 'f_print' => array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'), - 'f_email' => array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'), + 'f_print' => array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'), + 'f_email' => array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'), 'f_bump' => array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'), 'f_user_lock' => array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'), - 'f_download' => array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'), + 'f_download' => array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'), 'f_report' => array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'), 'f_post' => array('lang' => 'ACL_F_POST', 'cat' => 'post'), @@ -259,11 +261,11 @@ class phpbb_permissions 'f_delete' => array('lang' => 'ACL_F_DELETE', 'cat' => 'post'), 'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'), 'f_postcount' => array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'), - 'f_noapprove' => array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'), + 'f_noapprove' => array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'), - 'f_attach' => array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'), + 'f_attach' => array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'), 'f_icons' => array('lang' => 'ACL_F_ICONS', 'cat' => 'content'), - 'f_bbcode' => array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'), + 'f_bbcode' => array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'), 'f_flash' => array('lang' => 'ACL_F_FLASH', 'cat' => 'content'), 'f_img' => array('lang' => 'ACL_F_IMG', 'cat' => 'content'), 'f_sigs' => array('lang' => 'ACL_F_SIGS', 'cat' => 'content'), From 77ffd5c6ba02e5dabebc34c479aa964e05f4038d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 06:44:16 +0200 Subject: [PATCH 046/102] [ticket/11700] Use underscores in avatar driver template file names PHPBB3-11700 --- phpBB/phpbb/avatar/manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 894ed080e6..0408467064 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -235,7 +235,7 @@ class manager */ static public function prepare_driver_name($name) { - return str_replace('.', '_', $name); + return str_replace(array('\\', '.'), '_', $name); } /** From d12f35885539c8bd7d2d795d9fc5638d022698bb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 16 Sep 2013 17:33:56 +0200 Subject: [PATCH 047/102] [ticket/11700] Correctly convert old acm type to namespaced class name PHPBB3-11700 --- phpBB/phpbb/di/extension/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 62757c5b7d..85b374a3ca 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -78,7 +78,7 @@ class config extends Extension { if (preg_match('#^[a-z]+$#', $acm_type)) { - return 'phpbb_cache_driver_'.$acm_type; + return '\\phpbb\cache\driver\\'.$acm_type; } return $acm_type; From c4b53490ad93566914cbc280910c67b75346a665 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 16:15:44 +0200 Subject: [PATCH 048/102] [ticket/11700] Correctly load extensions with nonprefixed namespaces PHPBB3-11700 --- phpBB/common.php | 2 +- phpBB/config/services.yml | 2 +- phpBB/download/file.php | 4 +- phpBB/includes/acp/acp_modules.php | 2 +- phpBB/install/index.php | 2 +- phpBB/phpbb/extension/finder.php | 13 ++++--- phpBB/phpbb/extension/manager.php | 2 +- tests/class_loader/class_loader_test.php | 4 +- tests/extension/ext/bar/ext.php | 4 +- tests/extension/ext/barfoo/acp/a_info.php | 6 ++- tests/extension/ext/barfoo/acp/a_module.php | 4 +- tests/extension/ext/barfoo/ext.php | 4 +- tests/extension/ext/foo/a_class.php | 4 +- tests/extension/ext/foo/acp/a_info.php | 6 ++- tests/extension/ext/foo/acp/a_module.php | 4 +- tests/extension/ext/foo/acp/fail_info.php | 5 ++- tests/extension/ext/foo/acp/fail_module.php | 5 ++- tests/extension/ext/foo/b_class.php | 4 +- tests/extension/ext/foo/ext.php | 4 +- tests/extension/ext/foo/mcp/a_info.php | 6 ++- tests/extension/ext/foo/mcp/a_module.php | 4 +- .../ext/foo/sub/type/alternative.php | 4 +- tests/extension/ext/foo/type/alternative.php | 4 +- tests/extension/ext/foo/typewrong/error.php | 4 +- tests/extension/ext/vendor/moo/ext.php | 4 +- .../ext/vendor/moo/feature_class.php | 4 +- tests/extension/finder_test.php | 22 +++++------ tests/extension/manager_test.php | 12 +++--- tests/extension/modules_test.php | 38 +++++++++---------- 29 files changed, 111 insertions(+), 72 deletions(-) diff --git a/phpBB/common.php b/phpBB/common.php index 2fb832648a..4f2c9ea272 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -87,7 +87,7 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle // Setup class loader first $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 = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 1dba6048e9..5edaa6c0fc 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -52,7 +52,7 @@ services: class_loader.ext: class: phpbb\class_loader arguments: - - phpbb\ext\ + - \ - %core.root_path%ext/ - %core.php_ext% calls: diff --git a/phpBB/download/file.php b/phpBB/download/file.php index f612d11d3c..04d68f6a48 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -50,9 +50,9 @@ if (isset($_GET['avatar'])) require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); // Setup class loader first - $phpbb_class_loader = new \phpbb\class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $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 = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8aa72076da..6792886d2a 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -565,7 +565,7 @@ class acp_modules { // Skip entries we do not need if we know the module we are // looking for - if ($module && strpos($cur_module, $module) === false) + if ($module && strpos(str_replace('\\', '_', $cur_module), $module) === false) { continue; } diff --git a/phpBB/install/index.php b/phpBB/install/index.php index ebfec4232f..bdc2e86c53 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -112,7 +112,7 @@ $phpbb_class_loader_new = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path} $phpbb_class_loader_new->register(); $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 = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); // Set up container diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index 338f1cdeb9..d3e73bc387 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -277,15 +277,16 @@ class finder $classes = array(); foreach ($files as $file => $ext_name) { - if (preg_match('#^includes/#', $file)) + $class = substr($file, 0, -strlen('.' . $this->php_ext)); + if ($ext_name === '/' && preg_match('#^includes/#', $file)) { - $file = preg_replace('#^includes/#', '', $file); - $classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext))); + $class = preg_replace('#^includes/#', '', $class); + $classes[] = 'phpbb_' . str_replace('/', '_', $class); } else - { - $file = preg_replace('#^phpbb/#', '', $file); - $classes[] = 'phpbb\\' . str_replace('/', '\\', substr($file, 0, -strlen('.' . $this->php_ext))); + { + $class = preg_replace('#^ext/#', '', $class); + $classes[] = str_replace('/', '\\', $class); } } return $classes; diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index d174146f52..ce6d7e05c8 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -133,7 +133,7 @@ class manager */ public function get_extension($name) { - $extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext'; + $extension_class_name = str_replace('/', '\\', $name) . '\\ext'; $migrator = $this->container->get('migrator'); diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index eb50ac1ecd..255b634bd6 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -60,13 +60,13 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase { $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___' => 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_ext = new \phpbb\class_loader('\\', $prefix . 'phpbb/', 'php', $cache); $prefix .= 'phpbb/'; diff --git a/tests/extension/ext/bar/ext.php b/tests/extension/ext/bar/ext.php index edae25663a..22ff5e8077 100644 --- a/tests/extension/ext/bar/ext.php +++ b/tests/extension/ext/bar/ext.php @@ -1,6 +1,8 @@ 'phpbb_ext_barfoo_acp_a_module', + 'filename' => 'barfoo\\acp\\a_module', 'title' => 'Barfoo', 'version' => '3.1.0-dev', 'modes' => array( diff --git a/tests/extension/ext/barfoo/acp/a_module.php b/tests/extension/ext/barfoo/acp/a_module.php index 5bedb49645..0ae8775013 100644 --- a/tests/extension/ext/barfoo/acp/a_module.php +++ b/tests/extension/ext/barfoo/acp/a_module.php @@ -1,5 +1,7 @@ 'phpbb_ext_foo_acp_a_module', + 'filename' => 'foo\\acp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( diff --git a/tests/extension/ext/foo/acp/a_module.php b/tests/extension/ext/foo/acp/a_module.php index 093b4b1ad7..7aa2351ab3 100644 --- a/tests/extension/ext/foo/acp/a_module.php +++ b/tests/extension/ext/foo/acp/a_module.php @@ -1,5 +1,7 @@ 'phpbb_ext_foo_mcp_a_module', + 'filename' => 'foo\\mcp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( diff --git a/tests/extension/ext/foo/mcp/a_module.php b/tests/extension/ext/foo/mcp/a_module.php index 59d9f8cc6f..ca397e7004 100644 --- a/tests/extension/ext/foo/mcp/a_module.php +++ b/tests/extension/ext/foo/mcp/a_module.php @@ -1,5 +1,7 @@ assertEquals( array( + 'bar\my\hidden_class', + 'foo\a_class', + 'foo\b_class', 'phpbb\default\implementation', - 'phpbb\ext\bar\my\hidden_class', - 'phpbb\ext\foo\a_class', - 'phpbb\ext\foo\b_class', ), $classes ); @@ -88,8 +88,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( + 'bar\my\hidden_class', 'phpbb\default\implementation', - 'phpbb\ext\bar\my\hidden_class', ), $classes ); @@ -105,9 +105,9 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( + 'foo\sub\type\alternative', + 'foo\type\alternative', 'phpbb\default\implementation', - 'phpbb\ext\foo\sub\type\alternative', - 'phpbb\ext\foo\type\alternative', ), $classes ); @@ -122,7 +122,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb\ext\foo\type\alternative', + 'foo\type\alternative', ), $classes ); @@ -137,7 +137,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb\ext\foo\sub\type\alternative', + 'foo\sub\type\alternative', ), $classes ); @@ -152,7 +152,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb\ext\foo\sub\type\alternative', + 'foo\sub\type\alternative', ), $classes ); @@ -168,8 +168,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'phpbb\ext\foo\type\alternative', - 'phpbb\ext\foo\type\dummy\empty', + 'foo\type\alternative', + 'foo\type\dummy\empty', ), $classes ); diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index fd9e800c02..b127daf2ed 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -45,31 +45,31 @@ class phpbb_extension_manager_test extends phpbb_database_test_case public function test_enable() { - phpbb_ext_bar_ext::$state = 0; + bar\ext::$state = 0; $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->extension_manager->enable('bar'); $this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); - $this->assertEquals(4, phpbb_ext_bar_ext::$state); + $this->assertEquals(4, bar\ext::$state); } public function test_disable() { - phpbb_ext_foo_ext::$disabled = false; + foo\ext::$disabled = false; $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->extension_manager->disable('foo'); $this->assertEquals(array(), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); - $this->assertTrue(phpbb_ext_foo_ext::$disabled); + $this->assertTrue(foo\ext::$disabled); } public function test_purge() { - phpbb_ext_vendor_moo_ext::$purged = false; + vendor\moo\ext::$purged = false; $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); @@ -77,7 +77,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); $this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured())); - $this->assertTrue(phpbb_ext_vendor_moo_ext::$purged); + $this->assertTrue(vendor\moo\ext::$purged); } public function test_enabled_no_cache() diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php index 96655ff90f..ef21c943c2 100644 --- a/tests/extension/modules_test.php +++ b/tests/extension/modules_test.php @@ -45,7 +45,7 @@ class phpbb_extension_modules_test extends phpbb_test_case { global $phpbb_root_path; - $this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.'); +// $this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.'); // Correctly set the root path for this test to this directory, so the classes can be found $phpbb_root_path = dirname(__FILE__) . '/'; @@ -54,8 +54,8 @@ class phpbb_extension_modules_test extends phpbb_test_case $this->acp_modules->module_class = 'acp'; $acp_modules = $this->acp_modules->get_module_infos(); $this->assertEquals(array( - 'phpbb_ext_foo_acp_a_module' => array( - 'filename' => 'phpbb_ext_foo_acp_a_module', + 'foo\\acp\\a_module' => array( + 'filename' => 'foo\\acp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( @@ -76,8 +76,8 @@ class phpbb_extension_modules_test extends phpbb_test_case $this->acp_modules->module_class = 'mcp'; $acp_modules = $this->acp_modules->get_module_infos(); $this->assertEquals(array( - 'phpbb_ext_foo_mcp_a_module' => array( - 'filename' => 'phpbb_ext_foo_mcp_a_module', + 'foo\\mcp\\a_module' => array( + 'filename' => 'foo\\mcp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( @@ -90,8 +90,8 @@ class phpbb_extension_modules_test extends phpbb_test_case $this->acp_modules->module_class = 'mcp'; $acp_modules = $this->acp_modules->get_module_infos('mcp_a_module'); $this->assertEquals(array( - 'phpbb_ext_foo_mcp_a_module' => array( - 'filename' => 'phpbb_ext_foo_mcp_a_module', + 'foo\\mcp\\a_module' => array( + 'filename' => 'foo\\mcp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( @@ -104,8 +104,8 @@ class phpbb_extension_modules_test extends phpbb_test_case $this->acp_modules->module_class = ''; $acp_modules = $this->acp_modules->get_module_infos('mcp_a_module', 'mcp'); $this->assertEquals(array( - 'phpbb_ext_foo_mcp_a_module' => array( - 'filename' => 'phpbb_ext_foo_mcp_a_module', + 'foo\\mcp\\a_module' => array( + 'filename' => 'foo\\mcp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( @@ -126,10 +126,10 @@ class phpbb_extension_modules_test extends phpbb_test_case // Get module info of specified extension module $this->acp_modules->module_class = 'acp'; - $acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_foo_acp_a_module'); + $acp_modules = $this->acp_modules->get_module_infos('foo_acp_a_module'); $this->assertEquals(array( - 'phpbb_ext_foo_acp_a_module' => array ( - 'filename' => 'phpbb_ext_foo_acp_a_module', + 'foo\\acp\\a_module' => array ( + 'filename' => 'foo\\acp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array ( @@ -152,8 +152,8 @@ class phpbb_extension_modules_test extends phpbb_test_case $this->acp_modules->module_class = 'acp'; $acp_modules = $this->acp_modules->get_module_infos('', false, true); $this->assertEquals(array( - 'phpbb_ext_foo_acp_a_module' => array( - 'filename' => 'phpbb_ext_foo_acp_a_module', + 'foo\\acp\\a_module' => array( + 'filename' => 'foo\\acp\\a_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( @@ -168,8 +168,8 @@ class phpbb_extension_modules_test extends phpbb_test_case 'test' => array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')), ), ), - 'phpbb_ext_barfoo_acp_a_module' => array( - 'filename' => 'phpbb_ext_barfoo_acp_a_module', + 'barfoo\\acp\\a_module' => array( + 'filename' => 'barfoo\\acp\\a_module', 'title' => 'Barfoo', 'version' => '3.1.0-dev', 'modes' => array( @@ -179,10 +179,10 @@ class phpbb_extension_modules_test extends phpbb_test_case ), $acp_modules); // Specific module set to disabled extension - $acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_barfoo_acp_a_module', 'acp', true); + $acp_modules = $this->acp_modules->get_module_infos('barfoo_acp_a_module', 'acp', true); $this->assertEquals(array( - 'phpbb_ext_barfoo_acp_a_module' => array( - 'filename' => 'phpbb_ext_barfoo_acp_a_module', + 'barfoo\\acp\\a_module' => array( + 'filename' => 'barfoo\\acp\\a_module', 'title' => 'Barfoo', 'version' => '3.1.0-dev', 'modes' => array( From 13ba981fc300171d88a197107317f3f1391ddb03 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 16:18:04 +0200 Subject: [PATCH 049/102] [ticket/11700] Add back accidently deleted file in cache dir PHPBB3-11700 --- phpBB/cache/index.htm | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 phpBB/cache/index.htm diff --git a/phpBB/cache/index.htm b/phpBB/cache/index.htm new file mode 100644 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/cache/index.htm @@ -0,0 +1,10 @@ + + + + + + + + + + From 9d8ac2b0ceb24dd14df61d083505941afb1b52c4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 17:12:41 +0200 Subject: [PATCH 050/102] [ticket/11700] Fix unit tests after develop merge PHPBB3-11700 --- phpBB/common.php | 2 +- phpBB/includes/functions.php | 2 +- phpBB/phpbb/filesystem.php | 6 +++--- phpBB/phpbb/symfony_request.php | 20 ++++++++++--------- phpBB/phpbb/template/asset.php | 4 ++-- tests/controller/helper_url_test.php | 4 ++-- tests/dbal/migrator_test.php | 2 +- tests/extension/manager_test.php | 2 +- tests/extension/metadata_manager_test.php | 4 ++-- tests/filesystem/clean_path_test.php | 2 +- tests/filesystem/web_root_path_test.php | 4 ++-- tests/mock/extension_manager.php | 2 +- tests/template/template_events_test.php | 2 +- tests/template/template_test_case.php | 4 ++-- .../template/template_test_case_with_tree.php | 4 ++-- .../phpbb_functional_test_case.php | 2 +- 16 files changed, 34 insertions(+), 32 deletions(-) diff --git a/phpBB/common.php b/phpBB/common.php index fedf459888..c16751d1ae 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -48,7 +48,7 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb\request\request() ), $phpbb_root_path, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 53ee8c2512..7bdd4d252e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1072,7 +1072,7 @@ function phpbb_clean_path($path) } $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb\request\request() ), $phpbb_root_path, diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php index ae656ad6e6..662b6b866e 100644 --- a/phpBB/phpbb/filesystem.php +++ b/phpBB/phpbb/filesystem.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) */ class filesystem { - /** @var phpbb_symfony_request */ + /** @var \phpbb\symfony_request */ protected $symfony_request; /** @var string */ @@ -41,11 +41,11 @@ class filesystem /** * Constructor * - * @param phpbb_symfony_request $symfony_request + * @param \phpbb\symfony_request $symfony_request * @param string $phpbb_root_path Relative path to phpBB root * @param string $php_ext PHP extension (php) */ - public function __construct(phpbb_symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null) + public function __construct(\phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null) { $this->symfony_request = $symfony_request; $this->phpbb_root_path = $phpbb_root_path; diff --git a/phpBB/phpbb/symfony_request.php b/phpBB/phpbb/symfony_request.php index 29ab8c000e..92784c213b 100644 --- a/phpBB/phpbb/symfony_request.php +++ b/phpBB/phpbb/symfony_request.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + use Symfony\Component\HttpFoundation\Request; /** @@ -17,26 +19,26 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_symfony_request extends Request +class symfony_request extends Request { /** * Constructor * - * @param phpbb_request_interface $phpbb_request + * @param phpbb\request\request_interface $phpbb_request */ - public function __construct(phpbb_request_interface $phpbb_request) + public function __construct(\phpbb\request\request_interface $phpbb_request) { // This function is meant to sanitize the global input arrays $sanitizer = function(&$value, $key) { - $type_cast_helper = new phpbb_request_type_cast_helper(); + $type_cast_helper = new \phpbb\request\type_cast_helper(); $type_cast_helper->set_var($value, $value, gettype($value), true); }; - $get_parameters = $phpbb_request->get_super_global(phpbb_request_interface::GET); - $post_parameters = $phpbb_request->get_super_global(phpbb_request_interface::POST); - $server_parameters = $phpbb_request->get_super_global(phpbb_request_interface::SERVER); - $files_parameters = $phpbb_request->get_super_global(phpbb_request_interface::FILES); - $cookie_parameters = $phpbb_request->get_super_global(phpbb_request_interface::COOKIE); + $get_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::GET); + $post_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::POST); + $server_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::SERVER); + $files_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::FILES); + $cookie_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::COOKIE); array_walk_recursive($get_parameters, $sanitizer); array_walk_recursive($post_parameters, $sanitizer); diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index fa0661ec82..0e0b6b4782 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -21,7 +21,7 @@ class asset { protected $components = array(); - /** @var phpbb_filesystem **/ + /** @var \phpbb\filesystem **/ protected $phpbb_filesystem; /** @@ -29,7 +29,7 @@ class asset * * @param string $url URL */ - public function __construct($url, phpbb_filesystem $phpbb_filesystem) + public function __construct($url, \phpbb\filesystem $phpbb_filesystem) { $this->phpbb_filesystem = $phpbb_filesystem; diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 6e53db9ba2..4ea177074f 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -50,7 +50,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); $phpbb_filesystem = new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, @@ -102,7 +102,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); $phpbb_filesystem = new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 6481e09ead..ef5d167fc2 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -60,7 +60,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $this->db, $this->config, new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb_mock_request() ), dirname(__FILE__) . '/../../phpBB/', diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index d694d298fa..c4a32f53ab 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -115,7 +115,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case $db, $config, new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index b68bf8e36a..2b27a1bae2 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -42,7 +42,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->template = new \phpbb\template\twig\twig( new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $this->phpbb_root_path, @@ -71,7 +71,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->db, $this->config, new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $this->phpbb_root_path, diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php index 7fefcf2f90..5b9857ef2c 100644 --- a/tests/filesystem/clean_path_test.php +++ b/tests/filesystem/clean_path_test.php @@ -15,7 +15,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case { parent::setUp(); $this->filesystem = new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), dirname(__FILE__) . './../../phpBB/', diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php index ae59d4f709..ddc9e28bb2 100644 --- a/tests/filesystem/web_root_path_test.php +++ b/tests/filesystem/web_root_path_test.php @@ -18,8 +18,8 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case $this->set_phpbb_root_path(); - $this->filesystem = new phpbb_filesystem( - new phpbb_symfony_request( + $this->filesystem = new \phpbb\filesystem( + new \phpbb\symfony_request( new phpbb_mock_request() ), $this->phpbb_root_path, diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 82065fc37d..0c6b8447f1 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -15,7 +15,7 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager $this->php_ext = 'php'; $this->extensions = $extensions; $this->filesystem = new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $this->phpbb_root_path, diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index 41ece4972b..4155d5fd83 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -117,7 +117,7 @@ Zeta test event in all', dirname(__FILE__) . "/datasets/$dataset/" ); $phpbb_filesystem = new \phpbb\filesystem( - new \phpbb\symfony\request( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index c9b38ee40d..e9cbdec1d9 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -63,8 +63,8 @@ class phpbb_template_template_test_case extends phpbb_test_case $config = new \phpbb\config\config(array_merge($defaults, $new_config)); $this->user = new \phpbb\user; - $phpbb_filesystem = new phpbb_filesystem( - new phpbb_symfony_request( + $phpbb_filesystem = new \phpbb\filesystem( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 7f7cffdb82..232331d37c 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -18,8 +18,8 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat $defaults = $this->config_defaults(); $config = new \phpbb\config\config(array_merge($defaults, $new_config)); - $this->phpbb_filesystem = new phpbb_filesystem( - new phpbb_symfony_request( + $this->phpbb_filesystem = new \phpbb\filesystem( + new \phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index f8ec125481..f87b3538a1 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -204,7 +204,7 @@ class phpbb_functional_test_case extends phpbb_test_case $db, $config, new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb_mock_request() ), $phpbb_root_path, From 1d7f8f81935157867539d4c3991c5922afec8b55 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 18:10:58 +0200 Subject: [PATCH 051/102] [ticket/11700] Get functional tests running after develop merge PHPBB3-11700 --- phpBB/config/services.yml | 2 +- phpBB/phpbb/auth/provider/provider_interface.php | 2 +- phpBB/phpbb/session.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f029ec40a3..e33db0c2bc 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -258,7 +258,7 @@ services: class: phpbb\request\request symfony_request: - class: phpbb_symfony_request + class: phpbb\symfony_request arguments: - @request diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 31368a0286..1bb209c821 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -134,7 +134,7 @@ interface provider_interface * * @param array $data An array corresponding to * \phpbb\session::data - * @param boolean $new_session True for a new \session, false for no new + * @param boolean $new_session True for a new session, false for no new * session. */ public function logout($data, $new_session); diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 543369a3ab..2baf61043d 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -403,7 +403,7 @@ class session $session_expired = false; // Check whether the session is still valid if we have one - $method = basename(trim($config['auth_method'])); + $method = basename(trim($config['auth_method'])); $provider = $phpbb_container->get('auth.provider.' . $method); From 20b2d03e3b9c7ab0109cabf785076fa2f91e823d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 18:18:31 +0200 Subject: [PATCH 052/102] [ticket/11700] Namespace needed for mock object in web path test PHPBB3-11700 --- tests/filesystem/web_root_path_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php index ddc9e28bb2..c66b3cb69f 100644 --- a/tests/filesystem/web_root_path_test.php +++ b/tests/filesystem/web_root_path_test.php @@ -118,7 +118,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case */ public function test_update_web_root_path($input, $expected, $getPathInfo, $getRequestUri = null, $getScriptName = null) { - $symfony_request = $this->getMock("phpbb_symfony_request", array(), array( + $symfony_request = $this->getMock("\phpbb\symfony_request", array(), array( new phpbb_mock_request(), )); $symfony_request->expects($this->any()) From 1a92c04ee32e33a11410fc257bf49344ea4b1f20 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 18:30:19 +0200 Subject: [PATCH 053/102] [ticket/11700] Namespacif skipped filesystem instantiation in test PHPBB3-11700 --- tests/filesystem/web_root_path_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php index c66b3cb69f..e0f716cdae 100644 --- a/tests/filesystem/web_root_path_test.php +++ b/tests/filesystem/web_root_path_test.php @@ -131,7 +131,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case ->method('getScriptName') ->will($this->returnValue($getScriptName)); - $filesystem = new phpbb_filesystem( + $filesystem = new \phpbb\filesystem( $symfony_request, $this->phpbb_root_path, 'php' From 1adcbccc09dfb890a39939202b4e520a2458407a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 17 Sep 2013 18:56:47 +0200 Subject: [PATCH 054/102] [ticket/11700] Replace some leftover phpbb_filesystem uses PHPBB3-11700 --- phpBB/includes/functions.php | 2 +- phpBB/phpbb/template/twig/environment.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7bdd4d252e..e905375f4a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2425,7 +2425,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) } // Update the root path with the correct relative web path - if ($phpbb_filesystem instanceof phpbb_filesystem) + if ($phpbb_filesystem instanceof \phpbb\filesystem) { $url = $phpbb_filesystem->update_web_root_path($url); } diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index 132dae4762..e0ee23dcd9 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -25,7 +25,7 @@ class environment extends \Twig_Environment /** @var \phpbb\config\config */ protected $phpbb_config; - /** @var phpbb_filesystem */ + /** @var \phpbb\filesystem */ protected $phpbb_filesystem; /** @var string */ @@ -104,7 +104,7 @@ class environment extends \Twig_Environment /** * Get the phpbb_filesystem object * - * @return phpbb_filesystem + * @return \phpbb\filesystem */ public function get_filesystem() { From cc6f1e1775bc81a374a5c168968d48daf494a950 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 15:16:45 +0200 Subject: [PATCH 055/102] [ticket/11700] Add file headers to develop scripts for namespace PHPBB3-11700 --- phpBB/develop/namespacify.php | 15 +++++++++++++++ phpBB/develop/rename_interfaces.php | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/phpBB/develop/namespacify.php b/phpBB/develop/namespacify.php index 1995a01594..4e460eead8 100644 --- a/phpBB/develop/namespacify.php +++ b/phpBB/develop/namespacify.php @@ -1,4 +1,19 @@ Date: Thu, 19 Sep 2013 15:27:03 +0200 Subject: [PATCH 056/102] [ticket/11700] Fix some more incorrectly changed comments PHPBB3-11700 --- phpBB/phpbb/auth/provider/apache.php | 4 ++-- phpBB/phpbb/auth/provider/db.php | 2 +- phpBB/phpbb/groupposition/teampage.php | 2 +- phpBB/phpbb/notification/type/bookmark.php | 2 +- phpBB/phpbb/notification/type/post.php | 2 +- phpBB/phpbb/notification/type/quote.php | 2 +- phpBB/phpbb/notification/type/topic.php | 2 +- phpBB/phpbb/search/fulltext_mysql.php | 2 +- phpBB/phpbb/search/fulltext_native.php | 2 +- phpBB/phpbb/search/fulltext_postgres.php | 2 +- phpBB/phpbb/search/fulltext_sphinx.php | 2 +- phpBB/phpbb/search/sphinx/config_comment.php | 2 +- phpBB/phpbb/search/sphinx/config_section.php | 2 +- phpBB/phpbb/template/context.php | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index cd1330e7b0..5cbb63c4fc 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -204,8 +204,8 @@ class apache extends \phpbb\auth\provider\base * This function generates an array which can be passed to the user_add * function in order to create a user * - * @param string $username The username of the new \user. - * @param string $password The password of the new \user. + * @param string $username The username of the new user. + * @param string $password The password of the new user. * @return array Contains data that can be passed directly to * the user_add function. */ diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index a18fc258a4..4654e49fb5 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -241,7 +241,7 @@ class db extends \phpbb\auth\provider\base { $hash = phpbb_hash($password); - // Update the password in the users table to the new \format + // Update the password in the users table to the new format $sql = 'UPDATE ' . USERS_TABLE . " SET user_password = '" . $this->db->sql_escape($hash) . "', user_pass_convert = 0 diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index dc12768ddb..4e8228eb58 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -263,7 +263,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface } /** - * Adds a new \category + * Adds a new category * * @param string $category_name Name of the category to be added * @return bool True if the category was added successfully diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index 5b021eb71a..50ea7380af 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -114,7 +114,7 @@ class bookmark extends \phpbb\notification\type\post $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new \notification + // Do not create a new notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index 24ce0cc145..fe50e7f172 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -149,7 +149,7 @@ class post extends \phpbb\notification\type\base $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new \notification + // Do not create a new notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index b33766023e..56cfbc9364 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -133,7 +133,7 @@ class quote extends \phpbb\notification\type\post $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - // Do not create a new \notification + // Do not create a new notification unset($notify_users[$row['user_id']]); $notification = $this->notification_manager->get_item_type_class($this->get_type(), $row); diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index 9042a21017..8db02f610b 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) /** * Topic notifications class -* This class handles notifications for new \topics +* This class handles notifications for new topics * * @package notifications */ diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 2508ab6d9a..50d2d2577f 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -714,7 +714,7 @@ class fulltext_mysql extends \phpbb\search\base */ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) { - // Split old and new \post/subject to obtain array of words + // Split old and new post/subject to obtain array of words $split_text = $this->split_message($message); $split_title = ($subject) ? $this->split_message($subject) : array(); diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 50cf588a46..33326f2882 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -1224,7 +1224,7 @@ class fulltext_native extends \phpbb\search\base return; } - // Split old and new \post/subject to obtain array of 'words' + // Split old and new post/subject to obtain array of 'words' $split_text = $this->split_message($message); $split_title = $this->split_message($subject); diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index 383645920a..756034103e 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -744,7 +744,7 @@ class fulltext_postgres extends \phpbb\search\base */ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) { - // Split old and new \post/subject to obtain array of words + // Split old and new post/subject to obtain array of words $split_text = $this->split_message($message); $split_title = ($subject) ? $this->split_message($subject) : array(); diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index 81cb31e6e2..cb76d58f49 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -422,7 +422,7 @@ class fulltext_sphinx $this->sphinx->SetMatchMode(SPH_MATCH_ANY); } - // Keep quotes and new \lines + // Keep quotes and new lines $keywords = str_replace(array('"', "\n"), array('"', ' '), trim($keywords)); if (strlen($keywords) > 0) diff --git a/phpBB/phpbb/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php index 66000e4031..77a943377d 100644 --- a/phpBB/phpbb/search/sphinx/config_comment.php +++ b/phpBB/phpbb/search/sphinx/config_comment.php @@ -26,7 +26,7 @@ class config_comment private $exact_string; /** - * Create a new \comment + * Create a new comment * * @param string $exact_string The content of the comment including newlines, leading whitespace, etc. * diff --git a/phpBB/phpbb/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php index 7e6939576b..730abf011e 100644 --- a/phpBB/phpbb/search/sphinx/config_section.php +++ b/phpBB/phpbb/search/sphinx/config_section.php @@ -29,7 +29,7 @@ class config_section private $variables = array(); /** - * Construct a new \section + * Construct a new section * * @param string $name Name of the section * @param string $comment Comment that should be appended after the name in the diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index f978f82d33..24234c1e4a 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -225,7 +225,7 @@ class context * @param string $mode Mode to execute (valid modes are 'insert' and 'change') * * If insert, the vararray is inserted at the given position (position counting from zero). - * If change, the current block gets merged with the vararray (resulting in new \key/value pairs be added and existing keys be replaced by the new \value). + * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new \value). * * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars) From 15413f43e48b317fda276d0f9bb42d122caacf3c Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 15:45:35 +0200 Subject: [PATCH 057/102] [ticket/11700] Correctly handle avatar drivers with namespaces PHPBB3-11700 --- phpBB/phpbb/avatar/manager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 0408467064..11f401d9ed 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -222,7 +222,7 @@ class manager */ static public function clean_driver_name($name) { - return str_replace('_', '.', $name); + return str_replace(array('\\', '_'), '.', $name); } /** @@ -235,7 +235,7 @@ class manager */ static public function prepare_driver_name($name) { - return str_replace(array('\\', '.'), '_', $name); + return str_replace('.', '_', $name); } /** @@ -277,7 +277,7 @@ class manager */ public function get_driver_config_name($driver) { - return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($driver)); + return preg_replace('#^phpbb\\avatar\\driver\\\\#', '', get_class($driver)); } /** From 733020f5f91435f430af2d94843258cf37ecc749 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 16:19:05 +0200 Subject: [PATCH 058/102] [ticket/11700] Correct ucp_auth_link request interface references PHPBB3-11700 --- phpBB/includes/ucp/ucp_auth_link.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php index 5a5653e0b2..b86c4c8d52 100644 --- a/phpBB/includes/ucp/ucp_auth_link.php +++ b/phpBB/includes/ucp/ucp_auth_link.php @@ -46,7 +46,7 @@ class ucp_auth_link $s_hidden_fields = array(); add_form_key('ucp_auth_link'); - $submit = $request->variable('submit', false, false, phpbb_request_interface::POST); + $submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST); // This path is only for primary actions if (!sizeof($error) && $submit) @@ -59,7 +59,7 @@ class ucp_auth_link if (!sizeof($error)) { // Any post data could be necessary for auth (un)linking - $link_data = $request->get_super_global(phpbb_request_interface::POST); + $link_data = $request->get_super_global(\phpbb\request\request_interface::POST); // The current user_id is also necessary $link_data['user_id'] = $user->data['user_id']; @@ -67,7 +67,7 @@ class ucp_auth_link // Tell the provider that the method is auth_link not login_link $link_data['link_method'] = 'auth_link'; - if ($request->variable('link', 0, false, phpbb_request_interface::POST)) + if ($request->variable('link', 0, false, \phpbb\request\request_interface::POST)) { $error[] = $auth_provider->link_account($link_data); } From 40ea7422b12b618cf7eecc01868b462eaed462a9 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 16:21:38 +0200 Subject: [PATCH 059/102] [ticket/11700] Correctly load avatar templates for namespaced drivers PHPBB3-11700 --- phpBB/phpbb/avatar/driver/driver.php | 2 +- phpBB/phpbb/avatar/manager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index d688e7d70c..0c54951cbd 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -114,7 +114,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface */ public function get_template_name() { - $driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this)); + $driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this)); $template = "ucp_avatar_options_$driver.html"; return $template; diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 11f401d9ed..c28380a401 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -277,7 +277,7 @@ class manager */ public function get_driver_config_name($driver) { - return preg_replace('#^phpbb\\avatar\\driver\\\\#', '', get_class($driver)); + return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($driver)); } /** From e998363468b4cdcfd4414f1511ffee768f7d0d37 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 17:01:16 +0200 Subject: [PATCH 060/102] [ticket/11700] Fix redirection in common.php until fs dependency on request is removed PHPBB3-11700 --- phpBB/common.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/common.php b/phpBB/common.php index c16751d1ae..80375f7a9c 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -47,6 +47,12 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); + require($phpbb_root_path . 'phpbb/symfony_request.' . $phpEx); + require($phpbb_root_path . 'phpbb/request/deactivated_super_global.' . $phpEx); + require($phpbb_root_path . 'phpbb/request/type_cast_helper_interface.' . $phpEx); + require($phpbb_root_path . 'phpbb/request/type_cast_helper.' . $phpEx); + require($phpbb_root_path . 'phpbb/request/request_interface.' . $phpEx); + require($phpbb_root_path . 'phpbb/request/request.' . $phpEx); $phpbb_filesystem = new phpbb\filesystem( new phpbb\symfony_request( new phpbb\request\request() From f205c4fad4c3a82cc4a47beb7f9a8025669a3acb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 17:03:05 +0200 Subject: [PATCH 061/102] [ticket/11700] Change search backend db entry to namespaces PHPBB3-11700 --- phpBB/install/schemas/schema_data.sql | 2 +- .../db/migration/data/v310/namespaces.php | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/db/migration/data/v310/namespaces.php diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 68f3c32f72..b5dea4836a 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -237,7 +237,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size' INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb_search_fulltext_native'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb\\search\\fulltext_native'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_results', '1800'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1'); diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php new file mode 100644 index 0000000000..6da015d0da --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php @@ -0,0 +1,30 @@ +config['search_type'])), + array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))), + )), + ); + } +} From fe36375a36ec4f816eb07b41630b6c9fa7ff12c8 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 18:29:08 +0200 Subject: [PATCH 062/102] [ticket/11700] Fix extension loading with namespaces class loader now expects all classes to be prefixed with a backslash when resolving paths PHPBB3-11700 --- phpBB/phpbb/class_loader.php | 11 +++++++-- phpBB/phpbb/controller/helper.php | 2 +- phpBB/phpbb/controller/resolver.php | 8 +++---- .../event/kernel_exception_subscriber.php | 4 ++-- .../phpbb/event/kernel_request_subscriber.php | 6 ++--- .../event/kernel_terminate_subscriber.php | 2 +- tests/acp_board/auth_provider/valid.php | 4 +++- tests/bootstrap.php | 2 +- tests/class_loader/class_loader_test.php | 24 +++++++++---------- tests/controller/controller_test.php | 8 +++---- tests/controller/ext/foo/config/services.yml | 2 +- tests/controller/ext/foo/controller.php | 4 +++- tests/extension/ext/bar/my/hidden_class.php | 4 +++- tests/extension/ext/foo/acp/fail_info.php | 2 +- .../functional/extension_controller_test.php | 2 +- tests/functional/extension_module_test.php | 4 ++-- .../fixtures/ext/foo/bar/acp/main_info.php | 6 +++-- .../fixtures/ext/foo/bar/acp/main_module.php | 4 +++- .../fixtures/ext/foo/bar/config/services.yml | 2 +- .../ext/foo/bar/controller/controller.php | 5 +++- .../fixtures/ext/foo/bar/event/permission.php | 4 +++- .../fixtures/ext/foo/bar/event/user_setup.php | 4 +++- tests/functional/fixtures/ext/foo/bar/ext.php | 4 +++- 23 files changed, 72 insertions(+), 46 deletions(-) diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index bcd05e5853..769f28b4f1 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -55,7 +55,12 @@ class class_loader * @param \phpbb\cache\driver\driver_interface $cache An implementation of the phpBB cache interface. */ public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null) - { + { + if ($namespace[0] !== '\\') + { + $namespace = '\\' . $namespace; + } + $this->namespace = $namespace; $this->path = $path; $this->php_ext = $php_ext; @@ -105,7 +110,8 @@ class class_loader * Resolves a phpBB class name to a relative path which can be included. * * @param string $class The class name to resolve, must be in the - * namespace the loader was constructed with + * namespace the loader was constructed with. + * Has to begin with \ * @return string|bool A relative path to the file containing the * class or false if looking it up failed. */ @@ -144,6 +150,7 @@ class class_loader */ public function load_class($class) { + $class = '\\' . $class; if (substr($class, 0, strlen($this->namespace)) === $this->namespace) { $path = $this->resolve_path($class); diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 6e45374643..07483a91eb 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -91,7 +91,7 @@ class helper page_footer(true, false, false); - return new \Response($this->template->assign_display('body'), $status_code); + return new Response($this->template->assign_display('body'), $status_code); } /** diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index dad2ebd06b..1cc8981105 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -95,12 +95,12 @@ class resolver implements ControllerResolverInterface * the style paths for the extension (the ext author can change them * if necessary). */ - $controller_dir = explode('_', get_class($controller_object)); + $controller_dir = explode('\\', get_class($controller_object)); - // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (!is_null($this->template) && isset($controller_dir[3]) && $controller_dir[1] === 'ext') + // 0 vendor, 1 extension name, ... + if (!is_null($this->template) && isset($controller_dir[1])) { - $controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles'; + $controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles'; if (is_dir($controller_style_dir)) { diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index 7199f47ae8..09103680e8 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -55,7 +55,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface * @param GetResponseForExceptionEvent $event * @return null */ - public function on_kernel_exception(\GetResponseForExceptionEvent $event) + public function on_kernel_exception(GetResponseForExceptionEvent $event) { page_header($this->user->lang('INFORMATION')); @@ -74,7 +74,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface $status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500; - $response = new \Response($this->template->assign_display('body'), $status_code); + $response = new Response($this->template->assign_display('body'), $status_code); $event->setResponse($response); } diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php index 9691be7ca5..a629dd8440 100644 --- a/phpBB/phpbb/event/kernel_request_subscriber.php +++ b/phpBB/phpbb/event/kernel_request_subscriber.php @@ -65,14 +65,14 @@ class kernel_request_subscriber implements EventSubscriberInterface * @param GetResponseEvent $event * @return null */ - public function on_kernel_request(\GetResponseEvent $event) + public function on_kernel_request(GetResponseEvent $event) { $request = $event->getRequest(); - $context = new \RequestContext(); + $context = new RequestContext(); $context->fromRequest($request); $matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext); - $router_listener = new \RouterListener($matcher, $context); + $router_listener = new RouterListener($matcher, $context); $router_listener->onKernelRequest($event); } diff --git a/phpBB/phpbb/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php index aea9d7cc44..de441da102 100644 --- a/phpBB/phpbb/event/kernel_terminate_subscriber.php +++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php @@ -31,7 +31,7 @@ class kernel_terminate_subscriber implements EventSubscriberInterface * @param PostResponseEvent $event * @return null */ - public function on_kernel_terminate(\PostResponseEvent $event) + public function on_kernel_terminate(PostResponseEvent $event) { exit_handler(); } diff --git a/tests/acp_board/auth_provider/valid.php b/tests/acp_board/auth_provider/valid.php index cfc3c24833..13ec1e3250 100644 --- a/tests/acp_board/auth_provider/valid.php +++ b/tests/acp_board/auth_provider/valid.php @@ -7,7 +7,9 @@ * */ -class phpbb_auth_provider_acp_board_valid extends \phpbb\auth\provider\base +namespace phpbb\auth\provider\acp; + +class board_valid extends \phpbb\auth\provider\base { public function login($username, $password) { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 43efecce3b..afb586435c 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -18,7 +18,7 @@ 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 = new \phpbb\class_loader('\\', $phpbb_root_path . 'ext/', "php"); $phpbb_class_loader_ext->register(); $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php"); $phpbb_class_loader->register(); diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index 255b634bd6..6e551f658a 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -36,22 +36,22 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase $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\\dir2'), + $class_loader->resolve_path('\\phpbb\\dir2\\dir2'), 'Class with name of dir within dir' ); } @@ -59,8 +59,8 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase public function test_resolve_cached() { $cache_map = array( - 'class_loader_phpbb__' => array('phpbb\\a\\cached_name' => 'a/cached_name'), - 'class_loader___' => array('phpbb\\ext\\foo' => 'foo'), + 'class_loader___phpbb__' => array('\\phpbb\\a\\cached_name' => 'a/cached_name'), + 'class_loader___' => array('\\phpbb\\ext\\foo' => 'foo'), ); $cache = new phpbb_mock_cache($cache_map); @@ -72,26 +72,26 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase $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/controller/controller_test.php b/tests/controller/controller_test.php index 9445ea53d4..10fced05a2 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -53,11 +53,11 @@ class phpbb_controller_controller_test extends phpbb_test_case // Autoloading classes within the tests folder does not work // so I'll include them manually. - if (!class_exists('phpbb_ext_foo_controller')) + if (!class_exists('foo\\controller')) { include(__DIR__.'/ext/foo/controller.php'); } - if (!class_exists('phpbb_controller_foo')) + if (!class_exists('phpbb\\controller\\foo')) { include(__DIR__.'/phpbb/controller/foo.php'); } @@ -66,11 +66,11 @@ class phpbb_controller_controller_test extends phpbb_test_case $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); - $this->assertEquals($resolver->getController($symfony_request), array(new phpbb_ext_foo_controller, 'handle')); + $this->assertEquals($resolver->getController($symfony_request), array(new foo\controller, 'handle')); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'core_foo.controller:bar'); - $this->assertEquals($resolver->getController($symfony_request), array(new phpbb_controller_foo, 'bar')); + $this->assertEquals($resolver->getController($symfony_request), array(new phpbb\controller\foo, 'bar')); } } diff --git a/tests/controller/ext/foo/config/services.yml b/tests/controller/ext/foo/config/services.yml index ce0e18c610..9ed67d5bc2 100644 --- a/tests/controller/ext/foo/config/services.yml +++ b/tests/controller/ext/foo/config/services.yml @@ -1,3 +1,3 @@ services: foo.controller: - class: phpbb_ext_foo_controller + class: foo\controller diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/foo/controller.php index cfc5c20622..ce2233b3c9 100644 --- a/tests/controller/ext/foo/controller.php +++ b/tests/controller/ext/foo/controller.php @@ -1,8 +1,10 @@ 'phpbb_ext_foo_acp_fail_module', + 'filename' => 'foo\acp\fail_module', 'title' => 'Foobar', 'version' => '3.1.0-dev', 'modes' => array( diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index dc6d9c0f65..41bd48c204 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -78,7 +78,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c $this->phpbb_extension_manager->enable('foo/bar'); $crawler = self::request('GET', 'app.php/foo/baz', array(), false); $this->assert_response_html(500); - $this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text()); + $this->assertContains('Missing value for argument #1: test in class foo\bar\controller\controller:baz', $crawler->filter('body')->text()); $this->phpbb_extension_manager->purge('foo/bar'); } diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index c31a892ce9..0c9e0b1654 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -69,7 +69,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case $modules->update_module_data($parent_data, true); $module_data = array( - 'module_basename' => 'phpbb_ext_foo_bar_acp_main_module', + 'module_basename' => 'foo\\bar\\acp\\main_module', 'module_enabled' => 1, 'module_display' => 1, 'parent_id' => $parent_data['module_id'], @@ -90,7 +90,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case { $this->login(); $this->admin_login(); - $crawler = self::request('GET', 'adm/index.php?i=phpbb_ext_foo_bar_acp_main_module&mode=mode&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=foo\\bar\\acp\\main_module&mode=mode&sid=' . $this->sid); $this->assertContains("Bertie rulez!", $crawler->filter('#main')->text()); $this->phpbb_extension_manager->purge('foo/bar'); } diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php index 21e38b09b5..2ad6d08503 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php @@ -8,6 +8,8 @@ * */ +namespace foo\bar\acp; + /** * @ignore */ @@ -16,12 +18,12 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_ext_foo_bar_acp_main_info +class main_info { function module() { return array( - 'filename' => 'phpbb_ext_foo_bar_acp_main_module', + 'filename' => 'foo\bar\acp\main_module', 'title' => 'ACP_FOOBAR_TITLE', 'version' => '1.0.0', 'modes' => array( diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php index c4ab69fb38..c59b3c6820 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -8,6 +8,8 @@ * */ +namespace foo\bar\acp; + /** * @ignore */ @@ -16,7 +18,7 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_ext_foo_bar_acp_main_module +class main_module { var $u_action; diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml index 33ced55af9..3bca4c6567 100644 --- a/tests/functional/fixtures/ext/foo/bar/config/services.yml +++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml @@ -1,6 +1,6 @@ services: foo_bar.controller: - class: phpbb_ext_foo_bar_controller + class: foo\bar\controller\controller arguments: - @controller.helper - @template diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 41b2be350b..259d548299 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -1,7 +1,10 @@ Date: Thu, 19 Sep 2013 18:50:08 +0200 Subject: [PATCH 063/102] [ticket/11700] Get unit tests to run again with namespaces PHPBB3-11700 --- tests/acp_board/auth_provider/invalid.php | 4 +++- tests/acp_board/select_auth_method_test.php | 4 ++-- tests/controller/config/services.yml | 2 +- tests/controller/phpbb/controller/foo.php | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/acp_board/auth_provider/invalid.php b/tests/acp_board/auth_provider/invalid.php index c12851afe6..acce3b7e2d 100644 --- a/tests/acp_board/auth_provider/invalid.php +++ b/tests/acp_board/auth_provider/invalid.php @@ -7,7 +7,9 @@ * */ -class phpbb_auth_provider_acp_board_invalid +namespace phpbb\auth\provider\acp; + +class board_invalid { } diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php index 91aa5d1232..b943554564 100644 --- a/tests/acp_board/select_auth_method_test.php +++ b/tests/acp_board/select_auth_method_test.php @@ -31,8 +31,8 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('auth.provider_collection', array( - 'auth.provider.acp_board_valid' => new phpbb_auth_provider_acp_board_valid, - 'auth.provider.acp_board_invalid' => new phpbb_auth_provider_acp_board_invalid, + 'auth.provider.acp_board_valid' => new phpbb\auth\provider\acp\board_valid, + 'auth.provider.acp_board_invalid' => new phpbb\auth\provider\acp\board_invalid, )); $this->acp_board = new acp_board(); diff --git a/tests/controller/config/services.yml b/tests/controller/config/services.yml index f1bd047489..e4412af3d7 100644 --- a/tests/controller/config/services.yml +++ b/tests/controller/config/services.yml @@ -1,3 +1,3 @@ services: core_foo.controller: - class: phpbb_controller_foo + class: phpbb\controller\foo diff --git a/tests/controller/phpbb/controller/foo.php b/tests/controller/phpbb/controller/foo.php index 04576e16c4..98669f428f 100644 --- a/tests/controller/phpbb/controller/foo.php +++ b/tests/controller/phpbb/controller/foo.php @@ -1,8 +1,10 @@ Date: Thu, 19 Sep 2013 12:40:53 -0500 Subject: [PATCH 064/102] [ticket/11816] Fix multiple parenthesis as well before $VARs in templates PHPBB3-11816 --- phpBB/phpbb/template/twig/lexer.php | 8 ++++---- tests/template/template_test.php | 2 +- tests/template/templates/define.html | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php index 16a693cd7c..ea563d58e2 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -229,18 +229,18 @@ class phpbb_template_twig_lexer extends Twig_Lexer { $inner = $matches[2]; // Replace $TEST with definition.TEST - $inner = preg_replace('#(\s\(?!?)\$([a-zA-Z_0-9]+)#', '$1definition.$2', $inner); + $inner = preg_replace('#(\s\(*!?)\$([a-zA-Z_0-9]+)#', '$1definition.$2', $inner); // Replace .foo with loops.foo|length - $inner = preg_replace('#(\s\(?!?)\.([a-zA-Z_0-9]+)([^a-zA-Z_0-9\.])#', '$1loops.$2|length$3', $inner); + $inner = preg_replace('#(\s\(*!?)\.([a-zA-Z_0-9]+)([^a-zA-Z_0-9\.])#', '$1loops.$2|length$3', $inner); // Replace .foo.bar with foo.bar|length - $inner = preg_replace('#(\s\(?!?)\.([a-zA-Z_0-9\.]+)([^a-zA-Z_0-9\.])#', '$1$2|length$3', $inner); + $inner = preg_replace('#(\s\(*!?)\.([a-zA-Z_0-9\.]+)([^a-zA-Z_0-9\.])#', '$1$2|length$3', $inner); return ""; }; - return preg_replace_callback('##', $callback, $code); + return preg_replace_callback('##', $callback, $code); } /** diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 2cca20f4c2..39eb08ab79 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -158,7 +158,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case array(), array('test_loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())), array(), - "xyz\nabc\n\$VALUE == 'abc'\n(\$VALUE == 'abc')\n!\$DOESNT_EXIST\n(!\$DOESNT_EXIST)\nabc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?[]|foobar|", + "xyz\nabc\n\$VALUE == 'abc'\n(\$VALUE == 'abc')\n((\$VALUE == 'abc'))\n!\$DOESNT_EXIST\n(!\$DOESNT_EXIST)\nabc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?[]|foobar|", ), array( 'define_advanced.html', diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html index bc20c02ed1..e7ce7f7def 100644 --- a/tests/template/templates/define.html +++ b/tests/template/templates/define.html @@ -10,6 +10,9 @@ $VALUE == 'abc' ($VALUE == 'abc') + +(($VALUE == 'abc')) + !$DOESNT_EXIST From 6b71284681483534a0c5511b689af1e8a0c9cdc9 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 19:53:57 +0200 Subject: [PATCH 065/102] [ticket/11700] Correctly load templates for extensions PHPBB3-11700 --- phpBB/includes/functions_module.php | 12 ++++++------ tests/functional/extension_module_test.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 80477684a8..b33f3d6866 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -499,12 +499,12 @@ class p_master * the style paths for the extension (the ext author can change them * if necessary). */ - $module_dir = explode('_', get_class($this->module)); + $module_dir = explode('\\', get_class($this->module)); - // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (isset($module_dir[3]) && $module_dir[1] === 'ext') + // 0 vendor, 1 extension name, ... + if (isset($module_dir[1])) { - $module_style_dir = $phpbb_root_path . 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/adm/style'; + $module_style_dir = $phpbb_root_path . 'ext/' . $module_dir[0] . '/' . $module_dir[1] . '/adm/style'; if (is_dir($module_style_dir)) { @@ -973,7 +973,7 @@ class p_master */ protected function get_short_name($basename) { - if (substr($basename, 0, 6) === 'phpbb_') + if (substr($basename, 0, 6) === 'phpbb\\' || strpos($basename, '\\') !== false) { return $basename; } @@ -990,6 +990,6 @@ class p_master */ protected function is_full_class($basename) { - return (preg_match('/^(phpbb|ucp|mcp|acp)_/', $basename)); + return (strpos($basename, '\\') !== false || preg_match('/^(ucp|mcp|acp)_/', $basename)); } } diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index 0c9e0b1654..090cd38daf 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -90,7 +90,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case { $this->login(); $this->admin_login(); - $crawler = self::request('GET', 'adm/index.php?i=foo\\bar\\acp\\main_module&mode=mode&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=foo%5cbar%5cacp%5cmain_module&mode=mode&sid=' . $this->sid); $this->assertContains("Bertie rulez!", $crawler->filter('#main')->text()); $this->phpbb_extension_manager->purge('foo/bar'); } From 1f9f96926f9231efb39952d86e6f6ad8c7e71fb5 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 19 Sep 2013 20:31:00 +0200 Subject: [PATCH 066/102] [ticket/11700] No need to escape \ in SQL string PHPBB3-11700 --- phpBB/install/schemas/schema_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b5dea4836a..70138f35fd 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -237,7 +237,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size' INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb\\search\\fulltext_native'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb\search\fulltext_native'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_results', '1800'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1'); From ed55626165ad402507864ab21bb2ee64a0d70cbd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Sep 2013 10:01:44 +0200 Subject: [PATCH 067/102] [ticket/11700] Fix unresolvable condition in migration PHPBB3-11700 --- phpBB/phpbb/db/migration/data/v310/style_update_p2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index 6c3b0de2a1..202a8409fb 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -18,7 +18,7 @@ class style_update_p2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\style_update_p1'); + return array('\phpbb\db\migration\data\v310\style_update_p1'); } public function update_schema() From 625411587d5ef1e6a01383e150293b461c2331a5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Sep 2013 11:25:58 +0200 Subject: [PATCH 068/102] [ticket/11700] Escape Backslashes from schema_data.sql for MySQLi PHPBB3-11700 --- phpBB/install/install_install.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 107da0f90a..c273660d08 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1179,7 +1179,7 @@ class install_install extends module // Ok tables have been built, let's fill in the basic information $sql_query = file_get_contents('schemas/schema_data.sql'); - // Deal with any special comments + // Deal with any special comments and characters switch ($data['dbms']) { case 'mssql': @@ -1191,6 +1191,11 @@ class install_install extends module case 'postgres': $sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query); break; + + case 'mysql': + case 'mysqli': + $sql_query = str_replace('\\', '\\\\', $sql_query); + break; } // Change prefix From 86147b46a4bd2aca54300ff4a14b8d524dcb5534 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 25 Sep 2013 13:15:34 +0200 Subject: [PATCH 069/102] [ticket/11700] Return class names with leading backslash in finder PHPBB3-11700 --- phpBB/phpbb/extension/finder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index d3e73bc387..ffcb2c830e 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -286,7 +286,7 @@ class finder else { $class = preg_replace('#^ext/#', '', $class); - $classes[] = str_replace('/', '\\', $class); + $classes[] = '\\' . str_replace('/', '\\', $class); } } return $classes; From c654e9d24751f803e779ed3ce62b45734ca6b091 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Sep 2013 13:35:08 +0200 Subject: [PATCH 070/102] [ticket/11864] Do not call exit after display_progress_bar in acp_forums The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864 --- phpBB/includes/acp/acp_forums.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 50e12a0f15..dc2e6b75fb 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -56,7 +56,6 @@ class acp_forums $total = request_var('total', 0); $this->display_progress_bar($start, $total); - exit; break; case 'delete': From 3a478cb3e211d8663e6071377ce7d8397619be2f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 25 Sep 2013 14:36:50 +0200 Subject: [PATCH 071/102] [ticket/11700] Use spaces, not tabs PHPBB3-11700 --- phpBB/phpbb/extension/finder.php | 4 ++-- tests/extension/finder_test.php | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index ffcb2c830e..e787919588 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -284,8 +284,8 @@ class finder $classes[] = 'phpbb_' . str_replace('/', '_', $class); } else - { - $class = preg_replace('#^ext/#', '', $class); + { + $class = preg_replace('#^ext/#', '', $class); $classes[] = '\\' . str_replace('/', '\\', $class); } } diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index d6f9e93478..8e6e71aaf8 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -43,10 +43,10 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'bar\my\hidden_class', - 'foo\a_class', - 'foo\b_class', - 'phpbb\default\implementation', + '\bar\my\hidden_class', + '\foo\a_class', + '\foo\b_class', + '\phpbb\default\implementation', ), $classes ); @@ -67,7 +67,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_prefix_get_directories() { $dirs = $this->finder - ->prefix('ty') + ->prefix('ty') ->get_directories(); sort($dirs); @@ -88,8 +88,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'bar\my\hidden_class', - 'phpbb\default\implementation', + '\bar\my\hidden_class', + '\phpbb\default\implementation', ), $classes ); @@ -105,9 +105,9 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', - 'foo\type\alternative', - 'phpbb\default\implementation', + '\foo\sub\type\alternative', + '\foo\type\alternative', + '\phpbb\default\implementation', ), $classes ); @@ -122,7 +122,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\type\alternative', + '\foo\type\alternative', ), $classes ); @@ -137,7 +137,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', + '\foo\sub\type\alternative', ), $classes ); @@ -152,7 +152,7 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\sub\type\alternative', + '\foo\sub\type\alternative', ), $classes ); @@ -168,8 +168,8 @@ class phpbb_extension_finder_test extends phpbb_test_case sort($classes); $this->assertEquals( array( - 'foo\type\alternative', - 'foo\type\dummy\empty', + '\foo\type\alternative', + '\foo\type\dummy\empty', ), $classes ); From 9373c0db9683dc0659545a28f904cc34c13d6be8 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 25 Sep 2013 14:40:12 +0200 Subject: [PATCH 072/102] [ticket/11700] Only replace phpbb_search in strings that match PHPBB3-11700 --- phpBB/phpbb/db/migration/data/v310/namespaces.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php index 6da015d0da..9b182f88b8 100644 --- a/phpBB/phpbb/db/migration/data/v310/namespaces.php +++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php @@ -22,7 +22,7 @@ class namespaces extends \phpbb\db\migration\migration { return array( array('if', array( - (preg_match('#^phpbb_#', $this->config['search_type'])), + (preg_match('#^phpbb_search_#', $this->config['search_type'])), array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))), )), ); From 2c92123ca59d044c33de3d8e04b02451b008670d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Sep 2013 15:59:50 +0200 Subject: [PATCH 073/102] [ticket/11862] Correct var names in user_delete() events due to prune-users The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862 --- phpBB/includes/functions_user.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 4fcce67801..383a0b9d97 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -388,12 +388,13 @@ function user_delete($mode, $user_ids, $retain_username = true) * Event before a user is deleted * * @event core.delete_user_before - * @var string mode Mode of deletion (retain/delete posts) - * @var int user_id ID of the deleted user - * @var mixed post_username Guest username that is being used or false + * @var string mode Mode of deletion (retain/delete posts) + * @var int user_ids IDs of the deleted user + * @var mixed retain_username True if username should be retained + * or false if not * @since 3.1-A1 */ - $vars = array('mode', 'user_id', 'post_username'); + $vars = array('mode', 'user_ids', 'retain_username'); extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars))); // Before we begin, we will remove the reports the user issued. @@ -616,12 +617,13 @@ function user_delete($mode, $user_ids, $retain_username = true) * Event after a user is deleted * * @event core.delete_user_after - * @var string mode Mode of deletion (retain/delete posts) - * @var int user_id ID of the deleted user - * @var mixed post_username Guest username that is being used or false + * @var string mode Mode of deletion (retain/delete posts) + * @var int user_id IDs of the deleted user + * @var mixed retain_username True if username should be retained + * or false if not * @since 3.1-A1 */ - $vars = array('mode', 'user_id', 'post_username'); + $vars = array('mode', 'user_ids', 'retain_username'); extract($phpbb_dispatcher->trigger_event('core.delete_user_after', compact($vars))); // Reset newest user info if appropriate From cbc458e4768107e30688224e173c26493b971a41 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 25 Sep 2013 16:09:14 +0200 Subject: [PATCH 074/102] [ticket/11700] Update migrations table for namespaces PHPBB3-11700 --- .../db/migration/data/v310/namespaces.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php index 9b182f88b8..3dd65e09e4 100644 --- a/phpBB/phpbb/db/migration/data/v310/namespaces.php +++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php @@ -25,6 +25,61 @@ class namespaces extends \phpbb\db\migration\migration (preg_match('#^phpbb_search_#', $this->config['search_type'])), array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))), )), + array('custom', array(array($this, 'update_migrations'))), ); } + + public function update_migrations() + { + $table = $this->table_prefix . 'migrations'; + + $sql = 'SELECT * + FROM migrations'; + $result = $this->db->sql_query($sql); + + while ($row = $this->db->sql_fetchrow($result)) + { + $migration_name = $row['migration_name']; + + $row['migration_name'] = $this->namespacify($row['migration_name']); + + $depends_on = ($row['migration_depends_on']) ? unserialize($row['migration_depends_on']) : false; + + if ($depends_on) + { + $depends_on_new = array(); + + foreach ($depends_on as $migration) + { + $depends_on_new[] = $this->namespacify($migration); + } + + $depends_on = serialize($depends_on_new); + $row['migration_depends_on'] = $depends_on; + } + + $sql_update = $this->db->sql_build_array('UPDATE', $row); + + $sql = 'UPDATE ' . MODULES_TABLE . ' + SET ' . $sql_update . ' + WHERE module_id = ' . $migration_name; + $this->sql_query($sql); + } + } + + public function namespacify($migration_name) + { + $parts = explode('_', $migration_name); + + $namespace = ''; + $class = ''; + + while (count($parts) > 1 && (!$class || !class_exists($class))) + { + $namespace = $namespace . '\\' . array_shift($parts); + $class = $namespace . '\\' . implode('_', $parts); + } + + return $class; + } } From 645bd127dd53300b7877b779226ac53a4891620c Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 25 Sep 2013 16:20:26 +0200 Subject: [PATCH 075/102] [ticket/11700] Undo migrations migration, as not an issue for new installs PHPBB3-11700 --- .../db/migration/data/v310/namespaces.php | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php index 3dd65e09e4..9b182f88b8 100644 --- a/phpBB/phpbb/db/migration/data/v310/namespaces.php +++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php @@ -25,61 +25,6 @@ class namespaces extends \phpbb\db\migration\migration (preg_match('#^phpbb_search_#', $this->config['search_type'])), array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))), )), - array('custom', array(array($this, 'update_migrations'))), ); } - - public function update_migrations() - { - $table = $this->table_prefix . 'migrations'; - - $sql = 'SELECT * - FROM migrations'; - $result = $this->db->sql_query($sql); - - while ($row = $this->db->sql_fetchrow($result)) - { - $migration_name = $row['migration_name']; - - $row['migration_name'] = $this->namespacify($row['migration_name']); - - $depends_on = ($row['migration_depends_on']) ? unserialize($row['migration_depends_on']) : false; - - if ($depends_on) - { - $depends_on_new = array(); - - foreach ($depends_on as $migration) - { - $depends_on_new[] = $this->namespacify($migration); - } - - $depends_on = serialize($depends_on_new); - $row['migration_depends_on'] = $depends_on; - } - - $sql_update = $this->db->sql_build_array('UPDATE', $row); - - $sql = 'UPDATE ' . MODULES_TABLE . ' - SET ' . $sql_update . ' - WHERE module_id = ' . $migration_name; - $this->sql_query($sql); - } - } - - public function namespacify($migration_name) - { - $parts = explode('_', $migration_name); - - $namespace = ''; - $class = ''; - - while (count($parts) > 1 && (!$class || !class_exists($class))) - { - $namespace = $namespace . '\\' . array_shift($parts); - $class = $namespace . '\\' . implode('_', $parts); - } - - return $class; - } } From 0abb4a5ad3a2d5de9215473f07693b5610ee8945 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Aug 2013 14:29:06 +0200 Subject: [PATCH 076/102] [ticket/11805] Allow specifying the page in the route for pagination Instead of "app.php?controller=news&start=10" authors might prefer having the pagination in the route. So the sample link from above would be the same as "app.php?controller=news/page/2". With this patch that is easily possible. What you do is, you specify the $base_url and $start_name as follows: $base_url = $controller_helper->url('news/page/%d'); $start_name = '/page/%d'; // Part of the url that will be removed // for page 1 Now this will generate: "news" for start = 0 "news/page/1" will work aswell, but will not be created "news/page/2" for start = 10 PHPBB3-11805 --- phpBB/includes/functions.php | 51 +++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e905375f4a..d786119671 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2212,8 +2212,12 @@ function tracking_unserialize($string, $max_depth = 3) * * @param object $template the template object * @param string $base_url is url prepended to all links generated within the function +* If you use page numbers inside your controller route, base_url should contains a placeholder (%d) +* for the page. Also be sure to specify the pagination path information into the start_name argument * @param string $block_var_name is the name assigned to the pagination data block within the template (example: ) * @param string $start_name is the name of the parameter containing the first item of the given page (example: start=20) +* If you use page numbers inside your controller route, start name should be the string +* that should be removed for the first page (example: /page/%d) * @param int $num_items the total number of items, posts, etc., used to determine the number of pages to produce * @param int $per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce * @param int $start_item the item which should be considered currently active, used to determine the page we're on @@ -2234,6 +2238,7 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $on_page = floor($start_item / $per_page) + 1; $url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&'); + $page_in_route = strpos($start_name, '%d') !== false; if ($reverse_count) { @@ -2263,9 +2268,18 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam if ($on_page != 1) { + if ($page_in_route) + { + $page_url = ($on_page - 2 > 0) ? sprintf($base_url, (int) $on_page - 2) : str_replace($start_name, '', $base_url); + } + else + { + $page_url = $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page); + } + $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page), + 'PAGE_URL' => $page_url, 'S_IS_CURRENT' => false, 'S_IS_PREV' => true, 'S_IS_NEXT' => false, @@ -2279,7 +2293,14 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $at_page = 1; do { - $page_url = $base_url . (($at_page == 1) ? '' : $url_delim . $start_name . '=' . (($at_page - 1) * $per_page)); + if ($page_in_route) + { + $page_url = ($at_page != 1) ? sprintf($base_url, $at_page) : str_replace($start_name, '', $base_url); + } + else + { + $page_url = $base_url . (($at_page == 1) ? '' : $url_delim . $start_name . '=' . (($at_page - 1) * $per_page)); + } // We decide whether to display the ellipsis during the loop. The ellipsis is always // displayed as either the second or penultimate item in the list. So are we at either @@ -2317,9 +2338,18 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam if ($on_page != $total_pages) { + if ($page_in_route) + { + $page_url = sprintf($base_url, $on_page); + } + else + { + $page_url = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); + } + $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page), + 'PAGE_URL' => $page_url, 'S_IS_CURRENT' => false, 'S_IS_PREV' => false, 'S_IS_NEXT' => true, @@ -2344,13 +2374,22 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam } $tpl_prefix = ($tpl_prefix == 'PAGINATION') ? '' : $tpl_prefix . '_'; - $previous_page = ($on_page != 1) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page) : ''; + if ($page_in_route) + { + $previous_page = ($on_page > 2) ? sprintf($base_url, $on_page - 2) : str_replace($start_name, '', $base_url); + $next_page = sprintf($base_url, $on_page); + } + else + { + $previous_page = $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page); + $next_page = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); + } $template_array = array( $tpl_prefix . 'BASE_URL' => $base_url, $tpl_prefix . 'PER_PAGE' => $per_page, - 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => $previous_page, - 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '', + 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page != 1) ? $previous_page : '', + 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $next_page : '', $tpl_prefix . 'TOTAL_PAGES' => $total_pages, $tpl_prefix . 'CURRENT_PAGE' => $on_page, ); From f16a7e351f30e70692adb0f51605e4826b92d597 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Aug 2013 14:36:22 +0200 Subject: [PATCH 077/102] [ticket/11805] Fix "jump to page" feature for pagination in routes PHPBB3-11805 --- phpBB/styles/prosilver/template/forum_fn.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 693211983f..800fadd972 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -40,10 +40,14 @@ function jumpto(item) { page = prompt(jump_page, on_page); if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { - if (base_url.indexOf('?') === -1) { - document.location.href = base_url + '?start=' + ((page - 1) * per_page); + if (base_url.indexOf('%d') === -1) { + if (base_url.indexOf('?') === -1) { + document.location.href = base_url + '?start=' + ((page - 1) * per_page); + } else { + document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + } } else { - document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); + document.location.href = base_url.replace('%d', page); } } } From cf46487dea0c583d58fc7ad04178841731a92e18 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Aug 2013 16:58:56 +0200 Subject: [PATCH 078/102] [ticket/11805] Do not generate the same link twice There is no need to generate the prev/next links twice PHPBB3-11805 --- phpBB/includes/functions.php | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d786119671..11e8b38d25 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2266,20 +2266,21 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages; } + $u_previous_page = $u_next_page = ''; if ($on_page != 1) { if ($page_in_route) { - $page_url = ($on_page - 2 > 0) ? sprintf($base_url, (int) $on_page - 2) : str_replace($start_name, '', $base_url); + $u_previous_page = ($on_page > 2) ? sprintf($base_url, (int) $on_page - 1) : str_replace($start_name, '', $base_url); } else { - $page_url = $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page); + $u_previous_page = ($on_page > 2) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page) : $base_url; } $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $page_url, + 'PAGE_URL' => $u_previous_page, 'S_IS_CURRENT' => false, 'S_IS_PREV' => true, 'S_IS_NEXT' => false, @@ -2295,7 +2296,7 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam { if ($page_in_route) { - $page_url = ($at_page != 1) ? sprintf($base_url, $at_page) : str_replace($start_name, '', $base_url); + $page_url = ($at_page > 1) ? sprintf($base_url, $at_page) : str_replace($start_name, '', $base_url); } else { @@ -2340,16 +2341,16 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam { if ($page_in_route) { - $page_url = sprintf($base_url, $on_page); + $u_next_page = sprintf($base_url, $on_page + 1); } else { - $page_url = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); + $u_next_page = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); } $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $page_url, + 'PAGE_URL' => $u_next_page, 'S_IS_CURRENT' => false, 'S_IS_PREV' => false, 'S_IS_NEXT' => true, @@ -2374,22 +2375,11 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam } $tpl_prefix = ($tpl_prefix == 'PAGINATION') ? '' : $tpl_prefix . '_'; - if ($page_in_route) - { - $previous_page = ($on_page > 2) ? sprintf($base_url, $on_page - 2) : str_replace($start_name, '', $base_url); - $next_page = sprintf($base_url, $on_page); - } - else - { - $previous_page = $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page); - $next_page = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); - } - $template_array = array( $tpl_prefix . 'BASE_URL' => $base_url, $tpl_prefix . 'PER_PAGE' => $per_page, - 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page != 1) ? $previous_page : '', - 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $next_page : '', + 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page != 1) ? $u_previous_page : '', + 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $u_next_page : '', $tpl_prefix . 'TOTAL_PAGES' => $total_pages, $tpl_prefix . 'CURRENT_PAGE' => $on_page, ); From d7119a50546859f8f488e0c46ff0964362ab877a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Aug 2013 17:00:35 +0200 Subject: [PATCH 079/102] [ticket/11805] Add unit tests for pagination PHPBB3-11805 --- tests/pagination/start_parameter_test.php | 111 +++++++++++++++++++++ tests/pagination/templates/pagination.html | 12 +++ 2 files changed, 123 insertions(+) create mode 100644 tests/pagination/start_parameter_test.php create mode 100644 tests/pagination/templates/pagination.html diff --git a/tests/pagination/start_parameter_test.php b/tests/pagination/start_parameter_test.php new file mode 100644 index 0000000000..785fe80aa4 --- /dev/null +++ b/tests/pagination/start_parameter_test.php @@ -0,0 +1,111 @@ +template, $base_url, 'pagination', $start_name, $num_items, $per_page, $start_item); + $this->template->set_filenames(array('test' => 'pagination.html')); + + $this->assertEquals(str_replace("\t", '', $expect), $this->display('test')); + } +} diff --git a/tests/pagination/templates/pagination.html b/tests/pagination/templates/pagination.html new file mode 100644 index 0000000000..7f2a329804 --- /dev/null +++ b/tests/pagination/templates/pagination.html @@ -0,0 +1,12 @@ +pagination + +:previous:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL} +:current:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL} +:ellipsis:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL} +:next:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL} +:else:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL} + + +:u_prev:{U_PREVIOUS_PAGE} + +:u_next:{U_NEXT_PAGE} From 8c786e82a7346d778626056177a8210edec09dfe Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 23 Aug 2013 00:50:20 +0200 Subject: [PATCH 080/102] [ticket/11805] Rename test to match the function name PHPBB3-11805 --- .../{start_parameter_test.php => generate_template_test.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/pagination/{start_parameter_test.php => generate_template_test.php} (96%) diff --git a/tests/pagination/start_parameter_test.php b/tests/pagination/generate_template_test.php similarity index 96% rename from tests/pagination/start_parameter_test.php rename to tests/pagination/generate_template_test.php index 785fe80aa4..587a948583 100644 --- a/tests/pagination/start_parameter_test.php +++ b/tests/pagination/generate_template_test.php @@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../template/template_test_case.php'; -class phpbb_pagination_start_parameter_test extends phpbb_template_template_test_case +class phpbb_pagination_generate_template_test extends phpbb_template_template_test_case { protected $test_path = 'tests/pagination'; From 6fd6324dd632ae2ddf31ed4bb79411d03ed8c8fb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 16 Sep 2013 18:51:14 +0200 Subject: [PATCH 081/102] [ticket/11805] Move page-url generating code into a new function PHPBB3-11805 --- phpBB/includes/functions.php | 57 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 11e8b38d25..91a80a897d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2205,6 +2205,32 @@ function tracking_unserialize($string, $max_depth = 3) } // Pagination functions +/** +* Generate a pagination link based on the url and the page information +* +* @param string $base_url is url prepended to all links generated within the function +* If you use page numbers inside your controller route, base_url should contains a placeholder (%d) +* for the page. Also be sure to specify the pagination path information into the start_name argument +* @param string $on_page is the page for which we want to generate the link +* @param string $start_name is the name of the parameter containing the first item of the given page (example: start=20) +* If you use page numbers inside your controller route, start name should be the string +* that should be removed for the first page (example: /page/%d) +* @param int $per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce +* @return URL for the requested page +*/ +function phpbb_generate_page_link($base_url, $on_page, $start_name, $per_page) +{ + + if (strpos($start_name, '%d') !== false) + { + return ($on_page > 1) ? sprintf($base_url, (int) $on_page) : str_replace($start_name, '', $base_url); + } + else + { + $url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&'); + return ($on_page > 1) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 1) * $per_page) : $base_url; + } +} /** * Generate template rendered pagination @@ -2237,8 +2263,6 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam } $on_page = floor($start_item / $per_page) + 1; - $url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&'); - $page_in_route = strpos($start_name, '%d') !== false; if ($reverse_count) { @@ -2269,14 +2293,7 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $u_previous_page = $u_next_page = ''; if ($on_page != 1) { - if ($page_in_route) - { - $u_previous_page = ($on_page > 2) ? sprintf($base_url, (int) $on_page - 1) : str_replace($start_name, '', $base_url); - } - else - { - $u_previous_page = ($on_page > 2) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page) : $base_url; - } + $u_previous_page = phpbb_generate_page_link($base_url, $on_page - 1, $start_name, $per_page); $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', @@ -2294,22 +2311,13 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $at_page = 1; do { - if ($page_in_route) - { - $page_url = ($at_page > 1) ? sprintf($base_url, $at_page) : str_replace($start_name, '', $base_url); - } - else - { - $page_url = $base_url . (($at_page == 1) ? '' : $url_delim . $start_name . '=' . (($at_page - 1) * $per_page)); - } - // We decide whether to display the ellipsis during the loop. The ellipsis is always // displayed as either the second or penultimate item in the list. So are we at either // of those points and of course do we even need to display it, i.e. is the list starting // on at least page 3 and ending three pages before the final item. $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => $at_page, - 'PAGE_URL' => $page_url, + 'PAGE_URL' => phpbb_generate_page_link($base_url, $at_page, $start_name, $per_page), 'S_IS_CURRENT' => (!$ignore_on_page && $at_page == $on_page), 'S_IS_NEXT' => false, 'S_IS_PREV' => false, @@ -2339,14 +2347,7 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam if ($on_page != $total_pages) { - if ($page_in_route) - { - $u_next_page = sprintf($base_url, $on_page + 1); - } - else - { - $u_next_page = $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page); - } + $u_next_page = phpbb_generate_page_link($base_url, $on_page + 1, $start_name, $per_page); $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', From bc8c4ac27020dd51b2d24fd145e74f6be5f458d5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:07:22 +0200 Subject: [PATCH 082/102] [ticket/11865] Add bbcodes to functional posting tests PHPBB3-11865 --- tests/functional/posting_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php index 7fd1e4fdcf..dd95704952 100644 --- a/tests/functional/posting_test.php +++ b/tests/functional/posting_test.php @@ -22,8 +22,8 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); $this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); - // Test creating a reply - $post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post posted by the testing framework.'); + // Test creating a reply with bbcode + $post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test [b]post[/b] posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); $this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); From 2794dc4e68fb8c5c741d96c3b0f685a7145ea74f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:11:42 +0200 Subject: [PATCH 083/102] [ticket/11865] Convert old class name to namespaced version PHPBB3-11865 --- phpBB/includes/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f617b4b10a..cd2ca7ffce 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,7 +132,7 @@ class bbcode { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb_template_context(), $phpbb_extension_manager); + $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); $template->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); From 03639c081cfe92dea223b6c2125e94319ae001ce Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:42:04 +0200 Subject: [PATCH 084/102] [ticket/11866] Update some occurances of phpbb_db_ to new Namespace PHPBB3-11866 --- phpBB/develop/create_schema_files.php | 2 +- phpBB/develop/mysql_upgrader.php | 2 +- phpBB/includes/functions.php | 2 +- phpBB/phpbb/db/driver/driver.php | 2 +- tests/RUNNING_TESTS.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 9ffc8d229f..5ef278d493 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); require(dirname(__FILE__) . '/../includes/db/schema_data.php'); require(dirname(__FILE__) . '/../phpbb/db/tools.php'); -$dbms_type_map = phpbb_db_tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); // A list of types being unsigned for better reference in some db's $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 3decee306a..eb34034826 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -59,7 +59,7 @@ echo "USE $dbname;$newline$newline"; require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx); require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx); -$dbms_type_map = phpbb_db_tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); foreach ($schema_data as $table_name => $table_data) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e905375f4a..acf4800849 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5671,7 +5671,7 @@ function phpbb_to_numeric($input) * Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name. * * If $dbms is a valid 3.1 db driver class name, returns it unchanged. -* Otherwise prepends phpbb_db_driver_ to the dbms to convert a 3.0 dbms +* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms * to 3.1 db driver class name. * * @param string $dbms dbms parameter diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index cd960bc65a..53d39e9127 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -84,7 +84,7 @@ class driver // Fill default sql layer based on the class being called. // This can be changed by the specified layer itself later if needed. - $this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_')); + $this->sql_layer = substr(get_class($this), strlen('phpbb\db\driver\\')); // Do not change this please! This variable is used to easy the use of it - and is hardcoded. $this->any_char = chr(0) . '%'; diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index f2688ab675..aa988231e7 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -57,7 +57,7 @@ found below. More information on configuration options can be found on the wiki (see below). Date: Thu, 26 Sep 2013 00:58:37 +0200 Subject: [PATCH 085/102] [ticket/11866] More namespaces PHPBB3-11866 --- phpBB/docs/auth_api.html | 2 +- phpBB/includes/functions_container.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index f45ea5e5c8..c68ae7821f 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -86,7 +86,7 @@

To use any methods contained with the auth class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:

-$auth = new phpbb_auth();
+$auth = new phpbb\auth\auth();

Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this separately but in the same way.

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 62559fbf36..667d27fd20 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -152,12 +152,12 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path) return phpbb_create_compiled_container( $config_file, array( - new phpbb_di_extension_config($config_file), - new phpbb_di_extension_core($config_path), + new phpbb\di\extension\config($config_file), + new phpbb\di\extension\core($config_path), ), array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), + new phpbb\di\pass\collection_pass(), + new phpbb\di\pass\kernel_pass(), ), $phpbb_root_path, $php_ext From 9ead28a0fe011af32b3c16e40a333c8374d6864f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:59:25 +0200 Subject: [PATCH 086/102] [ticket/11866] Remove outdated and broken develop script PHPBB3-11866 --- phpBB/develop/compile_template.php | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 phpBB/develop/compile_template.php diff --git a/phpBB/develop/compile_template.php b/phpBB/develop/compile_template.php deleted file mode 100644 index 32d1d321f1..0000000000 --- a/phpBB/develop/compile_template.php +++ /dev/null @@ -1,24 +0,0 @@ -compile_file($file); From 6d5be041e46b65c4ac60bc0f66cc365988593775 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 01:02:29 +0200 Subject: [PATCH 087/102] [ticket/11866] Only single backslash in .md files PHPBB3-11866 --- tests/RUNNING_TESTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index aa988231e7..0778046141 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -57,7 +57,7 @@ found below. More information on configuration options can be found on the wiki (see below). Date: Thu, 26 Sep 2013 12:02:17 +0300 Subject: [PATCH 088/102] [ticket/11868] Replace phpbb_request_interface references PHPBB3-11868 --- phpBB/includes/ucp/ucp_login_link.php | 8 ++++---- phpBB/includes/ucp/ucp_register.php | 4 ++-- tests/mock/request.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php index 4620eb9b9e..80a553953d 100644 --- a/phpBB/includes/ucp/ucp_login_link.php +++ b/phpBB/includes/ucp/ucp_login_link.php @@ -72,8 +72,8 @@ class ucp_login_link { if ($request->is_set_post('login')) { - $login_username = $request->variable('login_username', '', false, phpbb_request_interface::POST); - $login_password = $request->untrimmed_variable('login_password', '', true, phpbb_request_interface::POST); + $login_username = $request->variable('login_username', '', false, \phpbb\request\request_interface::POST); + $login_password = $request->untrimmed_variable('login_password', '', true, \phpbb\request\request_interface::POST); $login_result = $auth_provider->login($login_username, $login_password); @@ -153,7 +153,7 @@ class ucp_login_link { global $request; - $var_names = $request->variable_names(phpbb_request_interface::GET); + $var_names = $request->variable_names(\phpbb\request\request_interface::GET); $login_link_data = array(); $string_start_length = strlen('login_link_'); @@ -162,7 +162,7 @@ class ucp_login_link if (strpos($var_name, 'login_link_') === 0) { $key_name = substr($var_name, $string_start_length); - $login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::GET); + $login_link_data[$key_name] = $request->variable($var_name, '', false, \phpbb\request\request_interface::GET); } } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 44621e6dea..1f9ab23326 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -516,7 +516,7 @@ class ucp_register { global $request; - $var_names = $request->variable_names(phpbb_request_interface::POST); + $var_names = $request->variable_names(\phpbb\request\request_interface::POST); $login_link_data = array(); $string_start_length = strlen('login_link_'); @@ -525,7 +525,7 @@ class ucp_register if (strpos($var_name, 'login_link_') === 0) { $key_name = substr($var_name, $string_start_length); - $login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::POST); + $login_link_data[$key_name] = $request->variable($var_name, '', false, \phpbb\request\request_interface::POST); } } diff --git a/tests/mock/request.php b/tests/mock/request.php index ed0744c8cf..60ba725abd 100644 --- a/tests/mock/request.php +++ b/tests/mock/request.php @@ -74,7 +74,7 @@ class phpbb_mock_request implements \phpbb\request\request_interface return array_keys($this->data[$super_global]); } - public function get_super_global($super_global = phpbb_request_interface::REQUEST) + public function get_super_global($super_global = \phpbb\request\request_interface::REQUEST) { return $this->data[$super_global]; } From b1dbd5e9928669ec87c58f919bd1ce5c56ac718f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 11:49:35 +0200 Subject: [PATCH 089/102] [ticket/11868] Add functional test for registration PHPBB3-11868 --- tests/functional/registration_test.php | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 tests/functional/registration_test.php diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php new file mode 100644 index 0000000000..eb82b71fdf --- /dev/null +++ b/tests/functional/registration_test.php @@ -0,0 +1,49 @@ +login(); + $this->admin_login(); + + $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}"); + $form = $crawler->selectButton('Submit')->form(); + $form['config[enable_confirm]']->setValue('0'); + $crawler = self::submit($form); + + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text()); + } + + public function test_register_new_account() + { + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?mode=register'); + $this->assertContainsLang('REGISTRATION', $crawler->filter('div.content h2')->text()); + + $form = $crawler->selectButton('I agree to these terms')->form(); + $crawler = self::submit($form); + + $form = $crawler->selectButton('Submit')->form(array( + 'username' => 'user-reg-test', + 'email' => 'user-reg-test@phpbb.com', + 'new_password' => 'testtest', + 'password_confirm' => 'testtest', + )); + $form['tz']->select('Europe/Berlin'); + $crawler = self::submit($form); + + $this->assertContainsLang('ACCOUNT_ADDED', $crawler->filter('#message')->text()); + } +} From ccf00c7265d310023bcdf3f5a96de7c651567cb1 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 26 Sep 2013 15:21:04 +0300 Subject: [PATCH 090/102] [ticket/11868] Add @depends to test PHPBB3-11868 --- tests/functional/registration_test.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php index eb82b71fdf..5baf33c59e 100644 --- a/tests/functional/registration_test.php +++ b/tests/functional/registration_test.php @@ -25,6 +25,9 @@ class phpbb_functional_registration_test extends phpbb_functional_test_case $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text()); } + /** + * @depends test_disable_captcha_on_registration + */ public function test_register_new_account() { $this->add_lang('ucp'); From 7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 15:34:44 +0200 Subject: [PATCH 091/102] [ticket/11852] Split filesystem and path_helper into 2 classes PHPBB3-11852 --- phpBB/app.php | 1 + phpBB/common.php | 19 +-- phpBB/config/services.yml | 16 +- phpBB/includes/bbcode.php | 4 +- phpBB/includes/functions.php | 27 ++-- phpBB/includes/functions_content.php | 4 +- phpBB/includes/functions_messenger.php | 4 +- phpBB/install/index.php | 4 +- phpBB/phpbb/filesystem.php | 145 ------------------ phpBB/phpbb/template/asset.php | 10 +- phpBB/phpbb/template/twig/environment.php | 22 +-- .../phpbb/template/twig/node/includeasset.php | 2 +- phpBB/phpbb/template/twig/twig.php | 22 +-- tests/controller/helper_url_test.php | 10 +- tests/dbal/migrator_test.php | 8 +- tests/extension/manager_test.php | 8 +- tests/extension/metadata_manager_test.php | 11 +- tests/filesystem/clean_path_test.php | 8 +- tests/filesystem/web_root_path_test.php | 12 +- tests/mock/extension_manager.php | 8 +- tests/template/template_events_test.php | 5 +- tests/template/template_includecss_test.php | 4 +- tests/template/template_includejs_test.php | 26 ++-- tests/template/template_test_case.php | 5 +- .../template/template_test_case_with_tree.php | 5 +- .../phpbb_functional_test_case.php | 8 +- 26 files changed, 108 insertions(+), 290 deletions(-) diff --git a/phpBB/app.php b/phpBB/app.php index f1023ff1b5..7dc778e3a8 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -25,6 +25,7 @@ $auth->acl($user->data); $user->setup('app'); $http_kernel = $phpbb_container->get('http_kernel'); +$symfony_request = $phpbb_container->get('symfony_request'); $response = $http_kernel->handle($symfony_request); $response->send(); $http_kernel->terminate($symfony_request, $response); diff --git a/phpBB/common.php b/phpBB/common.php index 80375f7a9c..6bb3509ea1 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -47,19 +47,7 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); - require($phpbb_root_path . 'phpbb/symfony_request.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/deactivated_super_global.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/type_cast_helper_interface.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/type_cast_helper.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/request_interface.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/request.' . $phpEx); - $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony_request( - new phpbb\request\request() - ), - $phpbb_root_path, - $phpEx - ); + $phpbb_filesystem = new phpbb\filesystem(); $script_path = $phpbb_filesystem->clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; @@ -121,16 +109,13 @@ $db = $phpbb_container->get('dbal.conn'); // make sure request_var uses this request instance request_var('', 0, false, false, $request); // "dependency injection" for a function -// Create a Symfony Request object from our phpbb_request object -$symfony_request = $phpbb_container->get('symfony_request'); -$phpbb_filesystem = $phpbb_container->get('filesystem'); - // Grab global variables, re-cache if necessary $config = $phpbb_container->get('config'); set_config(null, null, null, $config); set_config_count(null, null, null, $config); $phpbb_log = $phpbb_container->get('log'); +$phpbb_path_helper = $phpbb_container->get('path_helper'); // load extensions $phpbb_extension_manager = $phpbb_container->get('ext.manager'); diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index e33db0c2bc..51ae5c454d 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -169,11 +169,6 @@ services: filesystem: class: phpbb\filesystem - arguments: - - @symfony_request - - %core.root_path% - - %core.php_ext% - - %core.adm_relative_path% groupposition.legend: class: phpbb\groupposition\legend @@ -251,6 +246,15 @@ services: - %tables.notifications% - %tables.user_notifications% + path_helper: + class: phpbb\path_helper + arguments: + - @symfony_request + - @filesystem + - %core.root_path% + - %core.php_ext% + - %core.adm_relative_path% + php_ini: class: phpbb\php\ini @@ -265,7 +269,7 @@ services: template: class: phpbb\template\twig\twig arguments: - - @filesystem + - @path_helper - @config - @user - @template_context diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index cd2ca7ffce..c4076a0120 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -126,13 +126,13 @@ class bbcode */ function bbcode_cache_init() { - global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_filesystem; + global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper; if (empty($this->template_filename)) { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); + $template = new phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); $template->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b3e50847fd..28c03534ea 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1056,31 +1056,32 @@ else */ function phpbb_clean_path($path) { - global $phpbb_container; + global $phpbb_path_helper, $phpbb_container; - if ($phpbb_container) + if (!$phpbb_path_helper && $phpbb_container) { - $phpbb_filesystem = $phpbb_container->get('filesystem'); + $phpbb_path_helper = $phpbb_container->get('path_helper'); } - else + else if (!$phpbb_path_helper) { // The container is not yet loaded, use a new instance - if (!class_exists('\phpbb\filesystem')) + if (!class_exists('\phpbb\path_helper')) { global $phpbb_root_path, $phpEx; - require($phpbb_root_path . 'includes/filesystem.' . $phpEx); + require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx); } - $phpbb_filesystem = new phpbb\filesystem( + $phpbb_path_helper = new phpbb\path_helper( new phpbb\symfony_request( new phpbb\request\request() ), + new phpbb\filesystem(), $phpbb_root_path, $phpEx ); } - return $phpbb_filesystem->clean_path($path); + return $phpbb_path_helper->clean_path($path); } // functions used for building option fields @@ -2445,7 +2446,7 @@ function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $star */ function append_sid($url, $params = false, $is_amp = true, $session_id = false) { - global $_SID, $_EXTRA_URL, $phpbb_hook, $phpbb_filesystem; + global $_SID, $_EXTRA_URL, $phpbb_hook, $phpbb_path_helper; global $phpbb_dispatcher; if ($params === '' || (is_array($params) && empty($params))) @@ -2455,9 +2456,9 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) } // Update the root path with the correct relative web path - if ($phpbb_filesystem instanceof \phpbb\filesystem) + if ($phpbb_path_helper instanceof \phpbb\path_helper) { - $url = $phpbb_filesystem->update_web_root_path($url); + $url = $phpbb_path_helper->update_web_root_path($url); } $append_sid_overwrite = false; @@ -5276,8 +5277,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 // This path is sent with the base template paths in the assign_vars() // call below. We need to correct it in case we are accessing from a // controller because the web paths will be incorrect otherwise. - $phpbb_filesystem = $phpbb_container->get('filesystem'); - $corrected_path = $phpbb_filesystem->get_web_root_path(); + $phpbb_path_helper = $phpbb_container->get('path_helper'); + $corrected_path = $phpbb_path_helper->get_web_root_path(); $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path; // Send a proper content-language to the output diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 7ecc99b39c..863450a4b2 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -834,7 +834,7 @@ function bbcode_nl2br($text) */ function smiley_text($text, $force_option = false) { - global $config, $user, $phpbb_filesystem; + global $config, $user, $phpbb_path_helper; if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies')) { @@ -842,7 +842,7 @@ function smiley_text($text, $force_option = false) } else { - $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_filesystem->get_web_root_path(); + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path(); return preg_replace('#write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n") + ->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper());\n") ->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n") ->indent() ->write("\$asset_path = \$asset->get_path();") diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 2da7405743..9df9310427 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -33,10 +33,10 @@ class twig extends \phpbb\template\base private $cachepath = ''; /** - * phpBB filesystem - * @var \phpbb\filesystem + * phpBB path helper + * @var \phpbb\path_helper */ - protected $phpbb_filesystem; + protected $path_helper; /** * phpBB root path @@ -79,17 +79,17 @@ class twig extends \phpbb\template\base /** * Constructor. * - * @param \phpbb\filesystem $phpbb_filesystem + * @param \phpbb\path_helper $path_helper * @param \phpbb\config\config $config * @param \phpbb\user $user * @param \phpbb\template\context $context template context * @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked */ - public function __construct(\phpbb\filesystem $phpbb_filesystem, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null) + public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null) { - $this->phpbb_filesystem = $phpbb_filesystem; - $this->phpbb_root_path = $phpbb_filesystem->get_phpbb_root_path(); - $this->php_ext = $phpbb_filesystem->get_php_ext(); + $this->path_helper = $path_helper; + $this->phpbb_root_path = $path_helper->get_phpbb_root_path(); + $this->php_ext = $path_helper->get_php_ext(); $this->config = $config; $this->user = $user; $this->context = $context; @@ -103,7 +103,7 @@ class twig extends \phpbb\template\base $this->twig = new \phpbb\template\twig\environment( $this->config, ($this->extension_manager) ? $this->extension_manager->all_enabled() : array(), - $this->phpbb_filesystem, + $this->path_helper, $loader, array( 'cache' => (defined('IN_INSTALL')) ? false : $this->cachepath, @@ -125,9 +125,9 @@ class twig extends \phpbb\template\base $this->twig->setLexer($lexer); // Add admin namespace - if ($this->phpbb_filesystem->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/')) + if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/')) { - $this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/', 'admin'); + $this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/', 'admin'); } } diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 4ea177074f..33fc6c4f1b 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -49,14 +49,15 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); - $phpbb_filesystem = new \phpbb\filesystem( + $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); - $this->template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); + $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $config, $this->user, new \phpbb\template\context()); // We don't use mod_rewrite in these tests $config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); @@ -101,14 +102,15 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); - $phpbb_filesystem = new \phpbb\filesystem( + $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); - $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); + $this->template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $this->user, new \phpbb\template\context()); $config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $helper = new \phpbb\controller\helper($this->template, $this->user, $config, '', 'php'); diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index ef5d167fc2..c6b4c289d3 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -59,13 +59,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $container, $this->db, $this->config, - new phpbb\filesystem( - new phpbb\symfony_request( - new phpbb_mock_request() - ), - dirname(__FILE__) . '/../../phpBB/', - 'php' - ), + new phpbb\filesystem(), 'phpbb_ext', dirname(__FILE__) . '/../../phpBB/', 'php', diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index c4a32f53ab..b127daf2ed 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -114,13 +114,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case $container, $db, $config, - new \phpbb\filesystem( - new \phpbb\symfony_request( - new phpbb_mock_request() - ), - $phpbb_root_path, - $php_ext - ), + new \phpbb\filesystem(), 'phpbb_ext', dirname(__FILE__) . '/', $php_ext, diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index 2b27a1bae2..242ec38908 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -41,10 +41,11 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->table_prefix = 'phpbb_'; $this->template = new \phpbb\template\twig\twig( - new \phpbb\filesystem( + new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $this->phpbb_root_path, $this->phpEx ), @@ -70,13 +71,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $container, $this->db, $this->config, - new \phpbb\filesystem( - new \phpbb\symfony_request( - new phpbb_mock_request() - ), - $this->phpbb_root_path, - $this->phpEx - ), + new \phpbb\filesystem(), 'phpbb_ext', $this->phpbb_root_path, $this->phpEx, diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php index 5b9857ef2c..fedadc103b 100644 --- a/tests/filesystem/clean_path_test.php +++ b/tests/filesystem/clean_path_test.php @@ -14,13 +14,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case public function setUp() { parent::setUp(); - $this->filesystem = new \phpbb\filesystem( - new \phpbb\symfony_request( - new phpbb_mock_request() - ), - dirname(__FILE__) . './../../phpBB/', - 'php' - ); + $this->filesystem = new \phpbb\filesystem(); } public function clean_path_data() diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php index e0f716cdae..ebc99669ce 100644 --- a/tests/filesystem/web_root_path_test.php +++ b/tests/filesystem/web_root_path_test.php @@ -18,10 +18,11 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case $this->set_phpbb_root_path(); - $this->filesystem = new \phpbb\filesystem( + $this->path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $this->phpbb_root_path, 'php' ); @@ -43,7 +44,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case public function test_get_web_root_path() { // Symfony Request = null, so always should return phpbb_root_path - $this->assertEquals($this->phpbb_root_path, $this->filesystem->get_web_root_path()); + $this->assertEquals($this->phpbb_root_path, $this->path_helper->get_web_root_path()); } public function basic_update_web_root_path_data() @@ -71,7 +72,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case */ public function test_basic_update_web_root_path($input, $expected) { - $this->assertEquals($expected, $this->filesystem->update_web_root_path($input, $symfony_request)); + $this->assertEquals($expected, $this->path_helper->update_web_root_path($input, $symfony_request)); } public function update_web_root_path_data() @@ -131,12 +132,13 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case ->method('getScriptName') ->will($this->returnValue($getScriptName)); - $filesystem = new \phpbb\filesystem( + $path_helper = new \phpbb\path_helper( $symfony_request, + new \phpbb\filesystem(), $this->phpbb_root_path, 'php' ); - $this->assertEquals($expected, $filesystem->update_web_root_path($input, $symfony_request)); + $this->assertEquals($expected, $path_helper->update_web_root_path($input, $symfony_request)); } } diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 0c6b8447f1..7049cbdc50 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -14,12 +14,6 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = 'php'; $this->extensions = $extensions; - $this->filesystem = new \phpbb\filesystem( - new \phpbb\symfony_request( - new phpbb_mock_request() - ), - $this->phpbb_root_path, - $this->php_ext - ); + $this->filesystem = new \phpbb\filesystem(); } } diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index 4155d5fd83..41e00e86a7 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -116,14 +116,15 @@ Zeta test event in all', $this->extension_manager = new phpbb_mock_filesystem_extension_manager( dirname(__FILE__) . "/datasets/$dataset/" ); - $phpbb_filesystem = new \phpbb\filesystem( + $path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); - $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new \phpbb\template\context, $this->extension_manager); + $this->template = new \phpbb\template\twig\twig($path_helper, $config, $user, new \phpbb\template\context, $this->extension_manager); $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path)); } } diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index c00aa8e9bb..7424af0c93 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -18,8 +18,8 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te // Prepare correct result $scripts = array( - '', - '', + '', + '', ); // Run test diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index 2faeb5fcaa..ab0f4b9ca1 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -24,51 +24,51 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes */ array( array('TEST' => 1), - '', + '', ), array( array('TEST' => 2), - '', + '', ), array( array('TEST' => 3), - '', + '', ), array( array('TEST' => 4), - '', + '', ), array( array('TEST' => 6), - '', + '', ), array( array('TEST' => 7), - '', + '', ), array( array('TEST' => 8), - '', + '', ), array( array('TEST' => 9), - '', + '', ), array( array('TEST' => 10), - '', + '', ), array( array('TEST' => 11), - '', + '', ), array( array('TEST' => 12), - '', + '', ), array( array('TEST' => 14), - '', + '', ), array( array('TEST' => 15), @@ -84,7 +84,7 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes ), array( array('TEST' => 18), - '', + '', ), ); } diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index e9cbdec1d9..c75b1e5065 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -63,16 +63,17 @@ class phpbb_template_template_test_case extends phpbb_test_case $config = new \phpbb\config\config(array_merge($defaults, $new_config)); $this->user = new \phpbb\user; - $phpbb_filesystem = new \phpbb\filesystem( + $path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); $this->template_path = $this->test_path . '/templates'; - $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); + $this->template = new \phpbb\template\twig\twig($path_helper, $config, $this->user, new \phpbb\template\context()); $this->template->set_custom_style('tests', $this->template_path); } diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 232331d37c..e614c42d73 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -18,17 +18,18 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat $defaults = $this->config_defaults(); $config = new \phpbb\config\config(array_merge($defaults, $new_config)); - $this->phpbb_filesystem = new \phpbb\filesystem( + $this->phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); $this->template_path = $this->test_path . '/templates'; $this->parent_template_path = $this->test_path . '/parent_templates'; - $this->template = new phpbb\template\twig\twig($this->phpbb_filesystem, $config, $user, new phpbb\template\context()); + $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $user, new phpbb\template\context()); $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path)); } } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index f87b3538a1..a0d186e0f2 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -203,13 +203,7 @@ class phpbb_functional_test_case extends phpbb_test_case $container, $db, $config, - new phpbb\filesystem( - new phpbb\symfony_request( - new phpbb_mock_request() - ), - $phpbb_root_path, - $php_ext - ), + new phpbb\filesystem(), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', $php_ext, From c7a9d5e34a27794b93cc3a1c248a49af2b8488ee Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 15:35:53 +0200 Subject: [PATCH 092/102] [ticket/11852] Move tests to folder with new class name PHPBB3-11852 --- tests/{filesystem => path_helper}/web_root_path_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename tests/{filesystem => path_helper}/web_root_path_test.php (97%) diff --git a/tests/filesystem/web_root_path_test.php b/tests/path_helper/web_root_path_test.php similarity index 97% rename from tests/filesystem/web_root_path_test.php rename to tests/path_helper/web_root_path_test.php index ebc99669ce..938b58892b 100644 --- a/tests/filesystem/web_root_path_test.php +++ b/tests/path_helper/web_root_path_test.php @@ -7,9 +7,9 @@ * */ -class phpbb_filesystem_web_root_path_test extends phpbb_test_case +class phpbb_path_helper_web_root_path_test extends phpbb_test_case { - protected $filesystem; + protected $path_helper; protected $phpbb_root_path = ''; public function setUp() From 213e7563ad4565b322680ce2f3526a7130d2a90e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 27 Sep 2013 00:08:54 +0200 Subject: [PATCH 093/102] [ticket/11852] Add class file PHPBB3-11852 --- phpBB/phpbb/path_helper.php | 175 ++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 phpBB/phpbb/path_helper.php diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php new file mode 100644 index 0000000000..b2ed11a927 --- /dev/null +++ b/phpBB/phpbb/path_helper.php @@ -0,0 +1,175 @@ +symfony_request = $symfony_request; + $this->filesystem = $filesystem; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; + $this->adm_relative_path = $adm_relative_path; + } + + /** + * Get the phpBB root path + * + * @return string + */ + public function get_phpbb_root_path() + { + return $this->phpbb_root_path; + } + + /** + * Get the adm root path + * + * @return string + */ + public function get_adm_relative_path() + { + return $this->adm_relative_path; + } + + /** + * Get the php extension + * + * @return string + */ + public function get_php_ext() + { + return $this->php_ext; + } + + /** + * Update a path to the correct relative root path + * + * This replaces $phpbb_root_path . some_url with + * get_web_root_path() . some_url OR if $phpbb_root_path + * is not at the beginning of $path, just prepends the + * web root path + * + * @param string $path The path to be updated + * @return string + */ + public function update_web_root_path($path) + { + $web_root_path = $this->get_web_root_path($this->symfony_request); + + if (strpos($path, $this->phpbb_root_path) === 0) + { + $path = substr($path, strlen($this->phpbb_root_path)); + } + + return $web_root_path . $path; + } + + /** + * Get a relative root path from the current URL + * + * @return string + */ + public function get_web_root_path() + { + if ($this->symfony_request === null) + { + return $this->phpbb_root_path; + } + + if (null !== $this->web_root_path) + { + return $this->web_root_path; + } + + // Path info (e.g. /foo/bar) + $path_info = $this->filesystem->clean_path($this->symfony_request->getPathInfo()); + + // Full request URI (e.g. phpBB/app.php/foo/bar) + $request_uri = $this->symfony_request->getRequestUri(); + + // Script name URI (e.g. phpBB/app.php) + $script_name = $this->symfony_request->getScriptName(); + + /* + * If the path info is empty (single /), then we're not using + * a route like app.php/foo/bar + */ + if ($path_info === '/') + { + return $this->web_root_path = $this->phpbb_root_path; + } + + // How many corrections might we need? + $corrections = substr_count($path_info, '/'); + + /* + * If the script name (e.g. phpBB/app.php) exists in the + * requestUri (e.g. phpBB/app.php/foo/template), then we + * are have a non-rewritten URL. + */ + if (strpos($request_uri, $script_name) === 0) + { + /* + * Append ../ to the end of the phpbb_root_path as many times + * as / exists in path_info + */ + return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections); + } + + /* + * If we're here it means we're at a re-written path, so we must + * correct the relative path for web URLs. We must append ../ + * to the end of the root path as many times as / exists in path_info + * less one time (because the script, e.g. /app.php, doesn't exist in + * the URL) + */ + return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections - 1); + } +} From d18bded3acf8e307a5329fe3777b616bbc1d9119 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 27 Sep 2013 01:26:31 +0200 Subject: [PATCH 094/102] [prep-release-3.0.12] Bumping version number for 3.0.12 final. --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 8 +++++++- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 08d3ecd947..ac656d79df 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index c57b90a5dd..3533c49d46 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.12-RC3'); +define('PHPBB_VERSION', '3.0.12'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 01bfb7b251..90d4010d5f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.12-RC3'); +define('UPDATES_TO_VERSION', '3.0.12'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -1009,6 +1009,8 @@ function database_update_info() '3.0.12-RC1' => array(), // No changes from 3.0.12-RC2 to 3.0.12-RC3 '3.0.12-RC2' => array(), + // No changes from 3.0.12-RC3 to 3.0.12 + '3.0.12-RC3' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.13-RC1 */ ); @@ -2248,6 +2250,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12-RC2 to 3.0.12-RC3 case '3.0.12-RC2': break; + + // No changes from 3.0.12-RC3 to 3.0.12 + case '3.0.12-RC3': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 3f54d4f24f..6eae984cb7 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.12-RC3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.12'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 50f6af2a207dc18c1e76b08201a5c9ea640e921f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 27 Sep 2013 01:33:08 +0200 Subject: [PATCH 095/102] [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. --- build/build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index e2f69a139c..7b87830da3 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + From 9dc9214ebb2d671d8b02208ea64362705064a405 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 27 Sep 2013 13:32:37 +0200 Subject: [PATCH 096/102] [ticket/11862] Correct var names in user_delete() events due to prune-users Fix comments after incorrect merge of previous PR. PHPBB3-11862 --- phpBB/includes/functions_user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index fc04d57fa0..0a0656377c 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -389,7 +389,7 @@ function user_delete($mode, $user_ids, $retain_username = true) * * @event core.delete_user_before * @var string mode Mode of deletion (retain/delete posts) - * @var int user_ids IDs of the deleted user + * @var array user_ids IDs of the deleted user * @var mixed retain_username True if username should be retained * or false if not * @since 3.1-A1 @@ -618,7 +618,7 @@ function user_delete($mode, $user_ids, $retain_username = true) * * @event core.delete_user_after * @var string mode Mode of deletion (retain/delete posts) - * @var int user_id IDs of the deleted user + * @var array user_ids IDs of the deleted user * @var mixed retain_username True if username should be retained * or false if not * @since 3.1-A1 From cba28c39ad63920c05241f59ce7e1ad6b47039df Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 27 Sep 2013 01:18:28 +0200 Subject: [PATCH 097/102] [ticket/11873] Do not hash very large passwords in order to safe resources. PHPBB3-11873 --- phpBB/includes/functions.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b2b12c1445..eef4ade4e7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -502,6 +502,13 @@ function phpbb_hash($password) */ function phpbb_check_hash($password, $hash) { + if (strlen($password) > 4096) + { + // If the password is too huge, we will simply reject it + // and not let the server try to hash it. + return false; + } + $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; if (strlen($hash) == 34) { From c6aefcf555b51e7bcf00332290c9d94beddec02c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 27 Sep 2013 01:19:55 +0200 Subject: [PATCH 098/102] [ticket/11873] Add unit test for large password input. The password should be rejected quite fast. PHPBB3-11873 --- tests/security/hash_test.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php index 0c2580c19b..e226365ef3 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -17,5 +17,13 @@ class phpbb_security_hash_test extends phpbb_test_case $this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); $this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); } + + public function test_check_hash_with_large_input() + { + // 16 MB password, should be rejected quite fast + $start_time = time(); + $this->assertFalse(phpbb_check_hash(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertLessThanOrEqual(5, time() - $start_time); + } } From 446ea9928d8373cf7695d3adda6d5ee30d5f94b4 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 28 Sep 2013 03:20:51 +0200 Subject: [PATCH 099/102] [prep-release-3.0.12] Update changelog for 3.0.12 release. --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6d8b39d524..71795f83ac 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -218,6 +218,7 @@
  • [PHPBB3-11368] - Latest pm reports row count
  • [PHPBB3-11583] - InnoDB supports FULLTEXT index since MySQL 5.6.4.
  • [PHPBB3-11740] - Update link in FAQ to Ideas Centre
    • +
  • [PHPBB3-11873] - Prevent expensive hash computation in phpbb_check_hash() by rejecting very long passwords

    • Sub-task

      From ac4736db0887e986a322f7f92429430333525a24 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 17:04:14 +0200 Subject: [PATCH 100/102] [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 7b87830da3..40d875cb95 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,7 +3,7 @@ - + From da9756ba2553abdcc87130ec892e589ded1c1256 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 18:04:38 +0200 Subject: [PATCH 101/102] [ticket/11876] Move checksum generation from build PHP files to phing build.xml This also removes paths from the checksum files. PHPBB3-11876 --- build/build.xml | 18 ++++++++++++++++++ build/build_diff.php | 3 --- build/package.php | 12 ------------ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build/build.xml b/build/build.xml index 40d875cb95..a861ebc205 100644 --- a/build/build.xml +++ b/build/build.xml @@ -149,6 +149,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/build/build_diff.php b/build/build_diff.php index 0824b53caa..d264ecf493 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -83,9 +83,6 @@ if (!$echo_changes) // Build Package run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *"); - - // Build MD5 Sum - run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5"); flush(); } } diff --git a/build/package.php b/build/package.php index 48f42b3572..22ea4e52af 100755 --- a/build/package.php +++ b/build/package.php @@ -285,9 +285,6 @@ if (sizeof($package->old_packages)) // Build Package $package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *'); - - // Build MD5 Sum - $package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5'); } // Build Files Package @@ -319,8 +316,6 @@ if (sizeof($package->old_packages)) chdir('./release'); $package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *'); - // Build MD5 Sum - $package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5'); chdir('..'); $package->run_command('rm -Rv ' . $package->get('files_directory') . '/release'); @@ -363,9 +358,6 @@ if (sizeof($package->old_packages)) // Copy last package over... $package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension"); $package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *"); - - // Build MD5 Sum - $package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5"); chdir('..'); } @@ -388,9 +380,6 @@ foreach ($compress_programs as $extension => $compress_command) // Build Package $package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name')); - - // Build MD5 Sum - $package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5'); } // Microsoft Web PI packaging @@ -398,7 +387,6 @@ $package->begin_status('Packaging phpBB for Microsoft WebPI'); $file = './release_files/' . $package->get('release_filename') . '.webpi.zip'; $package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file"); $package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *"); -$package->run_command("md5sum $file > $file.md5"); // verify results chdir($package->locations['root']); From 0cf9d657b7c56e602248d5998a49b7d392b16d39 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Sep 2013 18:09:27 +0200 Subject: [PATCH 102/102] [ticket/11876] Replace MD5 with SHA256. PHPBB3-11876 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index a861ebc205..f0962e67eb 100644 --- a/build/build.xml +++ b/build/build.xml @@ -166,7 +166,7 @@ - +