aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-09-10 14:01:09 +0200
committerNils Adermann <naderman@naderman.de>2013-09-16 00:25:27 +0200
commitb95fdacdd378877d277e261465da73deb06e50da (patch)
tree01d55340b37f412cecd2d898c302e101b8a0ed19 /phpBB/config
parent196e1813cd37c47965eb6f254ce6a55210a1b751 (diff)
downloadforums-b95fdacdd378877d277e261465da73deb06e50da.tar
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.gz
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.bz2
forums-b95fdacdd378877d277e261465da73deb06e50da.tar.xz
forums-b95fdacdd378877d277e261465da73deb06e50da.zip
[ticket/11700] Move all recent code to namespaces
PHPBB3-11700
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/auth_providers.yml8
-rw-r--r--phpBB/config/avatars.yml10
-rw-r--r--phpBB/config/cron_tasks.yml16
-rw-r--r--phpBB/config/feed.yml18
-rw-r--r--phpBB/config/migrator.yml10
-rw-r--r--phpBB/config/notifications.yml38
-rw-r--r--phpBB/config/services.yml74
7 files changed, 87 insertions, 87 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml
index bcc448e4d7..0a20ed6a80 100644
--- a/phpBB/config/auth_providers.yml
+++ b/phpBB/config/auth_providers.yml
@@ -1,12 +1,12 @@
services:
auth.provider_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: auth.provider }
auth.provider.db:
- class: phpbb_auth_provider_db
+ class: phpbb\auth\provider\db
arguments:
- @dbal.conn
- @config
@@ -17,7 +17,7 @@ services:
tags:
- { name: auth.provider }
auth.provider.apache:
- class: phpbb_auth_provider_apache
+ class: phpbb\auth\provider\apache
arguments:
- @dbal.conn
- @config
@@ -28,7 +28,7 @@ services:
tags:
- { name: auth.provider }
auth.provider.ldap:
- class: phpbb_auth_provider_ldap
+ class: phpbb\auth\provider\ldap
arguments:
- @dbal.conn
- @config
diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index 0aad08bac9..31ae1ecef9 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -1,6 +1,6 @@
services:
avatar.driver.gravatar:
- class: phpbb_avatar_driver_gravatar
+ class: phpbb\avatar\driver\gravatar
arguments:
- @config
- %core.root_path%
@@ -12,7 +12,7 @@ services:
- { name: avatar.driver }
avatar.driver.local:
- class: phpbb_avatar_driver_local
+ class: phpbb\avatar\driver\local
arguments:
- @config
- %core.root_path%
@@ -24,7 +24,7 @@ services:
- { name: avatar.driver }
avatar.driver.remote:
- class: phpbb_avatar_driver_remote
+ class: phpbb\avatar\driver\remote
arguments:
- @config
- %core.root_path%
@@ -36,7 +36,7 @@ services:
- { name: avatar.driver }
avatar.driver.upload:
- class: phpbb_avatar_driver_upload
+ class: phpbb\avatar\driver\upload
arguments:
- @config
- %core.root_path%
@@ -48,7 +48,7 @@ services:
- { name: avatar.driver }
avatar.driver_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
diff --git a/phpBB/config/cron_tasks.yml b/phpBB/config/cron_tasks.yml
index d1954b1877..0c9795c0bd 100644
--- a/phpBB/config/cron_tasks.yml
+++ b/phpBB/config/cron_tasks.yml
@@ -1,6 +1,6 @@
services:
cron.task.core.prune_all_forums:
- class: phpbb_cron_task_core_prune_all_forums
+ class: phpbb\cron\task\core\prune_all_forums
arguments:
- %core.root_path%
- %core.php_ext%
@@ -12,7 +12,7 @@ services:
- { name: cron.task }
cron.task.core.prune_forum:
- class: phpbb_cron_task_core_prune_forum
+ class: phpbb\cron\task\core\prune_forum
arguments:
- %core.root_path%
- %core.php_ext%
@@ -24,7 +24,7 @@ services:
- { name: cron.task }
cron.task.core.queue:
- class: phpbb_cron_task_core_queue
+ class: phpbb\cron\task\core\queue
arguments:
- %core.root_path%
- %core.php_ext%
@@ -35,7 +35,7 @@ services:
- { name: cron.task }
cron.task.core.tidy_cache:
- class: phpbb_cron_task_core_tidy_cache
+ class: phpbb\cron\task\core\tidy_cache
arguments:
- @config
- @cache.driver
@@ -45,7 +45,7 @@ services:
- { name: cron.task }
cron.task.core.tidy_database:
- class: phpbb_cron_task_core_tidy_database
+ class: phpbb\cron\task\core\tidy_database
arguments:
- %core.root_path%
- %core.php_ext%
@@ -56,7 +56,7 @@ services:
- { name: cron.task }
cron.task.core.tidy_search:
- class: phpbb_cron_task_core_tidy_search
+ class: phpbb\cron\task\core\tidy_search
arguments:
- %core.root_path%
- %core.php_ext%
@@ -70,7 +70,7 @@ services:
- { name: cron.task }
cron.task.core.tidy_sessions:
- class: phpbb_cron_task_core_tidy_sessions
+ class: phpbb\cron\task\core\tidy_sessions
arguments:
- @config
- @user
@@ -80,7 +80,7 @@ services:
- { name: cron.task }
cron.task.core.tidy_warnings:
- class: phpbb_cron_task_core_tidy_warnings
+ class: phpbb\cron\task\core\tidy_warnings
arguments:
- %core.root_path%
- %core.php_ext%
diff --git a/phpBB/config/feed.yml b/phpBB/config/feed.yml
index 5a4cdae815..7712a832f3 100644
--- a/phpBB/config/feed.yml
+++ b/phpBB/config/feed.yml
@@ -1,20 +1,20 @@
services:
feed.helper:
- class: phpbb_feed_helper
+ class: phpbb\feed\helper
arguments:
- @config
- @user
- %core.root_path%
feed.factory:
- class: phpbb_feed_factory
+ class: phpbb\feed\factory
arguments:
- @service_container
- @config
- @dbal.conn
feed.forum:
- class: phpbb_feed_forum
+ class: phpbb\feed\forum
scope: prototype
arguments:
- @feed.helper
@@ -27,7 +27,7 @@ services:
- %core.php_ext%
feed.forums:
- class: phpbb_feed_forums
+ class: phpbb\feed\forums
scope: prototype
arguments:
- @feed.helper
@@ -40,7 +40,7 @@ services:
- %core.php_ext%
feed.news:
- class: phpbb_feed_news
+ class: phpbb\feed\news
scope: prototype
arguments:
- @feed.helper
@@ -53,7 +53,7 @@ services:
- %core.php_ext%
feed.overall:
- class: phpbb_feed_overall
+ class: phpbb\feed\overall
scope: prototype
arguments:
- @feed.helper
@@ -66,7 +66,7 @@ services:
- %core.php_ext%
feed.topic:
- class: phpbb_feed_topic
+ class: phpbb\feed\topic
scope: prototype
arguments:
- @feed.helper
@@ -79,7 +79,7 @@ services:
- %core.php_ext%
feed.topics:
- class: phpbb_feed_topics
+ class: phpbb\feed\topics
scope: prototype
arguments:
- @feed.helper
@@ -92,7 +92,7 @@ services:
- %core.php_ext%
feed.topics_active:
- class: phpbb_feed_topics_active
+ class: phpbb\feed\topics_active
scope: prototype
arguments:
- @feed.helper
diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml
index 999a2d41a3..a94609418f 100644
--- a/phpBB/config/migrator.yml
+++ b/phpBB/config/migrator.yml
@@ -1,6 +1,6 @@
services:
migrator:
- class: phpbb_db_migrator
+ class: phpbb\db\migrator
arguments:
- @config
- @dbal.conn
@@ -12,21 +12,21 @@ services:
- @migrator.tool_collection
migrator.tool_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: migrator.tool }
migrator.tool.config:
- class: phpbb_db_migration_tool_config
+ class: phpbb\db\migration\tool\config
arguments:
- @config
tags:
- { name: migrator.tool }
migrator.tool.module:
- class: phpbb_db_migration_tool_module
+ class: phpbb\db\migration\tool\module
arguments:
- @dbal.conn
- @cache
@@ -38,7 +38,7 @@ services:
- { name: migrator.tool }
migrator.tool.permission:
- class: phpbb_db_migration_tool_permission
+ class: phpbb\db\migration\tool\permission
arguments:
- @dbal.conn
- @cache
diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml
index 60aa63a854..adafa99e75 100644
--- a/phpBB/config/notifications.yml
+++ b/phpBB/config/notifications.yml
@@ -1,20 +1,20 @@
services:
notification.type_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: notification.type }
notification.method_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: notification.method }
notification.type.approve_post:
- class: phpbb_notification_type_approve_post
+ class: phpbb\notification\type\approve_post
scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -32,7 +32,7 @@ services:
- { name: notification.type }
notification.type.approve_topic:
- class: phpbb_notification_type_approve_topic
+ class: phpbb\notification\type\approve_topic
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -50,7 +50,7 @@ services:
- { name: notification.type }
notification.type.bookmark:
- class: phpbb_notification_type_bookmark
+ class: phpbb\notification\type\bookmark
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -68,7 +68,7 @@ services:
- { name: notification.type }
notification.type.disapprove_post:
- class: phpbb_notification_type_disapprove_post
+ class: phpbb\notification\type\disapprove_post
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -86,7 +86,7 @@ services:
- { name: notification.type }
notification.type.disapprove_topic:
- class: phpbb_notification_type_disapprove_topic
+ class: phpbb\notification\type\disapprove_topic
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -104,7 +104,7 @@ services:
- { name: notification.type }
notification.type.pm:
- class: phpbb_notification_type_pm
+ class: phpbb\notification\type\pm
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -122,7 +122,7 @@ services:
- { name: notification.type }
notification.type.post:
- class: phpbb_notification_type_post
+ class: phpbb\notification\type\post
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -140,7 +140,7 @@ services:
- { name: notification.type }
notification.type.post_in_queue:
- class: phpbb_notification_type_post_in_queue
+ class: phpbb\notification\type\post_in_queue
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -158,7 +158,7 @@ services:
- { name: notification.type }
notification.type.quote:
- class: phpbb_notification_type_quote
+ class: phpbb\notification\type\quote
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -176,7 +176,7 @@ services:
- { name: notification.type }
notification.type.report_pm:
- class: phpbb_notification_type_report_pm
+ class: phpbb\notification\type\report_pm
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -194,7 +194,7 @@ services:
- { name: notification.type }
notification.type.report_pm_closed:
- class: phpbb_notification_type_report_pm_closed
+ class: phpbb\notification\type\report_pm_closed
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -212,7 +212,7 @@ services:
- { name: notification.type }
notification.type.report_post:
- class: phpbb_notification_type_report_post
+ class: phpbb\notification\type\report_post
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -230,7 +230,7 @@ services:
- { name: notification.type }
notification.type.report_post_closed:
- class: phpbb_notification_type_report_post
+ class: phpbb\notification\type\report_post
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -248,7 +248,7 @@ services:
- { name: notification.type }
notification.type.topic:
- class: phpbb_notification_type_topic
+ class: phpbb\notification\type\topic
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -266,7 +266,7 @@ services:
- { name: notification.type }
notification.type.topic_in_queue:
- class: phpbb_notification_type_topic_in_queue
+ class: phpbb\notification\type\topic_in_queue
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -284,7 +284,7 @@ services:
- { name: notification.type }
notification.method.email:
- class: phpbb_notification_method_email
+ class: phpbb\notification\method\email
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -299,7 +299,7 @@ services:
- { name: notification.method }
notification.method.jabber:
- class: phpbb_notification_method_jabber
+ class: phpbb\notification\method\jabber
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c1579cfb57..f238ed3ed6 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -9,17 +9,17 @@ imports:
services:
auth:
- class: phpbb_auth
+ class: phpbb\auth\auth
avatar.manager:
- class: phpbb_avatar_manager
+ class: phpbb\avatar\manager
arguments:
- @config
- @avatar.driver_collection
- @service_container
cache:
- class: phpbb_cache_service
+ class: phpbb\cache\service
arguments:
- @cache.driver
- @config
@@ -31,10 +31,10 @@ services:
class: %cache.driver.class%
cache.driver.install:
- class: phpbb_cache_driver_file
+ class: phpbb\cache\driver\file
class_loader:
- class: phpbb_class_loader
+ class: phpbb\class_loader
arguments:
- phpbb_
- %core.root_path%includes/
@@ -44,7 +44,7 @@ services:
- [set_cache, [@cache.driver]]
class_loader.ext:
- class: phpbb_class_loader
+ class: phpbb\class_loader
arguments:
- phpbb_ext_
- %core.root_path%ext/
@@ -54,20 +54,20 @@ services:
- [set_cache, [@cache.driver]]
config:
- class: phpbb_config_db
+ class: phpbb\config\db
arguments:
- @dbal.conn
- @cache.driver
- %tables.config%
config_text:
- class: phpbb_config_db_text
+ class: phpbb\config\db_text
arguments:
- @dbal.conn
- %tables.config_text%
content.visibility:
- class: phpbb_content_visibility
+ class: phpbb\content_visibility
arguments:
- @auth
- @dbal.conn
@@ -80,7 +80,7 @@ services:
- %tables.users%
controller.helper:
- class: phpbb_controller_helper
+ class: phpbb\controller\helper
arguments:
- @template
- @user
@@ -88,35 +88,35 @@ services:
- %core.php_ext%
controller.resolver:
- class: phpbb_controller_resolver
+ class: phpbb\controller\resolver
arguments:
- @user
- @service_container
- @style
cron.task_collection:
- class: phpbb_di_service_collection
+ class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: cron.task }
cron.manager:
- class: phpbb_cron_manager
+ class: phpbb\cron\manager
arguments:
- @cron.task_collection
- %core.root_path%
- %core.php_ext%
cron.lock_db:
- class: phpbb_lock_db
+ class: phpbb\lock\db
arguments:
- cron_lock
- @config
- @dbal.conn
dispatcher:
- class: phpbb_event_dispatcher
+ class: phpbb\event\dispatcher
arguments:
- @service_container
@@ -126,12 +126,12 @@ services:
- [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
dbal.tools:
- class: phpbb_db_tools
+ class: phpbb\db\tools
arguments:
- @dbal.conn
event.subscriber_loader:
- class: phpbb_event_extension_subscriber_loader
+ class: phpbb\event\extension_subscriber_loader
arguments:
- @dispatcher
- @ext.manager
@@ -139,7 +139,7 @@ services:
- [load, []]
ext.manager:
- class: phpbb_extension_manager
+ class: phpbb\extension\manager
arguments:
- @service_container
- @dbal.conn
@@ -151,7 +151,7 @@ services:
- @cache.driver
ext.finder:
- class: phpbb_extension_finder
+ class: phpbb\extension\finder
arguments:
- @ext.manager
- @filesystem
@@ -161,16 +161,16 @@ services:
- _ext_finder
filesystem:
- class: phpbb_filesystem
+ class: phpbb\filesystem
groupposition.legend:
- class: phpbb_groupposition_legend
+ class: phpbb\groupposition\legend
arguments:
- @dbal.conn
- @user
groupposition.teampage:
- class: phpbb_groupposition_teampage
+ class: phpbb\groupposition\teampage
arguments:
- @dbal.conn
- @user
@@ -183,14 +183,14 @@ services:
- @controller.resolver
hook_finder:
- class: phpbb_hook_finder
+ class: phpbb\hook\finder
arguments:
- %core.root_path%
- %core.php_ext%
- @cache.driver
kernel_request_subscriber:
- class: phpbb_event_kernel_request_subscriber
+ class: phpbb\event\kernel_request_subscriber
arguments:
- @ext.finder
- %core.root_path%
@@ -199,7 +199,7 @@ services:
- { name: kernel.event_subscriber }
kernel_exception_subscriber:
- class: phpbb_event_kernel_exception_subscriber
+ class: phpbb\event\kernel_exception_subscriber
arguments:
- @template
- @user
@@ -207,12 +207,12 @@ services:
- { name: kernel.event_subscriber }
kernel_terminate_subscriber:
- class: phpbb_event_kernel_terminate_subscriber
+ class: phpbb\event\kernel_terminate_subscriber
tags:
- { name: kernel.event_subscriber }
log:
- class: phpbb_log
+ class: phpbb\log\log
arguments:
- @dbal.conn
- @user
@@ -224,7 +224,7 @@ services:
- %tables.log%
notification_manager:
- class: phpbb_notification_manager
+ class: phpbb\notification\manager
arguments:
- @notification.type_collection
- @notification.method_collection
@@ -240,10 +240,10 @@ services:
- %tables.user_notifications%
request:
- class: phpbb_request
+ class: phpbb\request\request
style:
- class: phpbb_style
+ class: phpbb\style\style
arguments:
- %core.root_path%
- %core.php_ext%
@@ -254,20 +254,20 @@ services:
- @template
style.resource_locator:
- class: phpbb_style_resource_locator
+ class: phpbb\style\resource_locator
style.path_provider_ext:
- class: phpbb_style_extension_path_provider
+ class: phpbb\style\extension_path_provider
arguments:
- @ext.manager
- @style.path_provider
- %core.root_path%
style.path_provider:
- class: phpbb_style_path_provider
+ class: phpbb\style\path_provider
template:
- class: phpbb_template_twig
+ class: phpbb\template\twig\twig
arguments:
- %core.root_path%
- %core.php_ext%
@@ -278,13 +278,13 @@ services:
- %core.adm_relative_path%
template_context:
- class: phpbb_template_context
+ class: phpbb\template\context
user:
- class: phpbb_user
+ class: phpbb\user
user_loader:
- class: phpbb_user_loader
+ class: phpbb\user_loader
arguments:
- @dbal.conn
- %core.root_path%
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-26 14:41:48 +0000