mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/14247] Use quotes around @ and % strings in YAML

Browse Source 
PHPBB3-14247
This commit is contained in:
Matt Friedman
2015-12-07 13:11:22 -08:00
parent f14a9b7069
commit d9d89cad94
52 changed files with 1120 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
phpBB/config/default/container/services.yml
View File

@@ -36,41 +36,41 @@ services:
cache:
class: phpbb\cache\service
arguments:
- @cache.driver
- @config
- @dbal.conn
- %core.root_path%
- %core.php_ext%
- '@cache.driver'
- '@config'
- '@dbal.conn'
- '%core.root_path%'
- '%core.php_ext%'
cache.driver:
class: %cache.driver.class%
class: '%cache.driver.class%'
class_loader:
class: phpbb\class_loader
arguments:
- phpbb\
- %core.root_path%includes/
- %core.php_ext%
- '%core.root_path%includes/'
- '%core.php_ext%'
calls:
- [register, []]
- [set_cache, [@cache.driver]]
- [set_cache, ['@cache.driver']]
class_loader.ext:
class: phpbb\class_loader
arguments:
- \
- %core.root_path%ext/
- %core.php_ext%
- '%core.root_path%ext/'
- '%core.php_ext%'
calls:
- [register, []]
- [set_cache, [@cache.driver]]
- [set_cache, ['@cache.driver']]
config:
class: phpbb\config\db
arguments:
- @dbal.conn
- @cache.driver
- %tables.config%
- '@dbal.conn'
- '@cache.driver'
- '%tables.config%'
config.php:
synthetic: true
@@ -78,37 +78,37 @@ services:
config_text:
class: phpbb\config\db_text
arguments:
- @dbal.conn
- %tables.config_text%
- '@dbal.conn'
- '%tables.config_text%'
controller.helper:
class: phpbb\controller\helper
arguments:
- @template
- @user
- @config
- @symfony_request
- @request
- @routing.helper
- '@template'
- '@user'
- '@config'
- '@symfony_request'
- '@request'
- '@routing.helper'
controller.resolver:
class: phpbb\controller\resolver
arguments:
- @service_container
- %core.root_path%
- @template
- '@service_container'
- '%core.root_path%'
- '@template'
ext.manager:
class: phpbb\extension\manager
arguments:
- @service_container
- @dbal.conn
- @config
- @filesystem
- %tables.ext%
- %core.root_path%
- %core.php_ext%
- @cache.driver
- '@service_container'
- '@dbal.conn'
- '@config'
- '@filesystem'
- '%tables.ext%'
- '%core.root_path%'
- '%core.php_ext%'
- '@cache.driver'
file_downloader:
class: phpbb\file_downloader
@@ -116,45 +116,45 @@ services:
file_locator:
class: phpbb\routing\file_locator
arguments:
- @filesystem
- %core.root_path%
- '@filesystem'
- '%core.root_path%'
group_helper:
class: phpbb\group\helper
arguments:
- @language
- '@language'
log:
class: phpbb\log\log
arguments:
- @dbal.conn
- @user
- @auth
- @dispatcher
- %core.root_path%
- %core.adm_relative_path%
- %core.php_ext%
- %tables.log%
- '@dbal.conn'
- '@user'
- '@auth'
- '@dispatcher'
- '%core.root_path%'
- '%core.adm_relative_path%'
- '%core.php_ext%'
- '%tables.log%'
path_helper:
class: phpbb\path_helper
arguments:
- @symfony_request
- @filesystem
- @request
- %core.root_path%
- %core.php_ext%
- %core.adm_relative_path%
- '@symfony_request'
- '@filesystem'
- '@request'
- '%core.root_path%'
- '%core.php_ext%'
- '%core.adm_relative_path%'
plupload:
class: phpbb\plupload\plupload
arguments:
- %core.root_path%
- @config
- @request
- @user
- @php_ini
- @mimetype.guesser
- '%core.root_path%'
- '@config'
- '@request'
- '@user'
- '@php_ini'
- '@mimetype.guesser'
upload_imagesize:
class: FastImageSize\FastImageSize
@@ -163,7 +163,7 @@ services:
class: phpbb\version_helper
scope: prototype
arguments:
- @cache
- @config
- @file_downloader
- @user
- '@cache'
- '@config'
- '@file_downloader'
- '@user'

40
phpBB/config/default/container/services_attachment.yml
View File

@@ -3,38 +3,38 @@ services:
class: phpbb\attachment\delete
scope: prototype
arguments:
- @config
- @dbal.conn
- @dispatcher
- @filesystem
- @attachment.resync
- %core.root_path%
- '@config'
- '@dbal.conn'
- '@dispatcher'
- '@filesystem'
- '@attachment.resync'
- '%core.root_path%'
attachment.manager:
class: phpbb\attachment\manager
scope: prototype
arguments:
- @attachment.delete
- @attachment.resync
- @attachment.upload
- '@attachment.delete'
- '@attachment.resync'
- '@attachment.upload'
attachment.resync:
class: phpbb\attachment\resync
scope: prototype
arguments:
- @dbal.conn
- '@dbal.conn'
attachment.upload:
class: phpbb\attachment\upload
scope: prototype
arguments:
- @auth
- @cache
- @config
- @files.upload
- @language
- @mimetype.guesser
- @dispatcher
- @plupload
- @user
- %core.root_path%
- '@auth'
- '@cache'
- '@config'
- '@files.upload'
- '@language'
- '@mimetype.guesser'
- '@dispatcher'
- '@plupload'
- '@user'
- '%core.root_path%'

80
phpBB/config/default/container/services_auth.yml
View File

@@ -7,63 +7,63 @@ services:
auth.provider_collection:
class: phpbb\auth\provider_collection
arguments:
- @service_container
- @config
- '@service_container'
- '@config'
tags:
- { name: service_collection, tag: auth.provider }
auth.provider.db:
class: phpbb\auth\provider\db
arguments:
- @dbal.conn
- @config
- @passwords.manager
- @request
- @user
- @service_container
- %core.root_path%
- %core.php_ext%
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@request'
- '@user'
- '@service_container'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: auth.provider }
auth.provider.apache:
class: phpbb\auth\provider\apache
arguments:
- @dbal.conn
- @config
- @passwords.manager
- @request
- @user
- %core.root_path%
- %core.php_ext%
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@request'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: auth.provider }
auth.provider.ldap:
class: phpbb\auth\provider\ldap
arguments:
- @dbal.conn
- @config
- @passwords.manager
- @user
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@user'
tags:
- { name: auth.provider }
auth.provider.oauth:
class: phpbb\auth\provider\oauth\oauth
arguments:
- @dbal.conn
- @config
- @passwords.manager
- @request
- @user
- %tables.auth_provider_oauth_token_storage%
- %tables.auth_provider_oauth_account_assoc%
- @auth.provider.oauth.service_collection
- %tables.users%
- @service_container
- %core.root_path%
- %core.php_ext%
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@request'
- '@user'
- '%tables.auth_provider_oauth_token_storage%'
- '%tables.auth_provider_oauth_account_assoc%'
- '@auth.provider.oauth.service_collection'
- '%tables.users%'
- '@service_container'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: auth.provider }
@@ -71,30 +71,30 @@ services:
auth.provider.oauth.service_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: auth.provider.oauth.service }
auth.provider.oauth.service.bitly:
class: phpbb\auth\provider\oauth\service\bitly
arguments:
- @config
- @request
- '@config'
- '@request'
tags:
- { name: auth.provider.oauth.service }
auth.provider.oauth.service.facebook:
class: phpbb\auth\provider\oauth\service\facebook
arguments:
- @config
- @request
- '@config'
- '@request'
tags:
- { name: auth.provider.oauth.service }
auth.provider.oauth.service.google:
class: phpbb\auth\provider\oauth\service\google
arguments:
- @config
- @request
- '@config'
- '@request'
tags:
- { name: auth.provider.oauth.service }

58
phpBB/config/default/container/services_avatar.yml
View File

@@ -2,26 +2,26 @@ services:
avatar.manager:
class: phpbb\avatar\manager
arguments:
- @config
- @avatar.driver_collection
- '@config'
- '@avatar.driver_collection'
# ----- Avatar drivers -----
avatar.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: avatar.driver }
avatar.driver.gravatar:
class: phpbb\avatar\driver\gravatar
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
- '@config'
- '@upload_imagesize'
- '%core.root_path%'
- '%core.php_ext%'
- '@path_helper'
- '@cache.driver'
calls:
- [set_name, [avatar.driver.gravatar]]
tags:
@@ -30,12 +30,12 @@ services:
avatar.driver.local:
class: phpbb\avatar\driver\local
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
- '@config'
- '@upload_imagesize'
- '%core.root_path%'
- '%core.php_ext%'
- '@path_helper'
- '@cache.driver'
calls:
- [set_name, [avatar.driver.local]]
tags:
@@ -44,12 +44,12 @@ services:
avatar.driver.remote:
class: phpbb\avatar\driver\remote
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
- '@config'
- '@upload_imagesize'
- '%core.root_path%'
- '%core.php_ext%'
- '@path_helper'
- '@cache.driver'
calls:
- [set_name, [avatar.driver.remote]]
tags:
@@ -58,14 +58,14 @@ services:
avatar.driver.upload:
class: phpbb\avatar\driver\upload
arguments:
- @config
- %core.root_path%
- %core.php_ext%
- @filesystem
- @path_helper
- @dispatcher
- @files.factory
- @cache.driver
- '@config'
- '%core.root_path%'
- '%core.php_ext%'
- '@filesystem'
- '@path_helper'
- '@dispatcher'
- '@files.factory'
- '@cache.driver'
calls:
- [set_name, [avatar.driver.upload]]
tags:

12
phpBB/config/default/container/services_captcha.yml
View File

@@ -2,15 +2,15 @@ services:
captcha.factory:
class: phpbb\captcha\factory
arguments:
- @service_container
- @captcha.plugins.service_collection
- '@service_container'
- '@captcha.plugins.service_collection'
# ----- Captcha plugins -----
# Scope MUST be prototype for all the plugins to work.
captcha.plugins.service_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: captcha.plugins }
@@ -42,9 +42,9 @@ services:
class: phpbb\captcha\plugins\qa
scope: prototype
arguments:
- %tables.captcha_qa_questions%
- %tables.captcha_qa_answers%
- %tables.captcha_qa_confirm%
- '%tables.captcha_qa_questions%'
- '%tables.captcha_qa_answers%'
- '%tables.captcha_qa_confirm%'
calls:
- [set_name, [core.captcha.plugins.qa]]
tags:

154
phpBB/config/default/container/services_console.yml
View File

@@ -2,220 +2,220 @@ services:
console.exception_subscriber:
class: phpbb\console\exception_subscriber
arguments:
- @language
- %debug.exceptions%
- '@language'
- '%debug.exceptions%'
tags:
- { name: kernel.event_subscriber }
console.command_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: console.command }
console.command.cache.purge:
class: phpbb\console\command\cache\purge
arguments:
- @user
- @cache.driver
- @dbal.conn
- @auth
- @log
- @config
- '@user'
- '@cache.driver'
- '@dbal.conn'
- '@auth'
- '@log'
- '@config'
tags:
- { name: console.command }
console.command.config.delete:
class: phpbb\console\command\config\delete
arguments:
- @user
- @config
- '@user'
- '@config'
tags:
- { name: console.command }
console.command.config.increment:
class: phpbb\console\command\config\increment
arguments:
- @user
- @config
- '@user'
- '@config'
tags:
- { name: console.command }
console.command.config.get:
class: phpbb\console\command\config\get
arguments:
- @user
- @config
- '@user'
- '@config'
tags:
- { name: console.command }
console.command.config.set:
class: phpbb\console\command\config\set
arguments:
- @user
- @config
- '@user'
- '@config'
tags:
- { name: console.command }
console.command.config.set_atomic:
class: phpbb\console\command\config\set_atomic
arguments:
- @user
- @config
- '@user'
- '@config'
tags:
- { name: console.command }
console.command.cron.list:
class: phpbb\console\command\cron\cron_list
arguments:
- @user
- @cron.manager
- '@user'
- '@cron.manager'
tags:
- { name: console.command }
console.command.cron.run:
class: phpbb\console\command\cron\run
arguments:
- @user
- @cron.manager
- @cron.lock_db
- '@user'
- '@cron.manager'
- '@cron.lock_db'
tags:
- { name: console.command }
console.command.db.list:
class: phpbb\console\command\db\list_command
arguments:
- @user
- @migrator
- @ext.manager
- @config
- @cache
- '@user'
- '@migrator'
- '@ext.manager'
- '@config'
- '@cache'
tags:
- { name: console.command }
console.command.db.migrate:
class: phpbb\console\command\db\migrate
arguments:
- @user
- @language
- @migrator
- @ext.manager
- @config
- @cache
- @log
- @filesystem
- %core.root_path%
- '@user'
- '@language'
- '@migrator'
- '@ext.manager'
- '@config'
- '@cache'
- '@log'
- '@filesystem'
- '%core.root_path%'
tags:
- { name: console.command }
console.command.db.revert:
class: phpbb\console\command\db\revert
arguments:
- @user
- @language
- @migrator
- @ext.manager
- @config
- @cache
- @filesystem
- %core.root_path%
- '@user'
- '@language'
- '@migrator'
- '@ext.manager'
- '@config'
- '@cache'
- '@filesystem'
- '%core.root_path%'
tags:
- { name: console.command }
console.command.dev.migration_tips:
class: phpbb\console\command\dev\migration_tips
arguments:
- @user
- @ext.manager
- '@user'
- '@ext.manager'
tags:
- { name: console.command }
console.command.extension.disable:
class: phpbb\console\command\extension\disable
arguments:
- @user
- @ext.manager
- @log
- '@user'
- '@ext.manager'
- '@log'
tags:
- { name: console.command }
console.command.extension.enable:
class: phpbb\console\command\extension\enable
arguments:
- @user
- @ext.manager
- @log
- '@user'
- '@ext.manager'
- '@log'
tags:
- { name: console.command }
console.command.extension.purge:
class: phpbb\console\command\extension\purge
arguments:
- @user
- @ext.manager
- @log
- '@user'
- '@ext.manager'
- '@log'
tags:
- { name: console.command }
console.command.extension.show:
class: phpbb\console\command\extension\show
arguments:
- @user
- @ext.manager
- @log
- '@user'
- '@ext.manager'
- '@log'
tags:
- { name: console.command }
console.command.fixup.recalculate_email_hash:
class: phpbb\console\command\fixup\recalculate_email_hash
arguments:
- @user
- @dbal.conn
- '@user'
- '@dbal.conn'
tags:
- { name: console.command }
console.command.reparser.list:
class: phpbb\console\command\reparser\list_all
arguments:
- @user
- @text_reparser_collection
- '@user'
- '@text_reparser_collection'
tags:
- { name: console.command }
console.command.reparser.reparse:
class: phpbb\console\command\reparser\reparse
arguments:
- @user
- @text_reparser.lock
- @text_reparser_collection
- @text_reparser.manager
- '@user'
- '@text_reparser.lock'
- '@text_reparser_collection'
- '@text_reparser.manager'
tags:
- { name: console.command }
console.command.thumbnail.delete:
class: phpbb\console\command\thumbnail\delete
arguments:
- @user
- @dbal.conn
- %core.root_path%
- '@user'
- '@dbal.conn'
- '%core.root_path%'
tags:
- { name: console.command }
console.command.thumbnail.generate:
class: phpbb\console\command\thumbnail\generate
arguments:
- @user
- @dbal.conn
- @cache
- %core.root_path%
- %core.php_ext%
- '@user'
- '@dbal.conn'
- '@cache'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: console.command }
console.command.thumbnail.recreate:
class: phpbb\console\command\thumbnail\recreate
arguments:
- @user
- '@user'
tags:
- { name: console.command }

80
phpBB/config/default/container/services_content.yml
View File

@@ -2,71 +2,71 @@ services:
content.visibility:
class: phpbb\content_visibility
arguments:
- @auth
- @config
- @dispatcher
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
- %tables.forums%
- %tables.posts%
- %tables.topics%
- %tables.users%
- '@auth'
- '@config'
- '@dispatcher'
- '@dbal.conn'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
- '%tables.forums%'
- '%tables.posts%'
- '%tables.topics%'
- '%tables.users%'
groupposition.legend:
class: phpbb\groupposition\legend
arguments:
- @dbal.conn
- @user
- '@dbal.conn'
- '@user'
groupposition.teampage:
class: phpbb\groupposition\teampage
arguments:
- @dbal.conn
- @user
- @cache.driver
- '@dbal.conn'
- '@user'
- '@cache.driver'
message.form.admin:
class: phpbb\message\admin_form
arguments:
- @auth
- @config
- @config_text
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@config_text'
- '@dbal.conn'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
message.form.topic:
class: phpbb\message\topic_form
arguments:
- @auth
- @config
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@dbal.conn'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
message.form.user:
class: phpbb\message\user_form
arguments:
- @auth
- @config
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@dbal.conn'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
pagination:
class: phpbb\pagination
arguments:
- @template
- @user
- @controller.helper
- @dispatcher
- '@template'
- '@user'
- '@controller.helper'
- '@dispatcher'
viewonline_helper:
class: phpbb\viewonline_helper
arguments:
- @filesystem
- '@filesystem'

138
phpBB/config/default/container/services_cron.yml
View File

@@ -2,32 +2,32 @@ services:
cron.manager:
class: phpbb\cron\manager
arguments:
- @cron.task_collection
- %core.root_path%
- %core.php_ext%
- '@cron.task_collection'
- '%core.root_path%'
- '%core.php_ext%'
cron.lock_db:
class: phpbb\lock\db
arguments:
- cron_lock
- @config
- @dbal.conn
- '@config'
- '@dbal.conn'
# ----- Cron tasks -----
cron.task_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: cron.task }
cron.task.core.prune_all_forums:
class: phpbb\cron\task\core\prune_all_forums
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- @dbal.conn
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
- '@dbal.conn'
calls:
- [set_name, [cron.task.core.prune_all_forums]]
tags:
@@ -36,10 +36,10 @@ services:
cron.task.core.prune_forum:
class: phpbb\cron\task\core\prune_forum
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- @dbal.conn
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
- '@dbal.conn'
calls:
- [set_name, [cron.task.core.prune_forum]]
tags:
@@ -48,12 +48,12 @@ services:
cron.task.core.prune_shadow_topics:
class: phpbb\cron\task\core\prune_shadow_topics
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- @dbal.conn
- @log
- @user
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
- '@dbal.conn'
- '@log'
- '@user'
calls:
- [set_name, [cron.task.core.prune_shadow_topics]]
tags:
@@ -62,8 +62,8 @@ services:
cron.task.core.prune_notifications:
class: phpbb\cron\task\core\prune_notifications
arguments:
- @config
- @notification_manager
- '@config'
- '@notification_manager'
calls:
- [set_name, [cron.task.core.prune_notifications]]
tags:
@@ -72,9 +72,9 @@ services:
cron.task.core.queue:
class: phpbb\cron\task\core\queue
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
calls:
- [set_name, [cron.task.core.queue]]
tags:
@@ -83,8 +83,8 @@ services:
cron.task.core.tidy_cache:
class: phpbb\cron\task\core\tidy_cache
arguments:
- @config
- @cache.driver
- '@config'
- '@cache.driver'
calls:
- [set_name, [cron.task.core.tidy_cache]]
tags:
@@ -93,9 +93,9 @@ services:
cron.task.core.tidy_database:
class: phpbb\cron\task\core\tidy_database
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
calls:
- [set_name, [cron.task.core.tidy_database]]
tags:
@@ -104,8 +104,8 @@ services:
cron.task.core.tidy_plupload:
class: phpbb\cron\task\core\tidy_plupload
arguments:
- %core.root_path%
- @config
- '%core.root_path%'
- '@config'
calls:
- [set_name, [cron.task.core.tidy_plupload]]
tags:
@@ -114,13 +114,13 @@ services:
cron.task.core.tidy_search:
class: phpbb\cron\task\core\tidy_search
arguments:
- %core.root_path%
- %core.php_ext%
- @auth
- @config
- @dbal.conn
- @user
- @dispatcher
- '%core.root_path%'
- '%core.php_ext%'
- '@auth'
- '@config'
- '@dbal.conn'
- '@user'
- '@dispatcher'
calls:
- [set_name, [cron.task.core.tidy_search]]
tags:
@@ -129,8 +129,8 @@ services:
cron.task.core.tidy_sessions:
class: phpbb\cron\task\core\tidy_sessions
arguments:
- @config
- @user
- '@config'
- '@user'
calls:
- [set_name, [cron.task.core.tidy_sessions]]
tags:
@@ -139,9 +139,9 @@ services:
cron.task.core.tidy_warnings:
class: phpbb\cron\task\core\tidy_warnings
arguments:
- %core.root_path%
- %core.php_ext%
- @config
- '%core.root_path%'
- '%core.php_ext%'
- '@config'
calls:
- [set_name, [cron.task.core.tidy_warnings]]
tags:
@@ -150,11 +150,11 @@ services:
cron.task.text_reparser.pm_text:
class: phpbb\cron\task\text_reparser\reparser
arguments:
- @config
- @config_text
- @text_reparser.lock
- @text_reparser.manager
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser.lock'
- '@text_reparser.manager'
- '@text_reparser_collection'
calls:
- [set_name, [cron.task.text_reparser.pm_text]]
- [set_reparser, [text_reparser.pm_text]]
@@ -164,11 +164,11 @@ services:
cron.task.text_reparser.poll_option:
class: phpbb\cron\task\text_reparser\reparser
arguments:
- @config
- @config_text
- @text_reparser.lock
- @text_reparser.manager
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser.lock'
- '@text_reparser.manager'
- '@text_reparser_collection'
calls:
- [set_name, [cron.task.text_reparser.poll_option]]
- [set_reparser, [text_reparser.poll_option]]
@@ -178,11 +178,11 @@ services:
cron.task.text_reparser.poll_title:
class: phpbb\cron\task\text_reparser\reparser
arguments:
- @config
- @config_text
- @text_reparser.lock
- @text_reparser.manager
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser.lock'
- '@text_reparser.manager'
- '@text_reparser_collection'
calls:
- [set_name, [cron.task.text_reparser.poll_title]]
- [set_reparser, [text_reparser.poll_title]]
@@ -192,11 +192,11 @@ services:
cron.task.text_reparser.post_text:
class: phpbb\cron\task\text_reparser\reparser
arguments:
- @config
- @config_text
- @text_reparser.lock
- @text_reparser.manager
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser.lock'
- '@text_reparser.manager'
- '@text_reparser_collection'
calls:
- [set_name, [cron.task.text_reparser.post_text]]
- [set_reparser, [text_reparser.post_text]]
@@ -206,11 +206,11 @@ services:
cron.task.text_reparser.user_signature:
class: phpbb\cron\task\text_reparser\reparser
arguments:
- @config
- @config_text
- @text_reparser.lock
- @text_reparser.manager
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser.lock'
- '@text_reparser.manager'
- '@text_reparser_collection'
calls:
- [set_name, [cron.task.text_reparser.user_signature]]
- [set_reparser, [text_reparser.user_signature]]

52
phpBB/config/default/container/services_db.yml
View File

@@ -2,12 +2,12 @@ services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
- '@service_container'
dbal.conn.driver:
class: %dbal.driver.class%
class: '%dbal.driver.class%'
calls:
- [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%']]
# ----- DB Tools -----
dbal.tools.factory:
@@ -15,20 +15,20 @@ services:
dbal.tools:
class: phpbb\db\tools\tools_interface
factory: ["@dbal.tools.factory", get]
factory: ['@dbal.tools.factory', get]
arguments:
- @dbal.conn.driver
- '@dbal.conn.driver'
# ----- DB Extractor -----
dbal.extractor.factory:
class: phpbb\db\extractor\factory
arguments:
- @dbal.conn.driver
- @service_container
- '@dbal.conn.driver'
- '@service_container'
dbal.extractor:
class: phpbb\db\extractor\extractor_interface
factory: ["@dbal.extractor.factory", get]
factory: ['@dbal.extractor.factory', get]
# ----- DB Extractors for different drivers -----
# Scope MUST be prototype for all the handlers to work correctly.
@@ -36,46 +36,46 @@ services:
class: phpbb\db\extractor\mssql_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'
dbal.extractor.extractors.mysql_extractor:
class: phpbb\db\extractor\mysql_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'
dbal.extractor.extractors.oracle_extractor:
class: phpbb\db\extractor\oracle_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'
dbal.extractor.extractors.postgres_extractor:
class: phpbb\db\extractor\postgres_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'
dbal.extractor.extractors.sqlite3_extractor:
class: phpbb\db\extractor\sqlite3_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'
dbal.extractor.extractors.sqlite_extractor:
class: phpbb\db\extractor\sqlite_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
- '%core.root_path%'
- '@request'
- '@dbal.conn.driver'

6
phpBB/config/default/container/services_event.yml
View File

@@ -2,13 +2,13 @@ services:
dispatcher:
class: phpbb\event\dispatcher
arguments:
- @service_container
- '@service_container'
kernel_exception_subscriber:
class: phpbb\event\kernel_exception_subscriber
arguments:
- @template
- @language
- '@template'
- '@language'
tags:
- { name: kernel.event_subscriber }

140
phpBB/config/default/container/services_feed.yml
View File

@@ -2,112 +2,112 @@ services:
phpbb.feed.controller:
class: phpbb\feed\controller\feed
arguments:
- @template.twig.environment
- @symfony_request
- @controller.helper
- @config
- @dbal.conn
- @service_container
- @feed.helper
- @user
- @auth
- %core.php_ext%
- '@template.twig.environment'
- '@symfony_request'
- '@controller.helper'
- '@config'
- '@dbal.conn'
- '@service_container'
- '@feed.helper'
- '@user'
- '@auth'
- '%core.php_ext%'
feed.helper:
class: phpbb\feed\helper
arguments:
- @config
- @user
- %core.root_path%
- %core.php_ext%
- '@config'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
feed.forum:
class: phpbb\feed\forum
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.forums:
class: phpbb\feed\forums
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.news:
class: phpbb\feed\news
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.overall:
class: phpbb\feed\overall
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.topic:
class: phpbb\feed\topic
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.topics:
class: phpbb\feed\topics
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'
feed.topics_active:
class: phpbb\feed\topics_active
scope: prototype
arguments:
- @feed.helper
- @config
- @dbal.conn
- @cache.driver
- @user
- @auth
- @content.visibility
- %core.php_ext%
- '@feed.helper'
- '@config'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@auth'
- '@content.visibility'
- '%core.php_ext%'

54
phpBB/config/default/container/services_files.yml
View File

@@ -2,55 +2,55 @@ services:
files.factory:
class: phpbb\files\factory
arguments:
- @service_container
- '@service_container'
files.filespec:
class: phpbb\files\filespec
scope: prototype
arguments:
- @filesystem
- @language
- @php_ini
- @upload_imagesize
- %core.root_path%
- @mimetype.guesser
- @plupload
- '@filesystem'
- '@language'
- '@php_ini'
- '@upload_imagesize'
- '%core.root_path%'
- '@mimetype.guesser'
- '@plupload'
files.upload:
class: phpbb\files\upload
scope: prototype
arguments:
- @filesystem
- @files.factory
- @language
- @php_ini
- @request
- '@filesystem'
- '@files.factory'
- '@language'
- '@php_ini'
- '@request'
files.types.form:
class: phpbb\files\types\form
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @plupload
- @request
- '@files.factory'
- '@language'
- '@php_ini'
- '@plupload'
- '@request'
files.types.local:
class: phpbb\files\types\form
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @request
- '@files.factory'
- '@language'
- '@php_ini'
- '@request'
files.types.remote:
class: phpbb\files\types\remote
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @request
- %core.root_path%
- '@files.factory'
- '@language'
- '@php_ini'
- '@request'
- '%core.root_path%'

30
phpBB/config/default/container/services_help.yml
View File

@@ -2,26 +2,26 @@ services:
phpbb.help.manager:
class: phpbb\help\manager
arguments:
- @dispatcher
- @language
- @template
- '@dispatcher'
- '@language'
- '@template'
phpbb.help.controller.bbcode:
class: phpbb\help\controller\bbcode
arguments:
- @controller.helper
- @phpbb.help.manager
- @template
- @language
- %core.root_path%
- %core.php_ext%
- '@controller.helper'
- '@phpbb.help.manager'
- '@template'
- '@language'
- '%core.root_path%'
- '%core.php_ext%'
phpbb.help.controller.faq:
class: phpbb\help\controller\faq
arguments:
- @controller.helper
- @phpbb.help.manager
- @template
- @language
- %core.root_path%
- %core.php_ext%
- '@controller.helper'
- '@phpbb.help.manager'
- '@template'
- '@language'
- '%core.root_path%'
- '%core.php_ext%'

6
phpBB/config/default/container/services_hook.yml
View File

@@ -2,6 +2,6 @@ services:
hook_finder:
class: phpbb\hook\finder
arguments:
- %core.root_path%
- %core.php_ext%
- @cache.driver
- '%core.root_path%'
- '%core.php_ext%'
- '@cache.driver'

10
phpBB/config/default/container/services_http.yml
View File

@@ -2,16 +2,16 @@ services:
http_kernel:
class: Symfony\Component\HttpKernel\HttpKernel
arguments:
- @dispatcher
- @controller.resolver
- @request_stack
- '@dispatcher'
- '@controller.resolver'
- '@request_stack'
# WARNING: The Symfony request does not escape the input and should be used very carefully
# prefer the phpbb request (service @request) as possible
symfony_request:
class: phpbb\symfony_request
arguments:
- @request
- '@request'
request_stack:
class: Symfony\Component\HttpFoundation\RequestStack
@@ -20,4 +20,4 @@ services:
class: phpbb\request\request
arguments:
- null
- %core.disable_super_globals%
- '%core.disable_super_globals%'

10
phpBB/config/default/container/services_language.yml
View File

@@ -2,21 +2,21 @@ services:
language.helper.language_file:
class: phpbb\language\language_file_helper
arguments:
- %core.root_path%
- '%core.root_path%'
language:
class: phpbb\language\language
arguments:
- @language.loader
- '@language.loader'
language.loader_abstract:
abstract: true
class: phpbb\language\language_file_loader
arguments:
- %core.root_path%
- %core.php_ext%
- '%core.root_path%'
- '%core.php_ext%'
language.loader:
parent: language.loader_abstract
calls:
- [set_extension_manager, ["@ext.manager"]]
- [set_extension_manager, ['@ext.manager']]

50
phpBB/config/default/container/services_migrator.yml
View File

@@ -3,16 +3,16 @@ services:
migrator:
class: phpbb\db\migrator
arguments:
- @service_container
- @config
- @dbal.conn
- @dbal.tools
- %tables.migrations%
- %core.root_path%
- %core.php_ext%
- %core.table_prefix%
- @migrator.tool_collection
- @migrator.helper
- '@service_container'
- '@config'
- '@dbal.conn'
- '@dbal.tools'
- '%tables.migrations%'
- '%core.root_path%'
- '%core.php_ext%'
- '%core.table_prefix%'
- '@migrator.tool_collection'
- '@migrator.helper'
migrator.helper:
class: phpbb\db\migration\helper
@@ -21,44 +21,44 @@ services:
migrator.tool_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: migrator.tool }
migrator.tool.config:
class: phpbb\db\migration\tool\config
arguments:
- @config
- '@config'
tags:
- { name: migrator.tool }
migrator.tool.config_text:
class: phpbb\db\migration\tool\config_text
arguments:
- @config_text
- '@config_text'
tags:
- { name: migrator.tool }
migrator.tool.module:
class: phpbb\db\migration\tool\module
arguments:
- @dbal.conn
- @cache
- @user
- @module.manager
- %core.root_path%
- %core.php_ext%
- %tables.modules%
- '@dbal.conn'
- '@cache'
- '@user'
- '@module.manager'
- '%core.root_path%'
- '%core.php_ext%'
- '%tables.modules%'
tags:
- { name: migrator.tool }
migrator.tool.permission:
class: phpbb\db\migration\tool\permission
arguments:
- @dbal.conn
- @cache
- @auth
- %core.root_path%
- %core.php_ext%
- '@dbal.conn'
- '@cache'
- '@auth'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: migrator.tool }

8
phpBB/config/default/container/services_mimetype_guesser.yml
View File

@@ -2,7 +2,7 @@ services:
mimetype.guesser_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: mimetype.guessers }
@@ -19,18 +19,18 @@ services:
mimetype.content_guesser:
class: phpbb\mimetype\content_guesser
calls:
- [set_priority, [%mimetype.guesser.priority.low%]]
- [set_priority, ['%mimetype.guesser.priority.low%']]
tags:
- { name: mimetype.guessers }
mimetype.extension_guesser:
class: phpbb\mimetype\extension_guesser
calls:
- [set_priority, [%mimetype.guesser.priority.lowest%]]
- [set_priority, ['%mimetype.guesser.priority.lowest%']]
tags:
- { name: mimetype.guessers }
mimetype.guesser:
class: phpbb\mimetype\guesser
arguments:
- @mimetype.guesser_collection
- '@mimetype.guesser_collection'

12
phpBB/config/default/container/services_module.yml
View File

@@ -2,9 +2,9 @@ services:
module.manager:
class: phpbb\module\module_manager
arguments:
- @cache.driver
- @dbal.conn
- @ext.manager
- %tables.modules%
- %core.root_path%
- %core.php_ext%
- '@cache.driver'
- '@dbal.conn'
- '@ext.manager'
- '%tables.modules%'
- '%core.root_path%'
- '%core.php_ext%'

94
phpBB/config/default/container/services_notification.yml
View File

@@ -2,45 +2,45 @@ services:
notification_manager:
class: phpbb\notification\manager
arguments:
- @notification.type_collection
- @notification.method_collection
- @service_container
- @user_loader
- @dispatcher
- @dbal.conn
- @cache
- @language
- @user
- %tables.notification_types%
- %tables.user_notifications%
- '@notification.type_collection'
- '@notification.method_collection'
- '@service_container'
- '@user_loader'
- '@dispatcher'
- '@dbal.conn'
- '@cache'
- '@language'
- '@user'
- '%tables.notification_types%'
- '%tables.user_notifications%'
# ----- Notification's types -----
# Scope MUST be prototype for all the plugins to work.
notification.type_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: notification.type }
notification.type.base:
abstract: true
arguments:
- @dbal.conn
- @language
- @user
- @auth
- %core.root_path%
- %core.php_ext%
- %tables.user_notifications%
- '@dbal.conn'
- '@language'
- '@user'
- '@auth'
- '%core.root_path%'
- '%core.php_ext%'
- '%tables.user_notifications%'
notification.type.admin_activate_user:
class: phpbb\notification\type\admin_activate_user
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
- [set_user_loader, ['@user_loader']]
- [set_config, ['@config']]
tags:
- { name: notification.type }
@@ -84,7 +84,7 @@ services:
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_user_loader, ['@user_loader']]
tags:
- { name: notification.type }
@@ -100,8 +100,8 @@ services:
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
- [set_user_loader, ['@user_loader']]
- [set_config, ['@config']]
tags:
- { name: notification.type }
@@ -110,8 +110,8 @@ services:
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
- [set_user_loader, ['@user_loader']]
- [set_config, ['@config']]
tags:
- { name: notification.type }
@@ -127,7 +127,7 @@ services:
scope: prototype
parent: notification.type.post
calls:
- [set_utils, [@text_formatter.utils]]
- [set_utils, ['@text_formatter.utils']]
tags:
- { name: notification.type }
@@ -164,8 +164,8 @@ services:
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
- [set_user_loader, ['@user_loader']]
- [set_config, ['@config']]
tags:
- { name: notification.type }
@@ -181,7 +181,7 @@ services:
notification.method_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: notification.method }
@@ -189,13 +189,13 @@ services:
class: phpbb\notification\method\board
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
- @dbal.conn
- @cache.driver
- @user
- @config
- %tables.notification_types%
- %tables.notifications%
- '@user_loader'
- '@dbal.conn'
- '@cache.driver'
- '@user'
- '@config'
- '%tables.notification_types%'
- '%tables.notifications%'
tags:
- { name: notification.method }
@@ -203,11 +203,11 @@ services:
class: phpbb\notification\method\email
scope: prototype
arguments:
- @user_loader
- @user
- @config
- %core.root_path%
- %core.php_ext%
- '@user_loader'
- '@user'
- '@config'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: notification.method }
@@ -215,10 +215,10 @@ services:
class: phpbb\notification\method\jabber
scope: prototype
arguments:
- @user_loader
- @user
- @config
- %core.root_path%
- %core.php_ext%
- '@user_loader'
- '@user'
- '@config'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: notification.method }

66
phpBB/config/default/container/services_password.yml
View File

@@ -3,10 +3,10 @@ services:
passwords.manager:
class: phpbb\passwords\manager
arguments:
- @config
- @passwords.driver_collection
- @passwords.helper
- %passwords.algorithms%
- '@config'
- '@passwords.driver_collection'
- '@passwords.helper'
- '%passwords.algorithms%'
passwords.helper:
class: phpbb\passwords\helper
@@ -14,111 +14,111 @@ services:
passwords.driver_helper:
class: phpbb\passwords\driver\helper
arguments:
- @config
- '@config'
# ----- Password's drivers -----
passwords.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: passwords.driver }
passwords.driver.bcrypt:
class: phpbb\passwords\driver\bcrypt
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.bcrypt_2y:
class: phpbb\passwords\driver\bcrypt_2y
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.bcrypt_wcf2:
class: phpbb\passwords\driver\bcrypt_wcf2
arguments:
- @passwords.driver.bcrypt
- @passwords.driver_helper
- '@passwords.driver.bcrypt'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.salted_md5:
class: phpbb\passwords\driver\salted_md5
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.phpass:
class: phpbb\passwords\driver\phpass
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.convert_password:
class: phpbb\passwords\driver\convert_password
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.sha1_smf:
class: phpbb\passwords\driver\sha1_smf
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.sha1_wcf1:
class: phpbb\passwords\driver\sha1_wcf1
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.sha1:
class: phpbb\passwords\driver\sha1
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.md5_phpbb2:
class: phpbb\passwords\driver\md5_phpbb2
arguments:
- @request
- @passwords.driver.salted_md5
- @passwords.driver_helper
- %core.root_path%
- %core.php_ext%
- '@request'
- '@passwords.driver.salted_md5'
- '@passwords.driver_helper'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: passwords.driver }
passwords.driver.md5_mybb:
class: phpbb\passwords\driver\md5_mybb
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }
passwords.driver.md5_vb:
class: phpbb\passwords\driver\md5_vb
arguments:
- @config
- @passwords.driver_helper
- '@config'
- '@passwords.driver_helper'
tags:
- { name: passwords.driver }

78
phpBB/config/default/container/services_profilefield.yml
View File

@@ -2,101 +2,101 @@ services:
profilefields.manager:
class: phpbb\profilefields\manager
arguments:
- @auth
- @dbal.conn
- @dispatcher
- @request
- @template
- @profilefields.type_collection
- @user
- %tables.profile_fields%
- %tables.profile_fields_language%
- %tables.profile_fields_data%
- '@auth'
- '@dbal.conn'
- '@dispatcher'
- '@request'
- '@template'
- '@profilefields.type_collection'
- '@user'
- '%tables.profile_fields%'
- '%tables.profile_fields_language%'
- '%tables.profile_fields_data%'
profilefields.lang_helper:
class: phpbb\profilefields\lang_helper
arguments:
- @dbal.conn
- %tables.profile_fields_options_language%
- '@dbal.conn'
- '%tables.profile_fields_options_language%'
# ----- Profile fields types -----
profilefields.type_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: profilefield.type }
profilefields.type.bool:
class: phpbb\profilefields\type\type_bool
arguments:
- @profilefields.lang_helper
- @request
- @template
- @user
- '@profilefields.lang_helper'
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.date:
class: phpbb\profilefields\type\type_date
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.dropdown:
class: phpbb\profilefields\type\type_dropdown
arguments:
- @profilefields.lang_helper
- @request
- @template
- @user
- '@profilefields.lang_helper'
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.googleplus:
class: phpbb\profilefields\type\type_googleplus
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.int:
class: phpbb\profilefields\type\type_int
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.string:
class: phpbb\profilefields\type\type_string
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.text:
class: phpbb\profilefields\type\type_text
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }
profilefields.type.url:
class: phpbb\profilefields\type\type_url
arguments:
- @request
- @template
- @user
- '@request'
- '@template'
- '@user'
tags:
- { name: profilefield.type }

52
phpBB/config/default/container/services_report.yml
View File

@@ -3,30 +3,30 @@ services:
phpbb.report.controller:
class: phpbb\report\controller\report
arguments:
- @config
- @user
- @template
- @controller.helper
- @request
- @captcha.factory
- @phpbb.report.handler_factory
- @phpbb.report.report_reason_list_provider
- %core.root_path%
- %core.php_ext%
- '@config'
- '@user'
- '@template'
- '@controller.helper'
- '@request'
- '@captcha.factory'
- '@phpbb.report.handler_factory'
- '@phpbb.report.report_reason_list_provider'
- '%core.root_path%'
- '%core.php_ext%'
# ----- Report handler factory -----
phpbb.report.handler_factory:
class: phpbb\report\handler_factory
arguments:
- @service_container
- '@service_container'
# ----- Report UI provider -----
phpbb.report.report_reason_list_provider:
class: phpbb\report\report_reason_list_provider
arguments:
- @dbal.conn.driver
- @template
- @user
- '@dbal.conn.driver'
- '@template'
- '@user'
# ----- Report handlers -----
# Scope MUST be prototype for all the handlers to work correctly.
@@ -34,20 +34,20 @@ services:
class: phpbb\report\report_handler_pm
scope: prototype
arguments:
- @dbal.conn.driver
- @dispatcher
- @config
- @auth
- @user
- @notification_manager
- '@dbal.conn.driver'
- '@dispatcher'
- '@config'
- '@auth'
- '@user'
- '@notification_manager'
phpbb.report.handlers.report_handler_post:
class: phpbb\report\report_handler_post
scope: prototype
arguments:
- @dbal.conn.driver
- @dispatcher
- @config
- @auth
- @user
- @notification_manager
- '@dbal.conn.driver'
- '@dispatcher'
- '@config'
- '@auth'
- '@user'
- '@notification_manager'

48
phpBB/config/default/container/services_routing.yml
View File

@@ -2,57 +2,57 @@ services:
router:
class: phpbb\routing\router
arguments:
- @service_container
- @routing.chained_resources_locator
- @routing.delegated_loader
- %core.root_path%
- %core.php_ext%
- %core.environment%
- '@service_container'
- '@routing.chained_resources_locator'
- '@routing.delegated_loader'
- '%core.root_path%'
- '%core.php_ext%'
- '%core.environment%'
router.listener:
class: Symfony\Component\HttpKernel\EventListener\RouterListener
arguments:
- @router
- '@router'
- null
- null
- @request_stack
- '@request_stack'
tags:
- { name: kernel.event_subscriber }
routing.helper:
class: phpbb\routing\helper
arguments:
- @config
- @router
- @symfony_request
- @request
- @filesystem
- %core.root_path%
- %core.php_ext%
- '@config'
- '@router'
- '@symfony_request'
- '@request'
- '@filesystem'
- '%core.root_path%'
- '%core.php_ext%'
# ---- Route loaders ----
routing.delegated_loader:
class: Symfony\Component\Config\Loader\DelegatingLoader
arguments:
- @routing.resolver
- '@routing.resolver'
routing.resolver:
class: phpbb\routing\loader_resolver
arguments:
- @routing.loader.collection
- '@routing.loader.collection'
routing.loader.collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: routing.loader }
routing.loader.yaml:
class: Symfony\Component\Routing\Loader\YamlFileLoader
arguments:
- @file_locator
- '@file_locator'
tags:
- { name: routing.loader }
@@ -61,20 +61,20 @@ services:
routing.chained_resources_locator:
class: phpbb\routing\resources_locator\chained_resources_locator
arguments:
- @routing.resources_locator.collection
- '@routing.resources_locator.collection'
routing.resources_locator.collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: routing.resources_locator }
routing.resources_locator.default:
class: phpbb\routing\resources_locator\default_resources_locator
arguments:
- %core.root_path%
- %core.environment%
- @ext.manager
- '%core.root_path%'
- '%core.environment%'
- '@ext.manager'
tags:
- { name: routing.resources_locator }

58
phpBB/config/default/container/services_text_formatter.yml
View File

@@ -1,5 +1,5 @@
parameters:
text_formatter.cache.dir: %core.root_path%cache/%core.environment%/
text_formatter.cache.dir: '%core.root_path%cache/%core.environment%/'
text_formatter.cache.parser.key: _text_formatter_parser
text_formatter.cache.renderer.key: _text_formatter_renderer
@@ -10,12 +10,12 @@ services:
text_formatter.data_access:
class: phpbb\textformatter\data_access
arguments:
- @dbal.conn
- %tables.bbcodes%
- %tables.smilies%
- %tables.styles%
- %tables.words%
- %core.root_path%styles/
- '@dbal.conn'
- '%tables.bbcodes%'
- '%tables.smilies%'
- '%tables.styles%'
- '%tables.words%'
- '%core.root_path%styles/'
text_formatter.parser:
alias: text_formatter.s9e.parser
@@ -29,41 +29,41 @@ services:
text_formatter.s9e.factory:
class: phpbb\textformatter\s9e\factory
arguments:
- @text_formatter.data_access
- @cache.driver
- @dispatcher
- @config
- %text_formatter.cache.dir%
- %text_formatter.cache.parser.key%
- %text_formatter.cache.renderer.key%
- '@text_formatter.data_access'
- '@cache.driver'
- '@dispatcher'
- '@config'
- '%text_formatter.cache.dir%'
- '%text_formatter.cache.parser.key%'
- '%text_formatter.cache.renderer.key%'
text_formatter.s9e.parser:
class: phpbb\textformatter\s9e\parser
arguments:
- @cache.driver
- %text_formatter.cache.parser.key%
- @text_formatter.s9e.factory
- @dispatcher
- '@cache.driver'
- '%text_formatter.cache.parser.key%'
- '@text_formatter.s9e.factory'
- '@dispatcher'
text_formatter.s9e.quote_helper:
class: phpbb\textformatter\s9e\quote_helper
arguments:
- @user
- %core.root_path%
- %core.php_ext%
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
text_formatter.s9e.renderer:
class: phpbb\textformatter\s9e\renderer
arguments:
- @cache.driver
- %text_formatter.cache.dir%
- %text_formatter.cache.renderer.key%
- @text_formatter.s9e.factory
- @dispatcher
- '@cache.driver'
- '%text_formatter.cache.dir%'
- '%text_formatter.cache.renderer.key%'
- '@text_formatter.s9e.factory'
- '@dispatcher'
calls:
- [configure_quote_helper, [@text_formatter.s9e.quote_helper]]
- [configure_smilies_path, [@config, @path_helper]]
- [configure_user, [@user, @config, @auth]]
- [configure_quote_helper, ['@text_formatter.s9e.quote_helper']]
- [configure_smilies_path, ['@config', '@path_helper']]
- [configure_user, ['@user', '@config', '@auth']]
text_formatter.s9e.utils:
class: phpbb\textformatter\s9e\utils

44
phpBB/config/default/container/services_text_reparser.yml
View File

@@ -2,90 +2,90 @@ services:
text_reparser.manager:
class: phpbb\textreparser\manager
arguments:
- @config
- @config_text
- @text_reparser_collection
- '@config'
- '@config_text'
- '@text_reparser_collection'
text_reparser.lock:
class: phpbb\lock\db
arguments:
- reparse_lock
- @config
- @dbal.conn
- '@config'
- '@dbal.conn'
text_reparser_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: text_reparser.plugin }
text_reparser.contact_admin_info:
class: phpbb\textreparser\plugins\contact_admin_info
arguments:
- @config_text
- '@config_text'
tags:
- { name: text_reparser.plugin }
text_reparser.forum_description:
class: phpbb\textreparser\plugins\forum_description
arguments:
- @dbal.conn
- %tables.forums%
- '@dbal.conn'
- '%tables.forums%'
tags:
- { name: text_reparser.plugin }
text_reparser.forum_rules:
class: phpbb\textreparser\plugins\forum_rules
arguments:
- @dbal.conn
- %tables.forums%
- '@dbal.conn'
- '%tables.forums%'
tags:
- { name: text_reparser.plugin }
text_reparser.group_description:
class: phpbb\textreparser\plugins\group_description
arguments:
- @dbal.conn
- %tables.groups%
- '@dbal.conn'
- '%tables.groups%'
tags:
- { name: text_reparser.plugin }
text_reparser.pm_text:
class: phpbb\textreparser\plugins\pm_text
arguments:
- @dbal.conn
- %tables.privmsgs%
- '@dbal.conn'
- '%tables.privmsgs%'
tags:
- { name: text_reparser.plugin }
text_reparser.poll_option:
class: phpbb\textreparser\plugins\poll_option
arguments:
- @dbal.conn
- '@dbal.conn'
tags:
- { name: text_reparser.plugin }
text_reparser.poll_title:
class: phpbb\textreparser\plugins\poll_title
arguments:
- @dbal.conn
- %tables.topics%
- '@dbal.conn'
- '%tables.topics%'
tags:
- { name: text_reparser.plugin }
text_reparser.post_text:
class: phpbb\textreparser\plugins\post_text
arguments:
- @dbal.conn
- %tables.posts%
- '@dbal.conn'
- '%tables.posts%'
tags:
- { name: text_reparser.plugin }
text_reparser.user_signature:
class: phpbb\textreparser\plugins\user_signature
arguments:
- @dbal.conn
- %tables.users%
- '@dbal.conn'
- '%tables.users%'
tags:
- { name: text_reparser.plugin }

44
phpBB/config/default/container/services_twig.yml
View File

@@ -1,48 +1,48 @@
parameters:
core.template.cache_path: %core.root_path%cache/%core.environment%/twig/
core.template.cache_path: '%core.root_path%cache/%core.environment%/twig/'
services:
template.twig.environment:
class: phpbb\template\twig\environment
arguments:
- @config
- @filesystem
- @path_helper
- @service_container
- %core.template.cache_path%
- @ext.manager
- @template.twig.loader
- '@config'
- '@filesystem'
- '@path_helper'
- '@service_container'
- '%core.template.cache_path%'
- '@ext.manager'
- '@template.twig.loader'
- []
template.twig.lexer:
class: phpbb\template\twig\lexer
arguments:
- @template.twig.environment
- '@template.twig.environment'
template.twig.loader:
class: phpbb\template\twig\loader
arguments:
- @filesystem
- '@filesystem'
template.twig.extensions.collection:
class: phpbb\di\service_collection
arguments:
- @service_container
- '@service_container'
tags:
- { name: service_collection, tag: twig.extension }
template.twig.extensions.phpbb:
class: phpbb\template\twig\extension
arguments:
- @template_context
- @language
- '@template_context'
- '@language'
tags:
- { name: twig.extension }
template.twig.extensions.routing:
class: phpbb\template\twig\extension\routing
arguments:
- @routing.helper
- '@routing.helper'
tags:
- { name: twig.extension }
@@ -52,14 +52,14 @@ services:
template:
class: phpbb\template\twig\twig
arguments:
- @path_helper
- @config
- @template_context
- @template.twig.environment
- %core.template.cache_path%
- @user
- @template.twig.extensions.collection
- @ext.manager
- '@path_helper'
- '@config'
- '@template_context'
- '@template.twig.environment'
- '%core.template.cache_path%'
- '@user'
- '@template.twig.extensions.collection'
- '@ext.manager'
template_context:
class: phpbb\template\context

16
phpBB/config/default/container/services_user.yml
View File

@@ -2,19 +2,19 @@ services:
acl.permissions:
class: phpbb\permissions
arguments:
- @dispatcher
- @user
- '@dispatcher'
- '@user'
user:
class: phpbb\user
arguments:
- @language
- %datetime.class%
- '@language'
- '%datetime.class%'
user_loader:
class: phpbb\user_loader
arguments:
- @dbal.conn
- %core.root_path%
- %core.php_ext%
- %tables.users%
- '@dbal.conn'
- '%core.root_path%'
- '%core.php_ext%'
- '%tables.users%'

152
phpBB/config/default/container/tables.yml
View File

@@ -1,77 +1,77 @@
parameters:
tables.acl_groups: %core.table_prefix%acl_groups
tables.acl_options: %core.table_prefix%acl_options
tables.acl_roles: %core.table_prefix%acl_roles
tables.acl_roles_data: %core.table_prefix%acl_roles_data
tables.acl_users: %core.table_prefix%acl_users
tables.attachments: %core.table_prefix%attachments
tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens
tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts
tables.banlist: %core.table_prefix%banlist
tables.bbcodes: %core.table_prefix%bbcodes
tables.bookmarks: %core.table_prefix%bookmarks
tables.bots: %core.table_prefix%bots
tables.captcha_qa_questions: %core.table_prefix%captcha_questions
tables.captcha_qa_answers: %core.table_prefix%captcha_answers
tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
tables.config: %core.table_prefix%config
tables.config_text: %core.table_prefix%config_text
tables.confirm: %core.table_prefix%confirm
tables.disallow: %core.table_prefix%disallow
tables.drafts: %core.table_prefix%drafts
tables.ext: %core.table_prefix%ext
tables.extensions: %core.table_prefix%extensions
tables.extension_groups: %core.table_prefix%extension_groups
tables.forums: %core.table_prefix%forums
tables.forums_access: %core.table_prefix%forums_access
tables.forums_track: %core.table_prefix%forums_track
tables.forums_watch: %core.table_prefix%forums_watch
tables.groups: %core.table_prefix%groups
tables.icons: %core.table_prefix%icons
tables.lang: %core.table_prefix%lang
tables.log: %core.table_prefix%log
tables.login_attempts: %core.table_prefix%login_attempts
tables.migrations: %core.table_prefix%migrations
tables.moderator_cache: %core.table_prefix%moderator_cache
tables.modules: %core.table_prefix%modules
tables.notification_types: %core.table_prefix%notification_types
tables.notifications: %core.table_prefix%notifications
tables.poll_options: %core.table_prefix%poll_options
tables.poll_votes: %core.table_prefix%poll_votes
tables.posts: %core.table_prefix%posts
tables.privmsgs: %core.table_prefix%privmsgs
tables.privmsgs_folder: %core.table_prefix%privmsgs_folder
tables.privmsgs_rules: %core.table_prefix%privmsgs_rules
tables.privmsgs_to: %core.table_prefix%privmsgs_to
tables.profile_fields: %core.table_prefix%profile_fields
tables.profile_fields_data: %core.table_prefix%profile_fields_data
tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang
tables.profile_fields_language: %core.table_prefix%profile_lang
tables.ranks: %core.table_prefix%ranks
tables.reports: %core.table_prefix%reports
tables.reports_reasons: %core.table_prefix%reports_reasons
tables.search_results: %core.table_prefix%search_results
tables.search_wordlist: %core.table_prefix%search_wordlist
tables.search_wordmatch: %core.table_prefix%search_wordmatch
tables.sessions: %core.table_prefix%sessions
tables.sessions_keys: %core.table_prefix%sessions_keys
tables.sitelist: %core.table_prefix%sitelist
tables.smilies: %core.table_prefix%smilies
tables.sphinx: %core.table_prefix%sphinx
tables.styles: %core.table_prefix%styles
tables.styles_template: %core.table_prefix%styles_template
tables.styles_template_data: %core.table_prefix%styles_template_data
tables.styles_theme: %core.table_prefix%styles_theme
tables.styles_imageset: %core.table_prefix%styles_imageset
tables.styles_imageset_data: %core.table_prefix%styles_imageset_data
tables.teampage: %core.table_prefix%teampage
tables.topics: %core.table_prefix%topics
tables.topics_posted: %core.table_prefix%topics_posted
tables.topics_track: %core.table_prefix%topics_track
tables.topics_watch: %core.table_prefix%topics_watch
tables.user_group: %core.table_prefix%user_group
tables.user_notifications: %core.table_prefix%user_notifications
tables.users: %core.table_prefix%users
tables.warnings: %core.table_prefix%warnings
tables.words: %core.table_prefix%words
tables.zebra: %core.table_prefix%zebra
tables.acl_groups: '%core.table_prefix%acl_groups'
tables.acl_options: '%core.table_prefix%acl_options'
tables.acl_roles: '%core.table_prefix%acl_roles'
tables.acl_roles_data: '%core.table_prefix%acl_roles_data'
tables.acl_users: '%core.table_prefix%acl_users'
tables.attachments: '%core.table_prefix%attachments'
tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens'
tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
tables.banlist: '%core.table_prefix%banlist'
tables.bbcodes: '%core.table_prefix%bbcodes'
tables.bookmarks: '%core.table_prefix%bookmarks'
tables.bots: '%core.table_prefix%bots'
tables.captcha_qa_questions: '%core.table_prefix%captcha_questions'
tables.captcha_qa_answers: '%core.table_prefix%captcha_answers'
tables.captcha_qa_confirm: '%core.table_prefix%qa_confirm'
tables.config: '%core.table_prefix%config'
tables.config_text: '%core.table_prefix%config_text'
tables.confirm: '%core.table_prefix%confirm'
tables.disallow: '%core.table_prefix%disallow'
tables.drafts: '%core.table_prefix%drafts'
tables.ext: '%core.table_prefix%ext'
tables.extensions: '%core.table_prefix%extensions'
tables.extension_groups: '%core.table_prefix%extension_groups'
tables.forums: '%core.table_prefix%forums'
tables.forums_access: '%core.table_prefix%forums_access'
tables.forums_track: '%core.table_prefix%forums_track'
tables.forums_watch: '%core.table_prefix%forums_watch'
tables.groups: '%core.table_prefix%groups'
tables.icons: '%core.table_prefix%icons'
tables.lang: '%core.table_prefix%lang'
tables.log: '%core.table_prefix%log'
tables.login_attempts: '%core.table_prefix%login_attempts'
tables.migrations: '%core.table_prefix%migrations'
tables.moderator_cache: '%core.table_prefix%moderator_cache'
tables.modules: '%core.table_prefix%modules'
tables.notification_types: '%core.table_prefix%notification_types'
tables.notifications: '%core.table_prefix%notifications'
tables.poll_options: '%core.table_prefix%poll_options'
tables.poll_votes: '%core.table_prefix%poll_votes'
tables.posts: '%core.table_prefix%posts'
tables.privmsgs: '%core.table_prefix%privmsgs'
tables.privmsgs_folder: '%core.table_prefix%privmsgs_folder'
tables.privmsgs_rules: '%core.table_prefix%privmsgs_rules'
tables.privmsgs_to: '%core.table_prefix%privmsgs_to'
tables.profile_fields: '%core.table_prefix%profile_fields'
tables.profile_fields_data: '%core.table_prefix%profile_fields_data'
tables.profile_fields_options_language: '%core.table_prefix%profile_fields_lang'
tables.profile_fields_language: '%core.table_prefix%profile_lang'
tables.ranks: '%core.table_prefix%ranks'
tables.reports: '%core.table_prefix%reports'
tables.reports_reasons: '%core.table_prefix%reports_reasons'
tables.search_results: '%core.table_prefix%search_results'
tables.search_wordlist: '%core.table_prefix%search_wordlist'
tables.search_wordmatch: '%core.table_prefix%search_wordmatch'
tables.sessions: '%core.table_prefix%sessions'
tables.sessions_keys: '%core.table_prefix%sessions_keys'
tables.sitelist: '%core.table_prefix%sitelist'
tables.smilies: '%core.table_prefix%smilies'
tables.sphinx: '%core.table_prefix%sphinx'
tables.styles: '%core.table_prefix%styles'
tables.styles_template: '%core.table_prefix%styles_template'
tables.styles_template_data: '%core.table_prefix%styles_template_data'
tables.styles_theme: '%core.table_prefix%styles_theme'
tables.styles_imageset: '%core.table_prefix%styles_imageset'
tables.styles_imageset_data: '%core.table_prefix%styles_imageset_data'
tables.teampage: '%core.table_prefix%teampage'
tables.topics: '%core.table_prefix%topics'
tables.topics_posted: '%core.table_prefix%topics_posted'
tables.topics_track: '%core.table_prefix%topics_track'
tables.topics_watch: '%core.table_prefix%topics_watch'
tables.user_group: '%core.table_prefix%user_group'
tables.user_notifications: '%core.table_prefix%user_notifications'
tables.users: '%core.table_prefix%users'
tables.warnings: '%core.table_prefix%warnings'
tables.words: '%core.table_prefix%words'
tables.zebra: '%core.table_prefix%zebra'