makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11700] Move all recent code to namespaces

Browse source 
PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-09-10 14:01:09 +02:00
parent 196e1813cd
commit b95fdacdd3
420 changed files with 2316 additions and 1840 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/cache/index.htm vendored
View file

@ -1,10 +0,0 @@
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
</body>
</html>

8
phpBB/common.php
View file

@ -47,7 +47,7 @@ if (!defined('PHPBB_INSTALLED'))
// Eliminate . and .. from the path // Eliminate . and .. from the path
require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); 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); $script_path = $phpbb_filesystem->clean_path($script_path);
$url = (($secure) ? 'https://' : 'http://') . $server_name; $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'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Setup class loader first // 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->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(); $phpbb_class_loader_ext->register();
// Set up container // Set up container
@ -125,7 +125,7 @@ $phpbb_style = $phpbb_container->get('style');
// Add own hook handler // Add own hook handler
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); 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'); $phpbb_hook_finder = $phpbb_container->get('hook_finder');
foreach ($phpbb_hook_finder->find() as $hook) foreach ($phpbb_hook_finder->find() as $hook)

8
phpBB/config/auth_providers.yml
View file

@ -1,12 +1,12 @@
services: services:
auth.provider_collection: auth.provider_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
- { name: service_collection, tag: auth.provider } - { name: service_collection, tag: auth.provider }
auth.provider.db: auth.provider.db:
class: phpbb_auth_provider_db class: phpbb\auth\provider\db
arguments: arguments:
- @dbal.conn - @dbal.conn
- @config - @config
@ -17,7 +17,7 @@ services:
tags: tags:
- { name: auth.provider } - { name: auth.provider }
auth.provider.apache: auth.provider.apache:
class: phpbb_auth_provider_apache class: phpbb\auth\provider\apache
arguments: arguments:
- @dbal.conn - @dbal.conn
- @config - @config
@ -28,7 +28,7 @@ services:
tags: tags:
- { name: auth.provider } - { name: auth.provider }
auth.provider.ldap: auth.provider.ldap:
class: phpbb_auth_provider_ldap class: phpbb\auth\provider\ldap
arguments: arguments:
- @dbal.conn - @dbal.conn
- @config - @config

10
phpBB/config/avatars.yml
View file

@ -1,6 +1,6 @@
services: services:
avatar.driver.gravatar: avatar.driver.gravatar:
class: phpbb_avatar_driver_gravatar class: phpbb\avatar\driver\gravatar
arguments: arguments:
- @config - @config
- %core.root_path% - %core.root_path%
@ -12,7 +12,7 @@ services:
- { name: avatar.driver } - { name: avatar.driver }
avatar.driver.local: avatar.driver.local:
class: phpbb_avatar_driver_local class: phpbb\avatar\driver\local
arguments: arguments:
- @config - @config
- %core.root_path% - %core.root_path%
@ -24,7 +24,7 @@ services:
- { name: avatar.driver } - { name: avatar.driver }
avatar.driver.remote: avatar.driver.remote:
class: phpbb_avatar_driver_remote class: phpbb\avatar\driver\remote
arguments: arguments:
- @config - @config
- %core.root_path% - %core.root_path%
@ -36,7 +36,7 @@ services:
- { name: avatar.driver } - { name: avatar.driver }
avatar.driver.upload: avatar.driver.upload:
class: phpbb_avatar_driver_upload class: phpbb\avatar\driver\upload
arguments: arguments:
- @config - @config
- %core.root_path% - %core.root_path%
@ -48,7 +48,7 @@ services:
- { name: avatar.driver } - { name: avatar.driver }
avatar.driver_collection: avatar.driver_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

16
phpBB/config/cron_tasks.yml
View file

@ -1,6 +1,6 @@
services: services:
cron.task.core.prune_all_forums: cron.task.core.prune_all_forums:
class: phpbb_cron_task_core_prune_all_forums class: phpbb\cron\task\core\prune_all_forums
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -12,7 +12,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.prune_forum: cron.task.core.prune_forum:
class: phpbb_cron_task_core_prune_forum class: phpbb\cron\task\core\prune_forum
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -24,7 +24,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.queue: cron.task.core.queue:
class: phpbb_cron_task_core_queue class: phpbb\cron\task\core\queue
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -35,7 +35,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.tidy_cache: cron.task.core.tidy_cache:
class: phpbb_cron_task_core_tidy_cache class: phpbb\cron\task\core\tidy_cache
arguments: arguments:
- @config - @config
- @cache.driver - @cache.driver
@ -45,7 +45,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.tidy_database: cron.task.core.tidy_database:
class: phpbb_cron_task_core_tidy_database class: phpbb\cron\task\core\tidy_database
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -56,7 +56,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.tidy_search: cron.task.core.tidy_search:
class: phpbb_cron_task_core_tidy_search class: phpbb\cron\task\core\tidy_search
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -70,7 +70,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.tidy_sessions: cron.task.core.tidy_sessions:
class: phpbb_cron_task_core_tidy_sessions class: phpbb\cron\task\core\tidy_sessions
arguments: arguments:
- @config - @config
- @user - @user
@ -80,7 +80,7 @@ services:
- { name: cron.task } - { name: cron.task }
cron.task.core.tidy_warnings: cron.task.core.tidy_warnings:
class: phpbb_cron_task_core_tidy_warnings class: phpbb\cron\task\core\tidy_warnings
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%

18
phpBB/config/feed.yml
View file

@ -1,20 +1,20 @@
services: services:
feed.helper: feed.helper:
class: phpbb_feed_helper class: phpbb\feed\helper
arguments: arguments:
- @config - @config
- @user - @user
- %core.root_path% - %core.root_path%
feed.factory: feed.factory:
class: phpbb_feed_factory class: phpbb\feed\factory
arguments: arguments:
- @service_container - @service_container
- @config - @config
- @dbal.conn - @dbal.conn
feed.forum: feed.forum:
class: phpbb_feed_forum class: phpbb\feed\forum
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -27,7 +27,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.forums: feed.forums:
class: phpbb_feed_forums class: phpbb\feed\forums
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -40,7 +40,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.news: feed.news:
class: phpbb_feed_news class: phpbb\feed\news
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -53,7 +53,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.overall: feed.overall:
class: phpbb_feed_overall class: phpbb\feed\overall
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -66,7 +66,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.topic: feed.topic:
class: phpbb_feed_topic class: phpbb\feed\topic
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -79,7 +79,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.topics: feed.topics:
class: phpbb_feed_topics class: phpbb\feed\topics
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper
@ -92,7 +92,7 @@ services:
- %core.php_ext% - %core.php_ext%
feed.topics_active: feed.topics_active:
class: phpbb_feed_topics_active class: phpbb\feed\topics_active
scope: prototype scope: prototype
arguments: arguments:
- @feed.helper - @feed.helper

10
phpBB/config/migrator.yml
View file

@ -1,6 +1,6 @@
services: services:
migrator: migrator:
class: phpbb_db_migrator class: phpbb\db\migrator
arguments: arguments:
- @config - @config
- @dbal.conn - @dbal.conn
@ -12,21 +12,21 @@ services:
- @migrator.tool_collection - @migrator.tool_collection
migrator.tool_collection: migrator.tool_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
- { name: service_collection, tag: migrator.tool } - { name: service_collection, tag: migrator.tool }
migrator.tool.config: migrator.tool.config:
class: phpbb_db_migration_tool_config class: phpbb\db\migration\tool\config
arguments: arguments:
- @config - @config
tags: tags:
- { name: migrator.tool } - { name: migrator.tool }
migrator.tool.module: migrator.tool.module:
class: phpbb_db_migration_tool_module class: phpbb\db\migration\tool\module
arguments: arguments:
- @dbal.conn - @dbal.conn
- @cache - @cache
@ -38,7 +38,7 @@ services:
- { name: migrator.tool } - { name: migrator.tool }
migrator.tool.permission: migrator.tool.permission:
class: phpbb_db_migration_tool_permission class: phpbb\db\migration\tool\permission
arguments: arguments:
- @dbal.conn - @dbal.conn
- @cache - @cache

38
phpBB/config/notifications.yml
View file

@ -1,20 +1,20 @@
services: services:
notification.type_collection: notification.type_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
- { name: service_collection, tag: notification.type } - { name: service_collection, tag: notification.type }
notification.method_collection: notification.method_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
- { name: service_collection, tag: notification.method } - { name: service_collection, tag: notification.method }
notification.type.approve_post: 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! scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -32,7 +32,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.approve_topic: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -50,7 +50,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.bookmark: notification.type.bookmark:
class: phpbb_notification_type_bookmark class: phpbb\notification\type\bookmark
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -68,7 +68,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.disapprove_post: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -86,7 +86,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.disapprove_topic: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -104,7 +104,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.pm: notification.type.pm:
class: phpbb_notification_type_pm class: phpbb\notification\type\pm
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -122,7 +122,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.post: notification.type.post:
class: phpbb_notification_type_post class: phpbb\notification\type\post
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -140,7 +140,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.post_in_queue: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -158,7 +158,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.quote: notification.type.quote:
class: phpbb_notification_type_quote class: phpbb\notification\type\quote
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -176,7 +176,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.report_pm: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -194,7 +194,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.report_pm_closed: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -212,7 +212,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.report_post: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -230,7 +230,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.report_post_closed: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -248,7 +248,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.topic: notification.type.topic:
class: phpbb_notification_type_topic class: phpbb\notification\type\topic
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -266,7 +266,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.type.topic_in_queue: 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! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -284,7 +284,7 @@ services:
- { name: notification.type } - { name: notification.type }
notification.method.email: notification.method.email:
class: phpbb_notification_method_email class: phpbb\notification\method\email
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader
@ -299,7 +299,7 @@ services:
- { name: notification.method } - { name: notification.method }
notification.method.jabber: notification.method.jabber:
class: phpbb_notification_method_jabber class: phpbb\notification\method\jabber
scope: prototype # scope MUST be prototype for this to work! scope: prototype # scope MUST be prototype for this to work!
arguments: arguments:
- @user_loader - @user_loader

74
phpBB/config/services.yml
View file

@ -9,17 +9,17 @@ imports:
services: services:
auth: auth:
class: phpbb_auth class: phpbb\auth\auth
avatar.manager: avatar.manager:
class: phpbb_avatar_manager class: phpbb\avatar\manager
arguments: arguments:
- @config - @config
- @avatar.driver_collection - @avatar.driver_collection
- @service_container - @service_container
cache: cache:
class: phpbb_cache_service class: phpbb\cache\service
arguments: arguments:
- @cache.driver - @cache.driver
- @config - @config
@ -31,10 +31,10 @@ services:
class: %cache.driver.class% class: %cache.driver.class%
cache.driver.install: cache.driver.install:
class: phpbb_cache_driver_file class: phpbb\cache\driver\file
class_loader: class_loader:
class: phpbb_class_loader class: phpbb\class_loader
arguments: arguments:
- phpbb_ - phpbb_
- %core.root_path%includes/ - %core.root_path%includes/
@ -44,7 +44,7 @@ services:
- [set_cache, [@cache.driver]] - [set_cache, [@cache.driver]]
class_loader.ext: class_loader.ext:
class: phpbb_class_loader class: phpbb\class_loader
arguments: arguments:
- phpbb_ext_ - phpbb_ext_
- %core.root_path%ext/ - %core.root_path%ext/
@ -54,20 +54,20 @@ services:
- [set_cache, [@cache.driver]] - [set_cache, [@cache.driver]]
config: config:
class: phpbb_config_db class: phpbb\config\db
arguments: arguments:
- @dbal.conn - @dbal.conn
- @cache.driver - @cache.driver
- %tables.config% - %tables.config%
config_text: config_text:
class: phpbb_config_db_text class: phpbb\config\db_text
arguments: arguments:
- @dbal.conn - @dbal.conn
- %tables.config_text% - %tables.config_text%
content.visibility: content.visibility:
class: phpbb_content_visibility class: phpbb\content_visibility
arguments: arguments:
- @auth - @auth
- @dbal.conn - @dbal.conn
@ -80,7 +80,7 @@ services:
- %tables.users% - %tables.users%
controller.helper: controller.helper:
class: phpbb_controller_helper class: phpbb\controller\helper
arguments: arguments:
- @template - @template
- @user - @user
@ -88,35 +88,35 @@ services:
- %core.php_ext% - %core.php_ext%
controller.resolver: controller.resolver:
class: phpbb_controller_resolver class: phpbb\controller\resolver
arguments: arguments:
- @user - @user
- @service_container - @service_container
- @style - @style
cron.task_collection: cron.task_collection:
class: phpbb_di_service_collection class: phpbb\di\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
- { name: service_collection, tag: cron.task } - { name: service_collection, tag: cron.task }
cron.manager: cron.manager:
class: phpbb_cron_manager class: phpbb\cron\manager
arguments: arguments:
- @cron.task_collection - @cron.task_collection
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
cron.lock_db: cron.lock_db:
class: phpbb_lock_db class: phpbb\lock\db
arguments: arguments:
- cron_lock - cron_lock
- @config - @config
- @dbal.conn - @dbal.conn
dispatcher: dispatcher:
class: phpbb_event_dispatcher class: phpbb\event\dispatcher
arguments: arguments:
- @service_container - @service_container
@ -126,12 +126,12 @@ services:
- [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
dbal.tools: dbal.tools:
class: phpbb_db_tools class: phpbb\db\tools
arguments: arguments:
- @dbal.conn - @dbal.conn
event.subscriber_loader: event.subscriber_loader:
class: phpbb_event_extension_subscriber_loader class: phpbb\event\extension_subscriber_loader
arguments: arguments:
- @dispatcher - @dispatcher
- @ext.manager - @ext.manager
@ -139,7 +139,7 @@ services:
- [load, []] - [load, []]
ext.manager: ext.manager:
class: phpbb_extension_manager class: phpbb\extension\manager
arguments: arguments:
- @service_container - @service_container
- @dbal.conn - @dbal.conn
@ -151,7 +151,7 @@ services:
- @cache.driver - @cache.driver
ext.finder: ext.finder:
class: phpbb_extension_finder class: phpbb\extension\finder
arguments: arguments:
- @ext.manager - @ext.manager
- @filesystem - @filesystem
@ -161,16 +161,16 @@ services:
- _ext_finder - _ext_finder
filesystem: filesystem:
class: phpbb_filesystem class: phpbb\filesystem
groupposition.legend: groupposition.legend:
class: phpbb_groupposition_legend class: phpbb\groupposition\legend
arguments: arguments:
- @dbal.conn - @dbal.conn
- @user - @user
groupposition.teampage: groupposition.teampage:
class: phpbb_groupposition_teampage class: phpbb\groupposition\teampage
arguments: arguments:
- @dbal.conn - @dbal.conn
- @user - @user
@ -183,14 +183,14 @@ services:
- @controller.resolver - @controller.resolver
hook_finder: hook_finder:
class: phpbb_hook_finder class: phpbb\hook\finder
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
- @cache.driver - @cache.driver
kernel_request_subscriber: kernel_request_subscriber:
class: phpbb_event_kernel_request_subscriber class: phpbb\event\kernel_request_subscriber
arguments: arguments:
- @ext.finder - @ext.finder
- %core.root_path% - %core.root_path%
@ -199,7 +199,7 @@ services:
- { name: kernel.event_subscriber } - { name: kernel.event_subscriber }
kernel_exception_subscriber: kernel_exception_subscriber:
class: phpbb_event_kernel_exception_subscriber class: phpbb\event\kernel_exception_subscriber
arguments: arguments:
- @template - @template
- @user - @user
@ -207,12 +207,12 @@ services:
- { name: kernel.event_subscriber } - { name: kernel.event_subscriber }
kernel_terminate_subscriber: kernel_terminate_subscriber:
class: phpbb_event_kernel_terminate_subscriber class: phpbb\event\kernel_terminate_subscriber
tags: tags:
- { name: kernel.event_subscriber } - { name: kernel.event_subscriber }
log: log:
class: phpbb_log class: phpbb\log\log
arguments: arguments:
- @dbal.conn - @dbal.conn
- @user - @user
@ -224,7 +224,7 @@ services:
- %tables.log% - %tables.log%
notification_manager: notification_manager:
class: phpbb_notification_manager class: phpbb\notification\manager
arguments: arguments:
- @notification.type_collection - @notification.type_collection
- @notification.method_collection - @notification.method_collection
@ -240,10 +240,10 @@ services:
- %tables.user_notifications% - %tables.user_notifications%
request: request:
class: phpbb_request class: phpbb\request\request
style: style:
class: phpbb_style class: phpbb\style\style
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -254,20 +254,20 @@ services:
- @template - @template
style.resource_locator: style.resource_locator:
class: phpbb_style_resource_locator class: phpbb\style\resource_locator
style.path_provider_ext: style.path_provider_ext:
class: phpbb_style_extension_path_provider class: phpbb\style\extension_path_provider
arguments: arguments:
- @ext.manager - @ext.manager
- @style.path_provider - @style.path_provider
- %core.root_path% - %core.root_path%
style.path_provider: style.path_provider:
class: phpbb_style_path_provider class: phpbb\style\path_provider
template: template:
class: phpbb_template_twig class: phpbb\template\twig\twig
arguments: arguments:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
@ -278,13 +278,13 @@ services:
- %core.adm_relative_path% - %core.adm_relative_path%
template_context: template_context:
class: phpbb_template_context class: phpbb\template\context
user: user:
class: phpbb_user class: phpbb\user
user_loader: user_loader:
class: phpbb_user_loader class: phpbb\user_loader
arguments: arguments:
- @dbal.conn - @dbal.conn
- %core.root_path% - %core.root_path%

4
phpBB/develop/create_schema_files.php
View file

@ -986,7 +986,7 @@ function get_schema_struct()
), ),
); );
$schema_data['phpbb_config'] = array( $schema_data['\phpbb\config\config'] = array(
'COLUMNS' => array( 'COLUMNS' => array(
'config_name' => array('VCHAR', ''), 'config_name' => array('VCHAR', ''),
'config_value' => array('VCHAR_UNI', ''), '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( 'COLUMNS' => array(
'log_id' => array('UINT', NULL, 'auto_increment'), 'log_id' => array('UINT', NULL, 'auto_increment'),
'log_type' => array('TINT:4', 0), 'log_type' => array('TINT:4', 0),

4
phpBB/develop/mysql_upgrader.php
View file

@ -453,7 +453,7 @@ function get_schema_struct()
), ),
); );
$schema_data['phpbb_config'] = array( $schema_data['\phpbb\config\config'] = array(
'COLUMNS' => array( 'COLUMNS' => array(
'config_name' => array('VCHAR', ''), 'config_name' => array('VCHAR', ''),
'config_value' => array('VCHAR_UNI', ''), '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( 'COLUMNS' => array(
'log_id' => array('UINT', NULL, 'auto_increment'), 'log_id' => array('UINT', NULL, 'auto_increment'),
'log_type' => array('TINT:4', 0), 'log_type' => array('TINT:4', 0),

4
phpBB/download/file.php
View file

@ -50,9 +50,9 @@ if (isset($_GET['avatar']))
require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
// Setup class loader first // 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->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(); $phpbb_class_loader_ext->register();
// Set up container // Set up container

2
phpBB/includes/acp/acp_attachments.php
View file

@ -1472,7 +1472,7 @@ class acp_attachments
$ip_list = array_unique(explode("\n", $ips)); $ip_list = array_unique(explode("\n", $ips));
$ip_list_log = implode(', ', $ip_list); $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(); $iplist = array();
$hostlist = array(); $hostlist = array();

2
phpBB/includes/acp/acp_bbcodes.php
View file

@ -275,7 +275,7 @@ class acp_bbcodes
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $user->lang['BBCODE_DELETED'], 'MESSAGE_TEXT' => $user->lang['BBCODE_DELETED'],

2
phpBB/includes/acp/acp_board.php
View file

@ -679,7 +679,7 @@ class acp_board
foreach ($auth_providers as $key => $value) foreach ($auth_providers as $key => $value)
{ {
if (!($value instanceof phpbb_auth_provider_provider_interface)) if (!($value instanceof \phpbb\auth\provider\provider_interface))
{ {
continue; continue;
} }

2
phpBB/includes/acp/acp_bots.php
View file

@ -355,7 +355,7 @@ class acp_bots
if ($request->is_ajax() && ($action == 'activate' || $action == 'deactivate')) if ($request->is_ajax() && ($action == 'activate' || $action == 'deactivate'))
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'text' => $user->lang['BOT_' . (($action == 'activate') ? 'DE' : '') . 'ACTIVATE'], 'text' => $user->lang['BOT_' . (($action == 'activate') ? 'DE' : '') . 'ACTIVATE'],
)); ));

2
phpBB/includes/acp/acp_database.php
View file

@ -28,7 +28,7 @@ class acp_database
global $cache, $db, $user, $auth, $template, $table_prefix; global $cache, $db, $user, $auth, $template, $table_prefix;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; 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'); $user->add_lang('acp/database');

20
phpBB/includes/acp/acp_extensions.php
View file

@ -58,13 +58,13 @@ class acp_extensions
// If they've specified an extension, let's load the metadata manager and validate it. // If they've specified an extension, let's load the metadata manager and validate it.
if ($ext_name) 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 try
{ {
$md_manager->get_metadata('all'); $md_manager->get_metadata('all');
} }
catch(phpbb_extension_exception $e) catch(\phpbb\extension\exception $e)
{ {
trigger_error($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)); $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)); $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 * @param $phpbb_extension_manager An instance of the extension manager
* @return null * @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) foreach ($phpbb_extension_manager->all_enabled() as $name => $location)
{ {
@ -236,7 +236,7 @@ class acp_extensions
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name), 'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
)); ));
} }
catch(phpbb_extension_exception $e) catch(\phpbb\extension\exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $this->template->assign_block_vars('disabled', array(
'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), '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 * @param $phpbb_extension_manager An instance of the extension manager
* @return null * @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) foreach ($phpbb_extension_manager->all_disabled() as $name => $location)
{ {
@ -270,7 +270,7 @@ class acp_extensions
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name), 'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
)); ));
} }
catch(phpbb_extension_exception $e) catch(\phpbb\extension\exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $this->template->assign_block_vars('disabled', array(
'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), '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 * @param $phpbb_extension_manager An instance of the extension manager
* @return null * @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()); $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 . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name), 'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
)); ));
} }
catch(phpbb_extension_exception $e) catch(\phpbb\extension\exception $e)
{ {
$this->template->assign_block_vars('disabled', array( $this->template->assign_block_vars('disabled', array(
'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e), 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $e),

2
phpBB/includes/acp/acp_forums.php
View file

@ -269,7 +269,7 @@ class acp_forums
if ($request->is_ajax()) 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))); $json_response->send(array('success' => ($move_forum_name !== false)));
} }

12
phpBB/includes/acp/acp_groups.php
View file

@ -324,7 +324,7 @@ class acp_groups
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix // 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; 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); trigger_error($user->lang($exception->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -919,7 +919,7 @@ class acp_groups
break; 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); 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()) 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)); $json_response->send(array('success' => true));
} }
@ -961,7 +961,7 @@ class acp_groups
$template->assign_block_vars('legend', array( $template->assign_block_vars('legend', array(
'GROUP_NAME' => $group_name, 'GROUP_NAME' => $group_name,
'GROUP_COLOUR' => ($row['group_colour']) ? '#' . $row['group_colour'] : '', '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}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'], 'U_MOVE_DOWN' => "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
'U_MOVE_UP' => "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'], 'U_MOVE_UP' => "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'],
@ -1004,7 +1004,7 @@ class acp_groups
if ($row['group_id']) if ($row['group_id'])
{ {
$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; $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 else
{ {

6
phpBB/includes/acp/acp_icons.php
View file

@ -338,7 +338,7 @@ class acp_icons
$image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); $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... // 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_image = request_var('add_image', '');
$add_code = utf8_normalize_nfc(request_var('add_code', '', true)); $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_width[$add_image] = request_var('add_width', 0);
$image_height[$add_image] = request_var('add_height', 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; $image_display_on_posting[$add_image] = 1;
} }
@ -785,7 +785,7 @@ class acp_icons
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $notice, 'MESSAGE_TEXT' => $notice,

4
phpBB/includes/acp/acp_language.php
View file

@ -161,7 +161,7 @@ class acp_language
'method' => $method) '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( $template->assign_vars(array(
'S_UPLOAD' => true, '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); 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) if (!$lang_id || !$entry_value)
{ {

4
phpBB/includes/acp/acp_logs.php
View file

@ -35,8 +35,8 @@ class acp_logs
$forum_id = request_var('f', 0); $forum_id = request_var('f', 0);
$topic_id = request_var('t', 0); $topic_id = request_var('t', 0);
$start = request_var('start', 0); $start = request_var('start', 0);
$deletemark = $request->variable('delmarked', 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); $deleteall = $request->variable('delall', false, false, \phpbb\request\request_interface::POST);
$marked = request_var('mark', array(0)); $marked = request_var('mark', array(0));
// Sort keys // Sort keys

2
phpBB/includes/acp/acp_modules.php
View file

@ -375,7 +375,7 @@ class acp_modules
{ {
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang('ERROR'), 'MESSAGE_TITLE' => $user->lang('ERROR'),
'MESSAGE_TEXT' => implode('<br />', $errors), 'MESSAGE_TEXT' => implode('<br />', $errors),

10
phpBB/includes/acp/acp_permissions.php
View file

@ -676,7 +676,7 @@ class acp_permissions
list($ug_id, ) = each($psubmit); list($ug_id, ) = each($psubmit);
list($forum_id, ) = each($psubmit[$ug_id]); 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])) if (empty($settings) || empty($settings[$ug_id]) || empty($settings[$ug_id][$forum_id]))
{ {
trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING); trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING);
@ -685,7 +685,7 @@ class acp_permissions
$auth_settings = $settings[$ug_id][$forum_id]; $auth_settings = $settings[$ug_id][$forum_id];
// Do we have a role we want to set? // 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; $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? // 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); 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_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_roles = $request->variable('role', array(0 => array(0 => 0)), false, \phpbb\request\request_interface::POST);
$ug_ids = $forum_ids = array(); $ug_ids = $forum_ids = array();
// We need to go through the auth settings // We need to go through the auth settings
@ -1100,7 +1100,7 @@ class acp_permissions
{ {
if ($user_id != $user->data['user_id']) if ($user_id != $user->data['user_id'])
{ {
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($userdata); $auth2->acl($userdata);
$auth_setting = $auth2->acl_get($permission); $auth_setting = $auth2->acl_get($permission);
} }

8
phpBB/includes/acp/acp_profile.php
View file

@ -245,7 +245,7 @@ class acp_profile
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response(); $json_response = new \phpbb\json_response();
$json_response->send(array( $json_response->send(array(
'text' => $user->lang('DEACTIVATE'), 'text' => $user->lang('DEACTIVATE'),
)); ));
@ -277,7 +277,7 @@ class acp_profile
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response(); $json_response = new \phpbb\json_response();
$json_response->send(array( $json_response->send(array(
'text' => $user->lang('ACTIVATE'), 'text' => $user->lang('ACTIVATE'),
)); ));
@ -510,7 +510,7 @@ class acp_profile
$cp->vars['field_default_value_month'] = $now['mon']; $cp->vars['field_default_value_month'] = $now['mon'];
$cp->vars['field_default_value_year'] = $now['year']; $cp->vars['field_default_value_year'] = $now['year'];
$var = 'now'; $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 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_month'] = request_var('field_default_value_month', 0);
$cp->vars['field_default_value_year'] = request_var('field_default_value_year', 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']); $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 else
{ {

2
phpBB/includes/acp/acp_ranks.php
View file

@ -125,7 +125,7 @@ class acp_ranks
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $user->lang['RANK_REMOVED'], 'MESSAGE_TEXT' => $user->lang['RANK_REMOVED'],

4
phpBB/includes/acp/acp_users.php
View file

@ -1604,7 +1604,7 @@ class acp_users
|| $user_row['user_allow_viewonline'] && !$sql_ary['user_allow_viewonline']) || $user_row['user_allow_viewonline'] && !$sql_ary['user_allow_viewonline'])
{ {
// We also need to check if the user has the permission to cloak. // 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); $user_auth->acl($user_row);
$session_sql_ary = array( $session_sql_ary = array(
@ -1742,7 +1742,7 @@ class acp_users
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix // 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) if ($submit)
{ {

4
phpBB/includes/acp/auth.php
View file

@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
* ACP Permission/Auth class * ACP Permission/Auth class
* @package phpBB3 * @package phpBB3
*/ */
class auth_admin extends phpbb_auth class auth_admin extends \phpbb\auth\auth
{ {
/** /**
* Init auth settings * Init auth settings
@ -130,7 +130,7 @@ class auth_admin extends phpbb_auth
{ {
if ($user->data['user_id'] != $userdata['user_id']) if ($user->data['user_id'] != $userdata['user_id'])
{ {
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($userdata); $auth2->acl($userdata);
} }
else else

8
phpBB/includes/bbcode.php
View file

@ -132,10 +132,10 @@ class bbcode
{ {
$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
$style_resource_locator = new phpbb_style_resource_locator(); $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); $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); $template = new \phpbb\template\twig\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 = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
$style->set_style(); $style->set_style();
$template->set_filenames(array('bbcode.html' => 'bbcode.html')); $template->set_filenames(array('bbcode.html' => 'bbcode.html'));
$this->template_filename = $template->get_source_file_for_handle('bbcode.html'); $this->template_filename = $template->get_source_file_for_handle('bbcode.html');

2
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View file

@ -140,7 +140,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
$config_old = $config; $config_old = $config;
$config = new phpbb_config(array()); $config = new \phpbb\config\config(array());
foreach ($config_old as $key => $value) foreach ($config_old as $key => $value)
{ {
$config->set($key, $value); $config->set($key, $value);

4
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
View file

@ -112,7 +112,7 @@ class phpbb_captcha_qa
{ {
global $db; 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); return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
} }
@ -295,7 +295,7 @@ class phpbb_captcha_qa
{ {
global $db; 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); $tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);

82
phpBB/includes/functions.php
View file

@ -26,13 +26,13 @@ if (!defined('IN_PHPBB'))
function set_var(&$result, $var, $type, $multibyte = false) function set_var(&$result, $var, $type, $multibyte = false)
{ {
// no need for dependency injection here, if you have the object, call the method yourself! // 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); $type_cast_helper->set_var($result, $var, $type, $multibyte);
} }
/** /**
* Wrapper function of phpbb_request::variable which exists for backwards compatability. * 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 * See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for
* documentation of this function's use. * documentation of this function's use.
* *
* @deprecated * @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 * 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") * 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". * 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 * 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). * 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. * @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. * 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 * @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 * 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 * @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. * \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 \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 * 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 * 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 * @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. * 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. // the only real code is the function call which maps this function to a method.
static $static_request = null; static $static_request = null;
if ($request instanceof phpbb_request_request_interface) if ($request instanceof \phpbb\request\request_interface)
{ {
$static_request = $request; $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 // false param: enable super globals, so the created request class does not
// make super globals inaccessible everywhere outside this function. // 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 * @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; static $config = null;
@ -142,7 +142,7 @@ function set_config($config_name, $config_value, $is_dynamic = false, phpbb_conf
* *
* @deprecated * @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; static $config = null;
@ -1067,12 +1067,12 @@ function phpbb_clean_path($path)
else else
{ {
// The container is not yet loaded, use a new instance // 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; global $phpbb_root_path, $phpEx;
require($phpbb_root_path . 'includes/filesystem.' . $phpEx); require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
} }
$phpbb_filesystem = new phpbb_filesystem(); $phpbb_filesystem = new \phpbb\filesystem();
} }
return $phpbb_filesystem->clean_path($path); return $phpbb_filesystem->clean_path($path);
@ -1253,7 +1253,7 @@ function tz_select($default = '', $truncate = false)
/** /**
* Options to pick a timezone and date/time * 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 string $default A timezone to select
* @param boolean $truncate Shall we truncate the options text * @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) foreach ($unsorted_timezones as $timezone)
{ {
$tz = new DateTimeZone($timezone); $tz = new DateTimeZone($timezone);
$dt = new phpbb_datetime($user, 'now', $tz); $dt = new \phpbb\datetime($user, 'now', $tz);
$offset = $dt->getOffset(); $offset = $dt->getOffset();
$current_time = $dt->format($user->lang['DATETIME_FORMAT'], true); $current_time = $dt->format($user->lang['DATETIME_FORMAT'], true);
$offset_string = phpbb_format_timezone_offset($offset); $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']) 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(); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
unset($tracking_topics['tf']); 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); $tracking_topics['l'] = base_convert($post_time - $config['board_startdate'], 10, 36);
$user->set_cookie('track', tracking_serialize($tracking_topics), $post_time + 31536000); $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); 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']) 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(); $tracking = ($tracking) ? tracking_unserialize($tracking) : array();
foreach ($forum_id as $f_id) 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); $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); 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']) 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(); $tracking = ($tracking) ? tracking_unserialize($tracking) : array();
$topic_id36 = base_convert($topic_id, 10, 36); $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 // 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... // 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); //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); $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; return;
@ -1788,7 +1788,7 @@ function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_lis
if (!isset($tracking_topics) || !sizeof($tracking_topics)) 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(); $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']) 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(); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
if (!$user->data['is_registered']) if (!$user->data['is_registered'])
@ -3094,7 +3094,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
return false; 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) if ($check && $confirm)
{ {
@ -3171,7 +3171,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id; $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( $json_response->send(array(
'MESSAGE_BODY' => $template->assign_display('body'), 'MESSAGE_BODY' => $template->assign_display('body'),
'MESSAGE_TITLE' => (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title], '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; global $refresh_data;
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $msg_title, 'MESSAGE_TITLE' => $msg_title,
'MESSAGE_TEXT' => $msg_text, 'MESSAGE_TEXT' => $msg_text,
@ -4896,7 +4896,7 @@ function phpbb_http_login($param)
$username = null; $username = null;
foreach ($username_keys as $k) 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)); $username = htmlspecialchars_decode($request->server($k));
break; break;
@ -4906,7 +4906,7 @@ function phpbb_http_login($param)
$password = null; $password = null;
foreach ($password_keys as $k) 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)); $password = htmlspecialchars_decode($request->server($k));
break; break;
@ -5007,13 +5007,13 @@ function phpbb_quoteattr($data, $entities = null)
* *
* sid is always omitted. * 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 * @param array $exclude A list of variable names that should not be forwarded
* @return string HTML with hidden fields * @return string HTML with hidden fields
*/ */
function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) 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 = ''; $hidden = '';
foreach ($names as $name) 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 // here. To avoid exposing cookies, skip variables that are
// overwritten somewhere other than GET entirely. // overwritten somewhere other than GET entirely.
$value = $request->variable($name, '', true); $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) if ($value === $get_value)
{ {
$escaped_value = phpbb_quoteattr($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_offset = 'GMT' . phpbb_format_timezone_offset($dt->getOffset());
$timezone_name = $user->timezone->getName(); $timezone_name = $user->timezone->getName();
if (isset($user->lang['timezones'][$timezone_name])) 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. * This function supports hooks.
*/ */
function phpbb_user_session_handler() 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 * @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 // This function is meant to sanitize the global input arrays
$sanitizer = function(&$value, $key) { $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); $type_cast_helper->set_var($value, $value, gettype($value), true);
}; };

10
phpBB/includes/functions_admin.php
View file

@ -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 * via admin_permissions. Changes of usernames and group names
* must be carried through for the moderators table. * must be carried through for the moderators table.
* *
* @param phpbb_db_driver $db Database connection * @param \phpbb\db\driver\driver $db Database connection
* @param phpbb_cache_driver_driver_interface Cache driver * @param \phpbb\cache\driver\driver_interface Cache driver
* @param phpbb_auth $auth Authentication object * @param \phpbb\auth\auth $auth Authentication object
* @return null * @return null
*/ */
function phpbb_cache_moderators($db, $cache, $auth) 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. * Removes moderators and administrators from foe lists.
* *
* @param phpbb_db_driver $db Database connection * @param \phpbb\db\driver\driver $db Database connection
* @param phpbb_auth $auth Authentication object * @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 $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 * @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
* @return null * @return null

14
phpBB/includes/functions_container.php
View file

@ -26,7 +26,7 @@ if (!defined('IN_PHPBB'))
* Used to bootstrap the container. * Used to bootstrap the container.
* *
* @param string $config_file * @param string $config_file
* @return phpbb_db_driver * @return \phpbb\db\driver\driver
*/ */
function phpbb_bootstrap_db_connection($config_file) 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) 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 = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
$container->setParameter('core.root_path', $phpbb_root_path); $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); $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path);
// Now pass the enabled extension paths into the ext compiler extension // 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 // Create the final container to be compiled and cached
$container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); $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( return phpbb_create_dumped_container_unless_debug(
$config_file, $config_file,
array( array(
new phpbb_di_extension_config($config_file), new \phpbb\di\extension\config($config_file),
new phpbb_di_extension_core($phpbb_root_path), new \phpbb\di\extension\core($phpbb_root_path),
), ),
array( array(
new phpbb_di_pass_collection_pass(), new \phpbb\di\pass\collection_pass(),
new phpbb_di_pass_kernel_pass(), new \phpbb\di\pass\kernel_pass(),
), ),
$phpbb_root_path, $phpbb_root_path,
$php_ext $php_ext

8
phpBB/includes/functions_database_helper.php
View file

@ -22,14 +22,14 @@ if (!defined('IN_PHPBB'))
* *
* The only supported table is bookmarks. * 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 $table Table on which to perform the update
* @param string $column Column whose values to change * @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed * @param array $from_values An array of values that should be changed
* @param int $to_value The new value * @param int $to_value The new value
* @return null * @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 $sql = "SELECT $column, user_id
FROM $table 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. * 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 $table Table on which to perform the update
* @param string $column Column whose values to change * @param string $column Column whose values to change
* @param array $from_values An array of values that should be changed * @param array $from_values An array of values that should be changed
* @param int $to_value The new value * @param int $to_value The new value
* @return null * @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 $sql = "SELECT $column, user_id, notify_status
FROM $table FROM $table

20
phpBB/includes/functions_display.php
View file

@ -71,7 +71,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED'] 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED']
); );
$json_response = new phpbb_json_response(); $json_response = new \phpbb\json_response();
$json_response->send($data); $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']) 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(); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
if (!$user->data['is_registered']) 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_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED'] 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED']
); );
$json_response = new phpbb_json_response(); $json_response = new \phpbb\json_response();
$json_response->send($data); $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 ($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&amp;start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
@ -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 ($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&amp;start=$start"); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); $message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
@ -1272,8 +1272,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
} }
else else
{ {
if ((isset($_GET['unwatch']) && $request->variable('unwatch', '', 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)) (isset($_GET['watch']) && $request->variable('watch', '', false, \phpbb\request\request_interface::GET) == $mode))
{ {
login_box(); 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) 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); 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) 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); return phpbb_get_avatar($row, $alt, $ignore_config);
} }
/** /**
* Get avatar * 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 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 * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
* *

12
phpBB/includes/functions_download.php
View file

@ -596,7 +596,7 @@ function phpbb_parse_range_request($request_array, $filesize)
/** /**
* Increments the download count of all provided attachments * 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 * @param array|int $ids The attach_id of each attachment
* *
* @return null * @return null
@ -617,8 +617,8 @@ function phpbb_increment_downloads($db, $ids)
/** /**
* Handles authentication when downloading attachments from a post or topic * Handles authentication when downloading attachments from a post or topic
* *
* @param phpbb_db_driver $db The database object * @param \phpbb\db\driver\driver $db The database object
* @param phpbb_auth $auth The authentication object * @param \phpbb\auth\auth $auth The authentication object
* @param int $topic_id The id of the topic that we are downloading from * @param int $topic_id The id of the topic that we are downloading from
* *
* @return null * @return null
@ -651,8 +651,8 @@ function phpbb_download_handle_forum_auth($db, $auth, $topic_id)
/** /**
* Handles authentication when downloading attachments from PMs * Handles authentication when downloading attachments from PMs
* *
* @param phpbb_db_driver $db The database object * @param \phpbb\db\driver\driver $db The database object
* @param phpbb_auth $auth The authentication object * @param \phpbb\auth\auth $auth The authentication object
* @param int $user_id The user id * @param int $user_id The user id
* @param int $msg_id The id of the PM that we are downloading from * @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 * 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 $user_id The user id
* @param int $msg_id The id of the PM that we are downloading from * @param int $msg_id The id of the PM that we are downloading from
* *

54
phpBB/includes/functions_install.php
View file

@ -28,7 +28,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'firebird', 'SCHEMA' => 'firebird',
'MODULE' => 'interbase', 'MODULE' => 'interbase',
'DELIM' => ';;', 'DELIM' => ';;',
'DRIVER' => 'phpbb_db_driver_firebird', 'DRIVER' => '\phpbb\db\driver\firebird',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,
), ),
@ -39,7 +39,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'mysql_41', 'SCHEMA' => 'mysql_41',
'MODULE' => 'mysqli', 'MODULE' => 'mysqli',
'DELIM' => ';', 'DELIM' => ';',
'DRIVER' => 'phpbb_db_driver_mysqli', 'DRIVER' => '\phpbb\db\driver\mysqli',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
), ),
@ -48,7 +48,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'mysql', 'SCHEMA' => 'mysql',
'MODULE' => 'mysql', 'MODULE' => 'mysql',
'DELIM' => ';', 'DELIM' => ';',
'DRIVER' => 'phpbb_db_driver_mysql', 'DRIVER' => '\phpbb\db\driver\mysql',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
), ),
@ -57,7 +57,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'mssql', 'MODULE' => 'mssql',
'DELIM' => 'GO', 'DELIM' => 'GO',
'DRIVER' => 'phpbb_db_driver_mssql', 'DRIVER' => '\phpbb\db\driver\mssql',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
), ),
@ -66,7 +66,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'odbc', 'MODULE' => 'odbc',
'DELIM' => 'GO', 'DELIM' => 'GO',
'DRIVER' => 'phpbb_db_driver_mssql_odbc', 'DRIVER' => '\phpbb\db\driver\mssql_odbc',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
), ),
@ -75,7 +75,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'sqlsrv', 'MODULE' => 'sqlsrv',
'DELIM' => 'GO', 'DELIM' => 'GO',
'DRIVER' => 'phpbb_db_driver_mssqlnative', 'DRIVER' => '\phpbb\db\driver\mssqlnative',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,
), ),
@ -84,7 +84,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'oracle', 'SCHEMA' => 'oracle',
'MODULE' => 'oci8', 'MODULE' => 'oci8',
'DELIM' => '/', 'DELIM' => '/',
'DRIVER' => 'phpbb_db_driver_oracle', 'DRIVER' => '\phpbb\db\driver\oracle',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,
), ),
@ -93,7 +93,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'postgres', 'SCHEMA' => 'postgres',
'MODULE' => 'pgsql', 'MODULE' => 'pgsql',
'DELIM' => ';', 'DELIM' => ';',
'DRIVER' => 'phpbb_db_driver_postgres', 'DRIVER' => '\phpbb\db\driver\postgres',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
), ),
@ -102,7 +102,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'SCHEMA' => 'sqlite', 'SCHEMA' => 'sqlite',
'MODULE' => 'sqlite', 'MODULE' => 'sqlite',
'DELIM' => ';', 'DELIM' => ';',
'DRIVER' => 'phpbb_db_driver_sqlite', 'DRIVER' => '\phpbb\db\driver\sqlite',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,
), ),
@ -184,7 +184,7 @@ function dbms_select($default = '', $only_20x_options = false)
*/ */
function get_tables(&$db) function get_tables(&$db)
{ {
$db_tools = new phpbb_db_tools($db); $db_tools = new \phpbb\db\tools($db);
return $db_tools->sql_list_tables(); 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); $db->sql_return_on_error(true);
// Check that we actually have a database name before going any further..... // 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']; $error[] = $lang['INST_ERR_DB_NO_NAME'];
return false; 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 // 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']; $error[] = $lang['INST_ERR_DB_FORUM_PATH'];
return false; 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 // Check the prefix length to ensure that index names are not too long and does not contain invalid characters
switch ($dbms_details['DRIVER']) switch ($dbms_details['DRIVER'])
{ {
case 'phpbb_db_driver_mysql': case '\phpbb\db\driver\mysql':
case 'phpbb_db_driver_mysqli': case '\phpbb\db\driver\mysqli':
if (strspn($table_prefix, '-./\\') !== 0) if (strspn($table_prefix, '-./\\') !== 0)
{ {
$error[] = $lang['INST_ERR_PREFIX_INVALID']; $error[] = $lang['INST_ERR_PREFIX_INVALID'];
@ -232,22 +232,22 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
// no break; // no break;
case 'phpbb_db_driver_postgres': case '\phpbb\db\driver\postgres':
$prefix_length = 36; $prefix_length = 36;
break; break;
case 'phpbb_db_driver_mssql': case '\phpbb\db\driver\mssql':
case 'phpbb_db_driver_mssql_odbc': case '\phpbb\db\driver\mssql_odbc':
case 'phpbb_db_driver_mssqlnative': case '\phpbb\db\driver\mssqlnative':
$prefix_length = 90; $prefix_length = 90;
break; break;
case 'phpbb_db_driver_sqlite': case '\phpbb\db\driver\sqlite':
$prefix_length = 200; $prefix_length = 200;
break; break;
case 'phpbb_db_driver_firebird': case '\phpbb\db\driver\firebird':
case 'phpbb_db_driver_oracle': case '\phpbb\db\driver\oracle':
$prefix_length = 6; $prefix_length = 6;
break; 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 // Make sure that the user has selected a sensible DBAL for the DBMS actually installed
switch ($dbms_details['DRIVER']) 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', '<')) if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<'))
{ {
$error[] = $lang['INST_ERR_DB_NO_MYSQLI']; $error[] = $lang['INST_ERR_DB_NO_MYSQLI'];
} }
break; break;
case 'phpbb_db_driver_sqlite': case '\phpbb\db\driver\sqlite':
if (version_compare(sqlite_libversion(), '2.8.2', '<')) if (version_compare(sqlite_libversion(), '2.8.2', '<'))
{ {
$error[] = $lang['INST_ERR_DB_NO_SQLITE']; $error[] = $lang['INST_ERR_DB_NO_SQLITE'];
} }
break; 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 // 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')) 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; break;
case 'phpbb_db_driver_oracle': case '\phpbb\db\driver\oracle':
if ($unicode_check) if ($unicode_check)
{ {
$sql = "SELECT * $sql = "SELECT *
@ -402,7 +402,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
} }
break; break;
case 'phpbb_db_driver_postgres': case '\phpbb\db\driver\postgres':
if ($unicode_check) if ($unicode_check)
{ {
$sql = "SHOW server_encoding;"; $sql = "SHOW server_encoding;";
@ -507,7 +507,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test
'adm_relative_path' => 'adm/', 'adm_relative_path' => 'adm/',
'acm_type' => 'phpbb_cache_driver_file', 'acm_type' => '\phpbb\cache\driver\file',
); );
foreach ($config_data_array as $key => $value) foreach ($config_data_array as $key => $value)

18
phpBB/includes/functions_messenger.php
View file

@ -27,7 +27,7 @@ class messenger
var $mail_priority = MAIL_NORMAL_PRIORITY; var $mail_priority = MAIL_NORMAL_PRIORITY;
var $use_queue = true; var $use_queue = true;
/** @var phpbb_template */ /** @var \phpbb\template\template */
protected $template; protected $template;
var $eol = "\n"; var $eol = "\n";
@ -645,12 +645,12 @@ class messenger
{ {
global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager; global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
if ($this->template instanceof phpbb_template) if ($this->template instanceof \phpbb\template\template)
{ {
return; 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; 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(); $lock->acquire();
// avoid races, check file existence once // avoid races, check file existence once
@ -887,7 +887,7 @@ class queue
return; return;
} }
$lock = new phpbb_lock_flock($this->cache_file); $lock = new \phpbb\lock\flock($this->cache_file);
$lock->acquire(); $lock->acquire();
if (file_exists($this->cache_file)) 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']); $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. // 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; global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/error_collector.' . $phpEx); include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
} }
$collector = new phpbb_error_collector; $collector = new \phpbb\error_collector;
$collector->install(); $collector->install();
$smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20); $smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20);
$collector->uninstall(); $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 // Reference: http://bugs.php.net/bug.php?id=15841
$headers = implode($eol, $headers); $headers = implode($eol, $headers);
if (!class_exists('phpbb_error_collector')) if (!class_exists('\phpbb\error_collector'))
{ {
include($phpbb_root_path . 'includes/error_collector.' . $phpEx); include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
} }
$collector = new phpbb_error_collector; $collector = new \phpbb\error_collector;
$collector->install(); $collector->install();
// On some PHP Versions mail() *may* fail if there are newlines within the subject. // On some PHP Versions mail() *may* fail if there are newlines within the subject.

2
phpBB/includes/functions_privmsgs.php
View file

@ -343,7 +343,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
$userdata = $db->sql_fetchrow($result); $userdata = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($userdata); $auth2->acl($userdata);
if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_')) if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_'))

2
phpBB/includes/functions_upload.php
View file

@ -713,7 +713,7 @@ class fileupload
} }
$this->common_checks($file); $this->common_checks($file);
$request->overwrite('local', $upload, phpbb_request_request_interface::FILES); $request->overwrite('local', $upload, \phpbb\request\request_interface::FILES);
return $file; return $file;
} }

16
phpBB/includes/functions_url_matcher.php
View file

@ -22,13 +22,13 @@ if (!defined('IN_PHPBB'))
/** /**
* Create a new UrlMatcher class and dump it into the cache file * 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 RequestContext $context Symfony RequestContext object
* @param string $root_path Root path * @param string $root_path Root path
* @param string $php_ext PHP extension * @param string $php_ext PHP extension
* @return null * @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')) 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 * 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 $root_path Root path
* @param string $php_ext PHP extension * @param string $php_ext PHP extension
* @return null * @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(); $routes = $provider->import_paths_from_finder($finder)->find();
$dumper = new PhpMatcherDumper($routes); $dumper = new PhpMatcherDumper($routes);
$cached_url_matcher_dump = $dumper->dump(array( $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 * 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 * @param RequestContext $context Symfony RequestContext object
* @return UrlMatcher * @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(); $routes = $provider->import_paths_from_finder($finder)->find();
return new UrlMatcher($routes, $context); return new UrlMatcher($routes, $context);
} }

32
phpBB/includes/functions_user.php
View file

@ -2150,8 +2150,8 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
if (!sizeof($error)) if (!sizeof($error))
{ {
$current_legend = phpbb_groupposition_legend::GROUP_DISABLED; $current_legend = \phpbb\groupposition\legend::GROUP_DISABLED;
$current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED; $current_teampage = \phpbb\groupposition\teampage::GROUP_DISABLED;
$legend = $phpbb_container->get('groupposition.legend'); $legend = $phpbb_container->get('groupposition.legend');
$teampage = $phpbb_container->get('groupposition.teampage'); $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_legend = $legend->get_group_value($group_id);
$current_teampage = $teampage->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())); 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 (!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. // Old group currently not in the legend or new group, add at the end.
$group_attributes['group_legend'] = 1 + $legend->get_group_count(); $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; $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 // Group is removed from the legend
try try
{ {
$legend->delete_group($group_id, true); $legend->delete_group($group_id, true);
} }
catch (phpbb_groupposition_exception $exception) catch (\phpbb\groupposition\exception $exception)
{ {
trigger_error($user->lang($exception->getMessage())); 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 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. // 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, // Remove the group from the teampage, only if unselected and we are editing a group,
// which is currently displayed. // 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 try
{ {
$teampage->delete_group($group_id); $teampage->delete_group($group_id);
} }
catch (phpbb_groupposition_exception $exception) catch (\phpbb\groupposition\exception $exception)
{ {
trigger_error($user->lang($exception->getMessage())); trigger_error($user->lang($exception->getMessage()));
} }
@ -2320,24 +2320,24 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
try 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); $teampage->add_group($group_id);
} }
if ($group_teampage) if ($group_teampage)
{ {
if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED) if ($current_teampage == \phpbb\groupposition\teampage::GROUP_DISABLED)
{ {
$teampage->add_group($group_id); $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); $teampage->delete_group($group_id);
} }
} }
catch (phpbb_groupposition_exception $exception) catch (\phpbb\groupposition\exception $exception)
{ {
trigger_error($user->lang($exception->getMessage())); trigger_error($user->lang($exception->getMessage()));
} }
@ -2472,7 +2472,7 @@ function group_delete($group_id, $group_name = false)
$legend->delete_group($group_id); $legend->delete_group($group_id);
unset($legend); unset($legend);
} }
catch (phpbb_groupposition_exception $exception) catch (\phpbb\groupposition\exception $exception)
{ {
// The group we want to delete does not exist. // The group we want to delete does not exist.
// No reason to worry, we just continue the deleting process. // 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); $teampage->delete_group($group_id);
unset($teampage); unset($teampage);
} }
catch (phpbb_groupposition_exception $exception) catch (\phpbb\groupposition\exception $exception)
{ {
// The group we want to delete does not exist. // The group we want to delete does not exist.
// No reason to worry, we just continue the deleting process. // No reason to worry, we just continue the deleting process.

4
phpBB/includes/mcp/mcp_forum.php
View file

@ -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 // Fixes a "bug" that makes forum_view use the same ordering as topic_view
$request->overwrite('sk', null); $request->overwrite('sk', null);
$request->overwrite('sd', null); $request->overwrite('sd', null);
$request->overwrite('sk', null, phpbb_request_request_interface::POST); $request->overwrite('sk', null, \phpbb\request\request_interface::POST);
$request->overwrite('sd', null, phpbb_request_request_interface::POST); $request->overwrite('sd', null, \phpbb\request\request_interface::POST);
} }
$forum_id = $forum_info['forum_id']; $forum_id = $forum_info['forum_id'];

8
phpBB/includes/mcp/mcp_main.php
View file

@ -462,7 +462,7 @@ function mcp_move_topic($topic_ids)
if (!$to_forum_id || $additional_msg) 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); $request->overwrite('confirm_key', null);
} }
@ -694,7 +694,7 @@ function mcp_restore_topic($topic_ids)
} }
$topic_id = $request->variable('t', 0); $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 = $request->variable('redirect', "index.$phpEx");
$redirect = reapply_sid($redirect); $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); $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 = $request->variable('redirect', "index.$phpEx");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
@ -1136,7 +1136,7 @@ function mcp_fork_topic($topic_ids)
if ($additional_msg) 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); $request->overwrite('confirm_key', null);
} }

12
phpBB/includes/mcp/mcp_queue.php
View file

@ -738,7 +738,7 @@ class mcp_queue
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message, 'MESSAGE_TEXT' => $message,
@ -886,7 +886,7 @@ class mcp_queue
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message, 'MESSAGE_TEXT' => $message,
@ -946,9 +946,9 @@ class mcp_queue
{ {
$additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; $additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
$request->overwrite('confirm', null, phpbb_request_request_interface::POST); $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::POST);
$request->overwrite('confirm_key', null, phpbb_request_request_interface::REQUEST); $request->overwrite('confirm_key', null, \phpbb\request\request_interface::REQUEST);
} }
else else
{ {
@ -1221,7 +1221,7 @@ class mcp_queue
if ($request->is_ajax()) if ($request->is_ajax())
{ {
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'], 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message, 'MESSAGE_TEXT' => $message,

4
phpBB/includes/mcp/mcp_warn.php
View file

@ -253,7 +253,7 @@ class mcp_warn
// Check if can send a notification // Check if can send a notification
if ($config['allow_privmsg']) if ($config['allow_privmsg'])
{ {
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($user_row); $auth2->acl($user_row);
$s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false; $s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false;
unset($auth2); unset($auth2);
@ -376,7 +376,7 @@ class mcp_warn
// Check if can send a notification // Check if can send a notification
if ($config['allow_privmsg']) if ($config['allow_privmsg'])
{ {
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($user_row); $auth2->acl($user_row);
$s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false; $s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false;
unset($auth2); unset($auth2);

2
phpBB/includes/message_parser.php
View file

@ -1545,7 +1545,7 @@ class parse_message extends bbcode_firstpass
global $request; global $request;
$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); $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(); $this->attachment_data = array();
$check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id; $check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id;

6
phpBB/includes/ucp/ucp_groups.php
View file

@ -34,8 +34,8 @@ class ucp_groups
$return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>'); $return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
$mark_ary = request_var('mark', array(0)); $mark_ary = request_var('mark', array(0));
$submit = $request->variable('submit', 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); $delete = $request->variable('delete', false, false, \phpbb\request\request_interface::POST);
$error = $data = array(); $error = $data = array();
switch ($mode) switch ($mode)
@ -496,7 +496,7 @@ class ucp_groups
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix // 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? // Did we submit?

2
phpBB/includes/ucp/ucp_main.php
View file

@ -296,7 +296,7 @@ class ucp_main
} }
else 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(); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
} }

16
phpBB/includes/ucp/ucp_notifications.php
View file

@ -163,11 +163,11 @@ class ucp_notifications
* Output all the notification types to the template * Output all the notification types to the template
* *
* @param string $block * @param string $block
* @param phpbb_notification_manager $phpbb_notifications * @param \phpbb\notification\manager $phpbb_notifications
* @param phpbb_template $template * @param \phpbb\template\template $template
* @param phpbb_user $user * @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(); $notification_methods = $phpbb_notifications->get_subscription_methods();
@ -210,11 +210,11 @@ class ucp_notifications
* Output all the notification methods to the template * Output all the notification methods to the template
* *
* @param string $block * @param string $block
* @param phpbb_notification_manager $phpbb_notifications * @param \phpbb\notification\manager $phpbb_notifications
* @param phpbb_template $template * @param \phpbb\template\template $template
* @param phpbb_user $user * @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(); $notification_methods = $phpbb_notifications->get_subscription_methods();

8
phpBB/includes/ucp/ucp_profile.php
View file

@ -34,9 +34,9 @@ class ucp_profile
$user->add_lang('posting'); $user->add_lang('posting');
$preview = $request->variable('preview', 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); $submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
$delete = $request->variable('delete', false, false, phpbb_request_request_interface::POST); $delete = $request->variable('delete', false, false, \phpbb\request\request_interface::POST);
$error = $data = array(); $error = $data = array();
$s_hidden_fields = ''; $s_hidden_fields = '';
@ -564,7 +564,7 @@ class ucp_profile
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix // 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) if ($submit)
{ {

2
phpBB/includes/ucp/ucp_remind.php
View file

@ -71,7 +71,7 @@ class ucp_remind
} }
// Check users permissions // Check users permissions
$auth2 = new phpbb_auth(); $auth2 = new \phpbb\auth\auth();
$auth2->acl($user_row); $auth2->acl($user_row);
if (!$auth2->acl_get('u_chgpasswd')) if (!$auth2->acl_get('u_chgpasswd'))

2
phpBB/includes/ucp/ucp_zebra.php
View file

@ -229,7 +229,7 @@ class ucp_zebra
{ {
$message = ($updated) ? $user->lang[$l_mode . '_UPDATED'] : implode('<br />', $error); $message = ($updated) ? $user->lang[$l_mode . '_UPDATED'] : implode('<br />', $error);
$json_response = new phpbb_json_response; $json_response = new \phpbb\json_response;
$json_response->send(array( $json_response->send(array(
'success' => $updated, 'success' => $updated,

12
phpBB/install/database_update.php
View file

@ -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'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Setup class loader first // 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->register();
// Set up container (must be done here because extensions table may not exist) // Set up container (must be done here because extensions table may not exist)
$container_extensions = array( $container_extensions = array(
new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), new \phpbb\di\extension\config($phpbb_root_path . 'config.' . $phpEx),
new phpbb_di_extension_core($phpbb_root_path), new \phpbb\di\extension\core($phpbb_root_path),
); );
$container_passes = array( $container_passes = array(
new phpbb_di_pass_collection_pass(), new \phpbb\di\pass\collection_pass(),
//new phpbb_di_pass_kernel_pass(), //new \phpbb\di\pass\kernel_pass(),
); );
$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx); $phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);
@ -230,7 +230,7 @@ while (!$migrator->finished())
{ {
$migrator->update(); $migrator->update();
} }
catch (phpbb_db_migration_exception $e) catch (\phpbb\db\migration\exception $e)
{ {
echo $e->getLocalisedMessage($user); echo $e->getLocalisedMessage($user);

18
phpBB/install/index.php
View file

@ -90,9 +90,9 @@ include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
require($phpbb_root_path . 'includes/functions_install.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
// Setup class loader first // 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->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(); $phpbb_class_loader_ext->register();
// Set up container // Set up container
@ -187,8 +187,8 @@ $sub = request_var('sub', '');
// Set PHP error handler to ours // Set PHP error handler to ours
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
$user = new phpbb_user(); $user = new \phpbb\user();
$auth = new phpbb_auth(); $auth = new \phpbb\auth\auth();
// Add own hook handler, if present. :o // Add own hook handler, if present. :o
if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
@ -208,14 +208,14 @@ else
} }
// Set some standard variables we want to force // Set some standard variables we want to force
$config = new phpbb_config(array( $config = new \phpbb\config\config(array(
'load_tplcompile' => '1' 'load_tplcompile' => '1'
)); ));
$phpbb_style_resource_locator = new phpbb_style_resource_locator(); $phpbb_style_resource_locator = new \phpbb\style\resource_locator();
$phpbb_style_path_provider = new phpbb_style_path_provider(); $phpbb_style_path_provider = new \phpbb\style\path_provider();
$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); $template = new \phpbb\template\twig\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 = 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_ext_dir_prefix('adm/');
$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
$template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_ASSETS_PATH', '../assets');

8
phpBB/install/install_convert.php
View file

@ -130,7 +130,7 @@ class install_convert extends module
unset($dbpasswd); unset($dbpasswd);
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(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']; $this->page_title = $lang['STAGE_SETTINGS'];
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
@ -586,7 +586,7 @@ class install_convert extends module
unset($dbpasswd); unset($dbpasswd);
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(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... // For conversions we are a bit less strict and set to a search backend we know exist...
if (!class_exists($search_type)) if (!class_exists($search_type))
{ {
$search_type = 'phpbb_search_fulltext_native'; $search_type = '\phpbb\search\fulltext_native';
set_config('search_type', $search_type); set_config('search_type', $search_type);
} }

14
phpBB/install/install_install.php
View file

@ -102,7 +102,7 @@ class install_install extends module
break; break;
case 'final': 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(); $request->enable_super_globals();
// Create a normal container now // Create a normal container now
@ -1438,12 +1438,12 @@ class install_install extends module
include_once($phpbb_root_path . 'phpbb/search/fulltext_native.' . $phpEx); include_once($phpbb_root_path . 'phpbb/search/fulltext_native.' . $phpEx);
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
$error = false; $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 $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
FROM ' . POSTS_TABLE; FROM ' . POSTS_TABLE;
@ -1753,7 +1753,7 @@ class install_install extends module
$data = $this->get_submitted_data(); $data = $this->get_submitted_data();
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(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(); $data = $this->get_submitted_data();
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(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 * "installs" means it adds all migrations to the migrations table, but does not
* perform any of the actions in the migrations. * perform any of the actions in the migrations.
* *
* @param phpbb_extension_manager $extension_manager * @param \phpbb\extension\manager $extension_manager
* @param phpbb_db_migrator $migrator * @param \phpbb\db\migrator $migrator
*/ */
function populate_migrations($extension_manager, $migrator) function populate_migrations($extension_manager, $migrator)
{ {

6
phpBB/install/install_update.php
View file

@ -108,7 +108,7 @@ class install_update extends module
unset($dbpasswd); unset($dbpasswd);
// We need to fill the config to let internal functions correctly work // 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(null, null, null, $config);
set_config_count(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); $this->include_file('includes/diff/renderer.' . $phpEx);
// Make sure we stay at the file check if checking the files again // 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'; $sub = $this->p_master->sub = 'file_check';
} }
@ -355,7 +355,7 @@ class install_update extends module
$action = request_var('action', ''); $action = request_var('action', '');
// We are directly within an update. To make sure our update list is correct we check its status. // 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; $modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0;
// Make sure the list is up-to-date // Make sure the list is up-to-date

2
phpBB/mcp.php
View file

@ -49,7 +49,7 @@ $action = request_var('action', '');
$action_ary = request_var('action', array('' => 0)); $action_ary = request_var('action', array('' => 0));
$forum_action = request_var('forum_action', ''); $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; $action = $forum_action;
} }

2
phpBB/memberlist.php
View file

@ -1058,7 +1058,7 @@ switch ($mode)
// We validate form and field here, only id/class allowed // We validate form and field here, only id/class allowed
$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; $form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
$field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field; $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); $username = request_var('username', '', true);
$email = strtolower(request_var('email', '')); $email = strtolower(request_var('email', ''));

8
phpBB/phpbb/auth/auth.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Permission/Auth class * Permission/Auth class
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_auth class auth
{ {
var $acl = array(); var $acl = array();
var $cache = 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) if ($renew)
{ {
$this->acl_cache($userdata); $this->acl_cache($userdata);
@ -993,7 +995,7 @@ class phpbb_auth
// Successful session creation // Successful session creation
if ($result === true) 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) if ($admin)
{ {
// the login array is used because the user ids do not differ for re-authentication // the login array is used because the user ids do not differ for re-authentication

26
phpBB/phpbb/auth/provider/apache.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth\provider;
/** /**
* @ignore * @ignore
*/ */
@ -20,19 +22,19 @@ if (!defined('IN_PHPBB'))
* *
* @package auth * @package auth
*/ */
class phpbb_auth_provider_apache extends phpbb_auth_provider_base class apache extends \phpbb\auth\provider\base
{ {
/** /**
* Apache Authentication Constructor * Apache Authentication Constructor
* *
* @param phpbb_db_driver $db * @param \phpbb\db\driver\driver $db
* @param phpbb_config $config * @param \phpbb\config\config $config
* @param phpbb_request $request * @param \phpbb\request\request $request
* @param phpbb_user $user * @param \phpbb\user $user
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $php_ext * @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->db = $db;
$this->config = $config; $this->config = $config;
@ -47,7 +49,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base
*/ */
public function init() 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']; 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( return array(
'status' => LOGIN_ERROR_EXTERNAL_AUTH, 'status' => LOGIN_ERROR_EXTERNAL_AUTH,
@ -149,7 +151,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base
*/ */
public function autologin() 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(); 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 * This function generates an array which can be passed to the user_add
* function in order to create a user * function in order to create a user
* *
* @param string $username The username of the new user. * @param string $username The username of the new \user.
* @param string $password The password of the new user. * @param string $password The password of the new \user.
* @return array Contains data that can be passed directly to * @return array Contains data that can be passed directly to
* the user_add function. * the user_add function.
*/ */
@ -241,7 +243,7 @@ class phpbb_auth_provider_apache extends phpbb_auth_provider_base
public function validate_session($user) public function validate_session($user)
{ {
// Check if PHP_AUTH_USER is set and handle this case // 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'); $php_auth_user = $this->request->server('PHP_AUTH_USER');

4
phpBB/phpbb/auth/provider/base.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth\provider;
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* *
* @package auth * @package auth
*/ */
abstract class phpbb_auth_provider_base implements phpbb_auth_provider_provider_interface abstract class base implements \phpbb\auth\provider\provider_interface
{ {
/** /**
* {@inheritdoc} * {@inheritdoc}

20
phpBB/phpbb/auth/provider/db.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth\provider;
/** /**
* @ignore * @ignore
*/ */
@ -22,20 +24,20 @@ if (!defined('IN_PHPBB'))
* *
* @package auth * @package auth
*/ */
class phpbb_auth_provider_db extends phpbb_auth_provider_base class db extends \phpbb\auth\provider\base
{ {
/** /**
* Database Authentication Constructor * Database Authentication Constructor
* *
* @param phpbb_db_driver $db * @param \phpbb\db\driver\driver $db
* @param phpbb_config $config * @param \phpbb\config\config $config
* @param phpbb_request $request * @param \phpbb\request\request $request
* @param phpbb_user $user * @param \phpbb\user $user
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $php_ext * @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->db = $db;
$this->config = $config; $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); 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); $captcha->init(CONFIRM_LOGIN);
$vc_response = $captcha->validate($row); $vc_response = $captcha->validate($row);
if ($vc_response) if ($vc_response)
@ -202,7 +204,7 @@ class phpbb_auth_provider_db extends phpbb_auth_provider_base
{ {
$hash = phpbb_hash($password_new_format); $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 . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_password = \'' . $this->db->sql_escape($hash) . '\', SET user_password = \'' . $this->db->sql_escape($hash) . '\',
user_pass_convert = 0 user_pass_convert = 0
@ -239,7 +241,7 @@ class phpbb_auth_provider_db extends phpbb_auth_provider_base
{ {
$hash = phpbb_hash($password); $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 . " $sql = 'UPDATE ' . USERS_TABLE . "
SET user_password = '" . $this->db->sql_escape($hash) . "', SET user_password = '" . $this->db->sql_escape($hash) . "',
user_pass_convert = 0 user_pass_convert = 0

12
phpBB/phpbb/auth/provider/ldap.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth\provider;
/** /**
* @ignore * @ignore
*/ */
@ -22,16 +24,16 @@ if (!defined('IN_PHPBB'))
* *
* @package auth * @package auth
*/ */
class phpbb_auth_provider_ldap extends phpbb_auth_provider_base class ldap extends \phpbb\auth\provider\base
{ {
/** /**
* LDAP Authentication Constructor * LDAP Authentication Constructor
* *
* @param phpbb_db_driver $db * @param \phpbb\db\driver\driver $db
* @param phpbb_config $config * @param \phpbb\config\config $config
* @param phpbb_user $user * @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->db = $db;
$this->config = $config; $this->config = $config;

10
phpBB/phpbb/auth/provider/provider_interface.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\auth\provider;
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* *
* @package auth * @package auth
*/ */
interface phpbb_auth_provider_provider_interface interface provider_interface
{ {
/** /**
* Checks whether the user is currently identified to the authentication * 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. * 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 * It then returns the name of the acp file related to this authentication
* provider. * 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. * have been set in acp_board.
* @return array|null Returns null if not implemented or an array with * @return array|null Returns null if not implemented or an array with
* the template file name and an array of the vars * 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. * Performs additional actions during logout.
* *
* @param array $data An array corresponding to * @param array $data An array corresponding to
* phpbb_session::data * \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. * session.
*/ */
public function logout($data, $new_session); public function logout($data, $new_session);

16
phpBB/phpbb/avatar/driver/driver.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Base class for avatar drivers * Base class for avatar drivers
* @package phpBB3 * @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 * Avatar driver name
@ -29,7 +31,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa
/** /**
* Current board configuration * Current board configuration
* @var phpbb_config * @var \phpbb\config\config
*/ */
protected $config; protected $config;
@ -47,7 +49,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa
/** /**
* Cache driver * Cache driver
* @var phpbb_cache_driver_driver_interface * @var \phpbb\cache\driver\driver_interface
*/ */
protected $cache; protected $cache;
@ -69,13 +71,13 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_driver_interfa
/** /**
* Construct a driver object * Construct a driver object
* *
* @param phpbb_config $config phpBB configuration * @param \phpbb\config\config $config phpBB configuration
* @param phpbb_request $request Request object * @param \phpbb\request\request $request Request object
* @param string $phpbb_root_path Path to the phpBB root * @param string $phpbb_root_path Path to the phpBB root
* @param string $php_ext PHP file extension * @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->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;

30
phpBB/phpbb/avatar/driver/driver_interface.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Interface for avatar drivers * Interface for avatar drivers
* @package phpBB3 * @package phpBB3
*/ */
interface phpbb_avatar_driver_driver_interface interface driver_interface
{ {
/** /**
* Returns the name of the driver. * Returns the name of the driver.
@ -32,7 +34,7 @@ interface phpbb_avatar_driver_driver_interface
* Get the avatar url and dimensions * Get the avatar url and dimensions
* *
* @param array $row User data or group data that has been cleaned with * @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. * @return array Avatar data, must have keys src, width and height, e.g.
* ['src' => '', 'width' => 0, 'height' => 0] * ['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 * 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 * @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 * @param string $alt Alternate text for avatar image
* *
* @return string HTML * @return string HTML
@ -53,11 +55,11 @@ interface phpbb_avatar_driver_driver_interface
/** /**
* Prepare form for changing the settings of this avatar * Prepare form for changing the settings of this avatar
* *
* @param phpbb_request $request Request object * @param \phpbb\request\request $request Request object
* @param phpbb_template $template Template object * @param \phpbb\template\template $template Template object
* @param phpbb_user $user User object * @param \phpbb\user $user User object
* @param array $row User data or group data that has been cleaned with * @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 * @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 * 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 * 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 * 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. * @return array Array of configuration options as consumed by acp_board.
* The setting for enabling/disabling the avatar will be handled by * The setting for enabling/disabling the avatar will be handled by
@ -81,11 +83,11 @@ interface phpbb_avatar_driver_driver_interface
/** /**
* Process form data * Process form data
* *
* @param phpbb_request $request Request object * @param \phpbb\request\request $request Request object
* @param phpbb_template $template Template object * @param \phpbb\template\template $template Template object
* @param phpbb_user $user User object * @param \phpbb\user $user User object
* @param array $row User data or group data that has been cleaned with * @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 * @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 * 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 * 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 * Delete avatar
* *
* @param array $row User data or group data that has been cleaned with * @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, * @return bool True if avatar has been deleted or there is no need to delete,
* i.e. when the avatar is not hosted locally. * i.e. when the avatar is not hosted locally.

4
phpBB/phpbb/avatar/driver/gravatar.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Handles avatars hosted at gravatar.com * Handles avatars hosted at gravatar.com
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver class gravatar extends \phpbb\avatar\driver\driver
{ {
/** /**
* The URL for the gravatar service * The URL for the gravatar service

8
phpBB/phpbb/avatar/driver/local.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Handles avatars selected from the board gallery * Handles avatars selected from the board gallery
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_avatar_driver_local extends phpbb_avatar_driver class local extends \phpbb\avatar\driver\driver
{ {
/** /**
* @inheritdoc * @inheritdoc
@ -144,7 +146,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
* Get a list of avatars that are locally available * Get a list of avatars that are locally available
* Results get cached for 24 hours (86400 seconds) * 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 * @return array Array containing the locally available avatars
*/ */
@ -157,7 +159,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
$avatar_list = array(); $avatar_list = array();
$path = $this->phpbb_root_path . $this->config['avatar_gallery_path']; $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) foreach ($iterator as $file_info)
{ {
$file_path = $file_info->getPath(); $file_path = $file_info->getPath();

8
phpBB/phpbb/avatar/driver/remote.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Handles avatars hosted remotely * Handles avatars hosted remotely
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_avatar_driver_remote extends phpbb_avatar_driver class remote extends \phpbb\avatar\driver\driver
{ {
/** /**
* @inheritdoc * @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); include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
} }
$types = fileupload::image_types(); $types = \fileupload::image_types();
$extension = strtolower(filespec::get_extension($url)); $extension = strtolower(\filespec::get_extension($url));
if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
{ {

6
phpBB/phpbb/avatar/driver/upload.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Handles avatars uploaded to the board * Handles avatars uploaded to the board
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_avatar_driver_upload extends phpbb_avatar_driver class upload extends \phpbb\avatar\driver\driver
{ {
/** /**
* @inheritdoc * @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); 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', ''); $url = $request->variable('avatar_upload_url', '');
$upload_file = $request->file('avatar_upload_file'); $upload_file = $request->file('avatar_upload_file');

16
phpBB/phpbb/avatar/manager.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\avatar;
/** /**
* @ignore * @ignore
*/ */
@ -18,11 +20,11 @@ if (!defined('IN_PHPBB'))
/** /**
* @package avatar * @package avatar
*/ */
class phpbb_avatar_manager class manager
{ {
/** /**
* phpBB configuration * phpBB configuration
* @var phpbb_config * @var \phpbb\config\config
*/ */
protected $config; protected $config;
@ -59,11 +61,11 @@ class phpbb_avatar_manager
/** /**
* Construct an avatar manager object * 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 array $avatar_drivers Avatar drivers passed via the service container
* @param object $container Container object * @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->config = $config;
$this->avatar_drivers = $avatar_drivers; $this->avatar_drivers = $avatar_drivers;
@ -194,7 +196,7 @@ class phpbb_avatar_manager
$keys = array_keys($row); $keys = array_keys($row);
$values = array_values($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); return array_combine($keys, $values);
} }
@ -281,7 +283,7 @@ class phpbb_avatar_manager
/** /**
* Replace "error" strings with their real, localized form * 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 * @param array $error Array containing error strings
* Key values can either be a string with a language key or an array * 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 * 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 * @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) foreach ($error as $key => $lang)
{ {

4
phpBB/phpbb/cache/driver/apc.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* ACM for APC * ACM for APC
* @package acm * @package acm
*/ */
class phpbb_cache_driver_apc extends phpbb_cache_driver_memory class apc extends \phpbb\cache\driver\memory
{ {
var $extension = 'apc'; var $extension = 'apc';

4
phpBB/phpbb/cache/driver/base.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -18,6 +20,6 @@ if (!defined('IN_PHPBB'))
/** /**
* @package acm * @package acm
*/ */
abstract class phpbb_cache_driver_base implements phpbb_cache_driver_driver_interface abstract class base implements \phpbb\cache\driver\driver_interface
{ {
} }

12
phpBB/phpbb/cache/driver/driver_interface.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* *
* @package acm * @package acm
*/ */
interface phpbb_cache_driver_driver_interface interface driver_interface
{ {
/** /**
* Load global cache * Load global cache
@ -85,10 +87,10 @@ interface phpbb_cache_driver_driver_interface
* result to persistent storage. In other words, there is no need * result to persistent storage. In other words, there is no need
* to call save() afterwards. * 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 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 * @param mixed $query_result The result from \dbal::sql_query, to be passed to
* dbal::sql_fetchrow to get all rows and store them * \dbal::sql_fetchrow to get all rows and store them
* in cache. * in cache.
* @param int $ttl Time to live, after this timeout the query should * @param int $ttl Time to live, after this timeout the query should
* expire from the cache. * expire from the cache.
@ -96,7 +98,7 @@ interface phpbb_cache_driver_driver_interface
* representing the query should be returned. Otherwise * representing the query should be returned. Otherwise
* the original $query_result should be returned. * 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. * Check if result for a given SQL query exists in cache.

4
phpBB/phpbb/cache/driver/eaccelerator.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* @package acm * @package acm
* @todo Missing locks from destroy() talk with David * @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 $extension = 'eaccelerator';
var $function = 'eaccelerator_get'; var $function = 'eaccelerator_get';

8
phpBB/phpbb/cache/driver/file.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* ACM File Based Caching * ACM File Based Caching
* @package acm * @package acm
*/ */
class phpbb_cache_driver_file extends phpbb_cache_driver_base class file extends \phpbb\cache\driver\base
{ {
var $vars = array(); var $vars = array();
var $var_expires = array(); var $var_expires = array();
@ -369,7 +371,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
/** /**
* {@inheritDoc} * {@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 // Remove extra spaces and tabs
$query = preg_replace('/[\n\r\s\t]+/', ' ', $query); $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"; $file = "{$this->cache_dir}$filename.$phpEx";
$lock = new phpbb_lock_flock($file); $lock = new \phpbb\lock\flock($file);
$lock->acquire(); $lock->acquire();
if ($handle = @fopen($file, 'wb')) if ($handle = @fopen($file, 'wb'))

6
phpBB/phpbb/cache/driver/memcache.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -40,7 +42,7 @@ if (!defined('PHPBB_ACM_MEMCACHE'))
* ACM for Memcached * ACM for Memcached
* @package acm * @package acm
*/ */
class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory class memcache extends \phpbb\cache\driver\memory
{ {
var $extension = 'memcache'; var $extension = 'memcache';
@ -52,7 +54,7 @@ class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory
// Call the parent constructor // Call the parent constructor
parent::__construct(); parent::__construct();
$this->memcache = new Memcache; $this->memcache = new \Memcache;
foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u) foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u)
{ {
$parts = explode('/', $u); $parts = explode('/', $u);

6
phpBB/phpbb/cache/driver/memory.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* ACM Abstract Memory Class * ACM Abstract Memory Class
* @package acm * @package acm
*/ */
abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base abstract class memory extends \phpbb\cache\driver\base
{ {
var $key_prefix; var $key_prefix;
@ -285,7 +287,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
/** /**
* {@inheritDoc} * {@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 // Remove extra spaces and tabs
$query = preg_replace('/[\n\r\s\t]+/', ' ', $query); $query = preg_replace('/[\n\r\s\t]+/', ' ', $query);

6
phpBB/phpbb/cache/driver/null.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* ACM Null Caching * ACM Null Caching
* @package acm * @package acm
*/ */
class phpbb_cache_driver_null extends phpbb_cache_driver_base class null extends \phpbb\cache\driver\base
{ {
/** /**
* Set cache path * Set cache path
@ -107,7 +109,7 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base
/** /**
* {@inheritDoc} * {@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; return $query_result;
} }

10
phpBB/phpbb/cache/driver/redis.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -33,7 +35,7 @@ if (!defined('PHPBB_ACM_REDIS_HOST'))
* *
* @package acm * @package acm
*/ */
class phpbb_cache_driver_redis extends phpbb_cache_driver_memory class redis extends \phpbb\cache\driver\memory
{ {
var $extension = 'redis'; var $extension = 'redis';
@ -56,7 +58,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory
// Call the parent constructor // Call the parent constructor
parent::__construct(); parent::__construct();
$this->redis = new Redis(); $this->redis = new \Redis();
$args = func_get_args(); $args = func_get_args();
if (!empty($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_SERIALIZER, \Redis::SERIALIZER_PHP);
$this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix); $this->redis->setOption(\Redis::OPT_PREFIX, $this->key_prefix);
if (defined('PHPBB_ACM_REDIS_DB')) if (defined('PHPBB_ACM_REDIS_DB'))
{ {

4
phpBB/phpbb/cache/driver/wincache.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* ACM for WinCache * ACM for WinCache
* @package acm * @package acm
*/ */
class phpbb_cache_driver_wincache extends phpbb_cache_driver_memory class wincache extends \phpbb\cache\driver\memory
{ {
var $extension = 'wincache'; var $extension = 'wincache';

4
phpBB/phpbb/cache/driver/xcache.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache\driver;
/** /**
* @ignore * @ignore
*/ */
@ -24,7 +26,7 @@ if (!defined('IN_PHPBB'))
* - xcache.admin.enable_auth = off (or xcache.admin.user and xcache.admin.password set) * - 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'; var $extension = 'XCache';

24
phpBB/phpbb/cache/service.php vendored
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cache;
/** /**
* @ignore * @ignore
*/ */
@ -19,26 +21,26 @@ if (!defined('IN_PHPBB'))
* Class for grabbing/handling cached entries * Class for grabbing/handling cached entries
* @package acm * @package acm
*/ */
class phpbb_cache_service class service
{ {
/** /**
* Cache driver. * Cache driver.
* *
* @var phpbb_cache_driver_driver_interface * @var \phpbb\cache\driver\driver_interface
*/ */
protected $driver; protected $driver;
/** /**
* The config. * The config.
* *
* @var phpbb_config * @var \phpbb\config\config
*/ */
protected $config; protected $config;
/** /**
* Database connection. * Database connection.
* *
* @var phpbb_db_driver * @var \phpbb\db\driver\driver
*/ */
protected $db; protected $db;
@ -59,13 +61,13 @@ class phpbb_cache_service
/** /**
* Creates a cache service around a cache driver * Creates a cache service around a cache driver
* *
* @param phpbb_cache_driver_driver_interface $driver The cache driver * @param \phpbb\cache\driver\driver_interface $driver The cache driver
* @param phpbb_config $config The config * @param \phpbb\config\config $config The config
* @param phpbb_db_driver $db Database connection * @param \phpbb\db\driver\driver $db Database connection
* @param string $phpbb_root_path Root path * @param string $phpbb_root_path Root path
* @param string $php_ext PHP extension * @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->set_driver($driver);
$this->config = $config; $this->config = $config;
@ -77,7 +79,7 @@ class phpbb_cache_service
/** /**
* Returns the cache driver used by this 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() public function get_driver()
{ {
@ -87,9 +89,9 @@ class phpbb_cache_service
/** /**
* Replaces the cache driver used by this 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; $this->driver = $driver;
} }

8
phpBB/phpbb/config/config.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\config;
/** /**
* @ignore * @ignore
*/ */
@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Configuration container class * Configuration container class
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_config implements ArrayAccess, IteratorAggregate, Countable class config implements \ArrayAccess, \IteratorAggregate, \Countable
{ {
/** /**
* The configuration data * The configuration data
@ -44,7 +46,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
*/ */
public function getIterator() 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) 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);
} }
/** /**

16
phpBB/phpbb/config/db.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\config;
/** /**
* @ignore * @ignore
*/ */
@ -19,17 +21,17 @@ if (!defined('IN_PHPBB'))
* Configuration container class * Configuration container class
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_config_db extends phpbb_config class db extends \phpbb\config\config
{ {
/** /**
* Cache instance * Cache instance
* @var phpbb_cache_driver_driver_interface * @var \phpbb\cache\driver\driver_interface
*/ */
protected $cache; protected $cache;
/** /**
* Database connection * Database connection
* @var phpbb_db_driver * @var \phpbb\db\driver\driver
*/ */
protected $db; protected $db;
@ -42,11 +44,11 @@ class phpbb_config_db extends phpbb_config
/** /**
* Creates a configuration container with a default set of values * Creates a configuration container with a default set of values
* *
* @param phpbb_db_driver $db Database connection * @param \phpbb\db\driver\driver $db Database connection
* @param phpbb_cache_driver_driver_interface $cache Cache instance * @param \phpbb\cache\driver\driver_interface $cache Cache instance
* @param string $table Configuration table name * @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->db = $db;
$this->cache = $cache; $this->cache = $cache;
@ -176,7 +178,7 @@ class phpbb_config_db extends phpbb_config
/** /**
* Increments an integer config value directly in the database. * 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. * conditions and unlike set_atomic it cannot fail.
* *
* @param string $key The configuration option's name * @param string $key The configuration option's name

12
phpBB/phpbb/config/db_text.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\config;
/** /**
* @ignore * @ignore
*/ */
@ -17,16 +19,16 @@ if (!defined('IN_PHPBB'))
/** /**
* Manages configuration options with an arbitrary length value stored in a TEXT * 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. * prefetched, but every get operation sends a query to the database.
* *
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_config_db_text class db_text
{ {
/** /**
* Database connection * Database connection
* @var phpbb_db_driver * @var \phpbb\db\driver\driver
*/ */
protected $db; protected $db;
@ -37,10 +39,10 @@ class phpbb_config_db_text
protected $table; protected $table;
/** /**
* @param phpbb_db_driver $db Database connection * @param \phpbb\db\driver\driver $db Database connection
* @param string $table Table name * @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->db = $db;
$this->table = $this->db->sql_escape($table); $this->table = $this->db->sql_escape($table);

18
phpBB/phpbb/content_visibility.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb;
/** /**
* @ignore * @ignore
*/ */
@ -20,23 +22,23 @@ if (!defined('IN_PHPBB'))
* Handle fetching and setting the visibility for topics and posts * Handle fetching and setting the visibility for topics and posts
* @package phpbb * @package phpbb
*/ */
class phpbb_content_visibility class content_visibility
{ {
/** /**
* Database object * Database object
* @var phpbb_db_driver * @var \phpbb\db\driver\driver
*/ */
protected $db; protected $db;
/** /**
* User object * User object
* @var phpbb_user * @var \phpbb\user
*/ */
protected $user; protected $user;
/** /**
* Auth object * Auth object
* @var phpbb_auth * @var \phpbb\auth\auth
*/ */
protected $auth; protected $auth;
@ -55,14 +57,14 @@ class phpbb_content_visibility
/** /**
* Constructor * Constructor
* *
* @param phpbb_auth $auth Auth object * @param \phpbb\auth\auth $auth Auth object
* @param phpbb_db_driver $db Database object * @param \phpbb\db\driver\driver $db Database object
* @param phpbb_user $user User object * @param \phpbb\user $user User object
* @param string $phpbb_root_path Root path * @param string $phpbb_root_path Root path
* @param string $php_ext PHP Extension * @param string $php_ext PHP Extension
* @return null * @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->auth = $auth;
$this->db = $db; $this->db = $db;

4
phpBB/phpbb/controller/exception.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\controller;
/** /**
* @ignore * @ignore
*/ */
@ -19,6 +21,6 @@ if (!defined('IN_PHPBB'))
* Controller exception class * Controller exception class
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_controller_exception extends RuntimeException class exception extends \RuntimeException
{ {
} }

16
phpBB/phpbb/controller/helper.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\controller;
/** /**
* @ignore * @ignore
*/ */
@ -21,17 +23,17 @@ use Symfony\Component\HttpFoundation\Response;
* Controller helper class, contains methods that do things for controllers * Controller helper class, contains methods that do things for controllers
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_controller_helper class helper
{ {
/** /**
* Template object * Template object
* @var phpbb_template * @var \phpbb\template\template
*/ */
protected $template; protected $template;
/** /**
* User object * User object
* @var phpbb_user * @var \phpbb\user
*/ */
protected $user; protected $user;
@ -50,12 +52,12 @@ class phpbb_controller_helper
/** /**
* Constructor * Constructor
* *
* @param phpbb_template $template Template object * @param \phpbb\template\template $template Template object
* @param phpbb_user $user User object * @param \phpbb\user $user User object
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP extension * @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->template = $template;
$this->user = $user; $this->user = $user;
@ -81,7 +83,7 @@ class phpbb_controller_helper
page_footer(true, false, false); 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);
} }
/** /**

6
phpBB/phpbb/controller/provider.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\controller;
/** /**
* @ignore * @ignore
*/ */
@ -23,7 +25,7 @@ use Symfony\Component\Config\FileLocator;
* Controller interface * Controller interface
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_controller_provider class provider
{ {
/** /**
* YAML file(s) containing route information * YAML file(s) containing route information
@ -48,7 +50,7 @@ class phpbb_controller_provider
* *
* @return The current instance of this object for method chaining * @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 // We hardcode the path to the core config directory
// because the finder cannot find it // because the finder cannot find it

30
phpBB/phpbb/controller/resolver.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\controller;
/** /**
* @ignore * @ignore
*/ */
@ -23,11 +25,11 @@ use Symfony\Component\HttpFoundation\Request;
* Controller manager class * Controller manager class
* @package phpBB3 * @package phpBB3
*/ */
class phpbb_controller_resolver implements ControllerResolverInterface class resolver implements ControllerResolverInterface
{ {
/** /**
* User object * User object
* @var phpbb_user * @var \phpbb\user
*/ */
protected $user; protected $user;
@ -38,19 +40,19 @@ class phpbb_controller_resolver implements ControllerResolverInterface
protected $container; protected $container;
/** /**
* phpbb_style object * \phpbb\style\style object
* @var phpbb_style * @var \phpbb\style\style
*/ */
protected $style; protected $style;
/** /**
* Construct method * Construct method
* *
* @param phpbb_user $user User Object * @param \phpbb\user $user User Object
* @param ContainerInterface $container ContainerInterface 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->user = $user;
$this->container = $container; $this->container = $container;
@ -62,7 +64,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
* *
* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @return bool|Callable Callable or false * @return bool|Callable Callable or false
* @throws phpbb_controller_exception * @throws \phpbb\controller\exception
*/ */
public function getController(Request $request) public function getController(Request $request)
{ {
@ -70,20 +72,20 @@ class phpbb_controller_resolver implements ControllerResolverInterface
if (!$controller) 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 // Require a method name along with the service name
if (stripos($controller, ':') === false) 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); list($service, $method) = explode(':', $controller);
if (!$this->container->has($service)) 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); $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 Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @param mixed $controller A callable (controller class, method) * @param mixed $controller A callable (controller class, method)
* @return bool False * @return bool False
* @throws phpbb_controller_exception * @throws \phpbb\controller\exception
*/ */
public function getArguments(Request $request, $controller) public function getArguments(Request $request, $controller)
{ {
// At this point, $controller contains the object and method name // At this point, $controller contains the object and method name
list($object, $method) = $controller; list($object, $method) = $controller;
$mirror = new ReflectionMethod($object, $method); $mirror = new \ReflectionMethod($object, $method);
$arguments = array(); $arguments = array();
$parameters = $mirror->getParameters(); $parameters = $mirror->getParameters();
@ -145,7 +147,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
} }
else 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));
} }
} }

24
phpBB/phpbb/cron/manager.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cron;
/** /**
* @ignore * @ignore
*/ */
@ -22,10 +24,10 @@ if (!defined('IN_PHPBB'))
* *
* @package phpBB3 * @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. * Array holding all tasks that have been found.
* *
* @var array * @var array
@ -52,7 +54,7 @@ class phpbb_cron_manager
* Loads tasks given by name, wraps them * Loads tasks given by name, wraps them
* and puts them into $this->tasks. * 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 * @return null
*/ */
@ -71,7 +73,7 @@ class phpbb_cron_manager
* *
* If no tasks are ready, null is returned. * 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() public function find_one_ready_task()
{ {
@ -88,7 +90,7 @@ class phpbb_cron_manager
/** /**
* Finds all tasks that are ready to run. * 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() public function find_all_ready_tasks()
{ {
@ -111,7 +113,7 @@ class phpbb_cron_manager
* Web runner uses this method to resolve names to tasks. * Web runner uses this method to resolve names to tasks.
* *
* @param string $name Name of the task to look up. * @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) 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. * @param \phpbb\cron\task\task $task The task.
* @return phpbb_cron_task_wrapper The wrapped 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);
} }
} }

4
phpBB/phpbb/cron/task/base.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cron\task;
/** /**
* @ignore * @ignore
*/ */
@ -26,7 +28,7 @@ if (!defined('IN_PHPBB'))
* *
* @package phpBB3 * @package phpBB3
*/ */
abstract class phpbb_cron_task_base implements phpbb_cron_task abstract class base implements \phpbb\cron\task\task
{ {
private $name; private $name;

10
phpBB/phpbb/cron/task/core/prune_all_forums.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cron\task\core;
/** /**
* @ignore * @ignore
*/ */
@ -24,7 +26,7 @@ if (!defined('IN_PHPBB'))
* *
* @package phpBB3 * @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 $phpbb_root_path;
protected $php_ext; 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 $phpbb_root_path The root path
* @param string $php_ext The PHP extension * @param string $php_ext The PHP extension
* @param phpbb_config $config The config * @param \phpbb\config\config $config The config
* @param phpbb_db_driver $db The db connection * @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->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;

16
phpBB/phpbb/cron/task/core/prune_forum.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cron\task\core;
/** /**
* @ignore * @ignore
*/ */
@ -24,7 +26,7 @@ if (!defined('IN_PHPBB'))
* *
* @package phpBB3 * @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 $phpbb_root_path;
protected $php_ext; 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 $phpbb_root_path The root path
* @param string $php_ext The PHP extension * @param string $php_ext The PHP extension
* @param phpbb_config $config The config * @param \phpbb\config\config $config The config
* @param phpbb_db_driver $db The db connection * @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->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $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 * 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. * 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 * @return null
*/ */
public function parse_parameters(phpbb_request_request_interface $request) public function parse_parameters(\phpbb\request\request_interface $request)
{ {
$this->forum_data = null; $this->forum_data = null;
if ($request->is_set('f')) if ($request->is_set('f'))

10
phpBB/phpbb/cron/task/core/queue.php
View file

@ -7,6 +7,8 @@
* *
*/ */
namespace phpbb\cron\task\core;
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* *
* @package phpBB3 * @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 $phpbb_root_path;
protected $php_ext; 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 $phpbb_root_path The root path
* @param string $php_ext The PHP extension * @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->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $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); include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
} }
$queue = new queue(); $queue = new \queue();
$queue->process(); $queue->process();
} }

Some files were not shown because too many files have changed in this diff Show more