diff options
Diffstat (limited to 'phpBB/config')
84 files changed, 3296 insertions, 1324 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml deleted file mode 100644 index dac8b9d252..0000000000 --- a/phpBB/config/auth_providers.yml +++ /dev/null @@ -1,83 +0,0 @@ -services: - auth.provider_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: auth.provider } - auth.provider.db: - class: phpbb\auth\provider\db - arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - %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% - tags: - - { name: auth.provider } - auth.provider.ldap: - class: phpbb\auth\provider\ldap - arguments: - - @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% - - %core.root_path% - - %core.php_ext% - tags: - - { name: auth.provider } - auth.provider.oauth.service_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: auth.provider.oauth.service } - auth.provider.oauth.service.bitly: - class: phpbb\auth\provider\oauth\service\bitly - arguments: - - @config - - @request - tags: - - { name: auth.provider.oauth.service } - auth.provider.oauth.service.facebook: - class: phpbb\auth\provider\oauth\service\facebook - arguments: - - @config - - @request - tags: - - { name: auth.provider.oauth.service } - auth.provider.oauth.service.google: - class: phpbb\auth\provider\oauth\service\google - arguments: - - @config - - @request - tags: - - { name: auth.provider.oauth.service } diff --git a/phpBB/config/console.yml b/phpBB/config/console.yml deleted file mode 100644 index a4aae75e40..0000000000 --- a/phpBB/config/console.yml +++ /dev/null @@ -1,70 +0,0 @@ -services: - console.command.config.delete: - class: phpbb\console\command\config\delete - arguments: - - @config - tags: - - { name: console.command } - - console.command.config.increment: - class: phpbb\console\command\config\increment - arguments: - - @config - tags: - - { name: console.command } - - console.command.config.get: - class: phpbb\console\command\config\get - arguments: - - @config - tags: - - { name: console.command } - - console.command.config.set: - class: phpbb\console\command\config\set - arguments: - - @config - tags: - - { name: console.command } - - console.command.config.set_atomic: - class: phpbb\console\command\config\set_atomic - arguments: - - @config - tags: - - { name: console.command } - - console.command.extension.disable: - class: phpbb\console\command\extension\disable - arguments: - - @ext.manager - tags: - - { name: console.command } - - console.command.extension.enable: - class: phpbb\console\command\extension\enable - arguments: - - @ext.manager - tags: - - { name: console.command } - - console.command.extension.purge: - class: phpbb\console\command\extension\purge - arguments: - - @ext.manager - tags: - - { name: console.command } - - console.command.extension.show: - class: phpbb\console\command\extension\show - arguments: - - @ext.manager - tags: - - { name: console.command } - - console.command.fixup.recalculate_email_hash: - class: phpbb\console\command\fixup\recalculate_email_hash - arguments: - - @dbal.conn - tags: - - { name: console.command } diff --git a/phpBB/config/cron_tasks.yml b/phpBB/config/cron_tasks.yml deleted file mode 100644 index fd3aea85dc..0000000000 --- a/phpBB/config/cron_tasks.yml +++ /dev/null @@ -1,111 +0,0 @@ -services: - cron.task.core.prune_all_forums: - class: phpbb\cron\task\core\prune_all_forums - arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @dbal.conn - calls: - - [set_name, [cron.task.core.prune_all_forums]] - tags: - - { name: cron.task } - - cron.task.core.prune_forum: - class: phpbb\cron\task\core\prune_forum - arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @dbal.conn - calls: - - [set_name, [cron.task.core.prune_forum]] - tags: - - { name: cron.task } - - cron.task.core.prune_notifications: - class: phpbb\cron\task\core\prune_notifications - arguments: - - @config - - @notification_manager - calls: - - [set_name, [cron.task.core.prune_notifications]] - tags: - - { name: cron.task } - - cron.task.core.queue: - class: phpbb\cron\task\core\queue - arguments: - - %core.root_path% - - %core.php_ext% - - @config - calls: - - [set_name, [cron.task.core.queue]] - tags: - - { name: cron.task } - - cron.task.core.tidy_cache: - class: phpbb\cron\task\core\tidy_cache - arguments: - - @config - - @cache.driver - calls: - - [set_name, [cron.task.core.tidy_cache]] - tags: - - { name: cron.task } - - cron.task.core.tidy_database: - class: phpbb\cron\task\core\tidy_database - arguments: - - %core.root_path% - - %core.php_ext% - - @config - calls: - - [set_name, [cron.task.core.tidy_database]] - tags: - - { name: cron.task } - - cron.task.core.tidy_plupload: - class: phpbb\cron\task\core\tidy_plupload - arguments: - - %core.root_path% - - @config - calls: - - [set_name, [cron.task.core.tidy_plupload]] - tags: - - { name: cron.task } - - cron.task.core.tidy_search: - class: phpbb\cron\task\core\tidy_search - arguments: - - %core.root_path% - - %core.php_ext% - - @auth - - @config - - @dbal.conn - - @user - calls: - - [set_name, [cron.task.core.tidy_search]] - tags: - - { name: cron.task } - - cron.task.core.tidy_sessions: - class: phpbb\cron\task\core\tidy_sessions - arguments: - - @config - - @user - calls: - - [set_name, [cron.task.core.tidy_sessions]] - tags: - - { name: cron.task } - - cron.task.core.tidy_warnings: - class: phpbb\cron\task\core\tidy_warnings - arguments: - - %core.root_path% - - %core.php_ext% - - @config - calls: - - [set_name, [cron.task.core.tidy_warnings]] - tags: - - { name: cron.task } diff --git a/phpBB/config/default/config.yml b/phpBB/config/default/config.yml new file mode 100644 index 0000000000..e8d0536287 --- /dev/null +++ b/phpBB/config/default/config.yml @@ -0,0 +1 @@ +# phpBB's config file (This line is needed because of the packager) diff --git a/phpBB/config/default/container/parameters.yml b/phpBB/config/default/container/parameters.yml new file mode 100644 index 0000000000..8ecc1428f4 --- /dev/null +++ b/phpBB/config/default/container/parameters.yml @@ -0,0 +1,20 @@ +parameters: + # Disable the usage of the super globals (_GET, _POST, _SERVER...) + core.disable_super_globals: true + + # Datetime class to use + datetime.class: \phpbb\datetime + + # Mimetype guesser priorities + mimetype.guesser.priority.lowest: -2 + mimetype.guesser.priority.low: -1 + mimetype.guesser.priority.default: 0 + mimetype.guesser.priority.high: 1 + mimetype.guesser.priority.highest: 2 + + # List of default password driver types + passwords.algorithms: + - passwords.driver.bcrypt_2y + - passwords.driver.bcrypt + - passwords.driver.salted_md5 + - passwords.driver.phpass diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml new file mode 100644 index 0000000000..f5f85fbcad --- /dev/null +++ b/phpBB/config/default/container/services.yml @@ -0,0 +1,169 @@ +imports: + - { resource: services_attachment.yml } + - { resource: services_auth.yml } + - { resource: services_avatar.yml } + - { resource: services_captcha.yml } + - { resource: services_console.yml } + - { resource: services_content.yml } + - { resource: services_cron.yml } + - { resource: services_db.yml } + - { resource: services_event.yml } + - { resource: services_feed.yml } + - { resource: services_files.yml } + - { resource: services_filesystem.yml } + - { resource: services_help.yml } + - { resource: services_hook.yml } + - { resource: services_http.yml } + - { resource: services_language.yml } + - { resource: services_migrator.yml } + - { resource: services_mimetype_guesser.yml } + - { resource: services_module.yml } + - { resource: services_notification.yml } + - { resource: services_password.yml } + - { resource: services_php.yml } + - { resource: services_profilefield.yml } + - { resource: services_report.yml } + - { resource: services_routing.yml } + - { resource: services_text_formatter.yml } + - { resource: services_text_reparser.yml } + - { resource: services_twig.yml } + - { resource: services_user.yml } + + - { resource: tables.yml } + - { resource: parameters.yml } + +services: + cache: + class: phpbb\cache\service + arguments: + - '@cache.driver' + - '@config' + - '@dbal.conn' + - '%core.root_path%' + - '%core.php_ext%' + + cache.driver: + class: '%cache.driver.class%' + + class_loader: + class: phpbb\class_loader + arguments: + - phpbb\ + - '%core.root_path%includes/' + - '%core.php_ext%' + calls: + - [register, []] + - [set_cache, ['@cache.driver']] + + class_loader.ext: + class: phpbb\class_loader + arguments: + - \ + - '%core.root_path%ext/' + - '%core.php_ext%' + calls: + - [register, []] + - [set_cache, ['@cache.driver']] + + config: + class: phpbb\config\db + arguments: + - '@dbal.conn' + - '@cache.driver' + - '%tables.config%' + + config.php: + synthetic: true + + config_text: + class: phpbb\config\db_text + arguments: + - '@dbal.conn' + - '%tables.config_text%' + + controller.helper: + class: phpbb\controller\helper + arguments: + - '@template' + - '@user' + - '@config' + - '@symfony_request' + - '@request' + - '@routing.helper' + + controller.resolver: + class: phpbb\controller\resolver + arguments: + - '@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' + + file_downloader: + class: phpbb\file_downloader + + file_locator: + class: phpbb\routing\file_locator + arguments: + - '@filesystem' + - '%core.root_path%' + + group_helper: + class: phpbb\group\helper + arguments: + - '@language' + + log: + class: phpbb\log\log + arguments: + - '@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%' + + plupload: + class: phpbb\plupload\plupload + arguments: + - '%core.root_path%' + - '@config' + - '@request' + - '@user' + - '@php_ini' + - '@mimetype.guesser' + + upload_imagesize: + class: FastImageSize\FastImageSize + + version_helper: + class: phpbb\version_helper + scope: prototype + arguments: + - '@cache' + - '@config' + - '@file_downloader' + - '@user' diff --git a/phpBB/config/default/container/services_attachment.yml b/phpBB/config/default/container/services_attachment.yml new file mode 100644 index 0000000000..f448367473 --- /dev/null +++ b/phpBB/config/default/container/services_attachment.yml @@ -0,0 +1,40 @@ +services: + attachment.delete: + class: phpbb\attachment\delete + scope: prototype + arguments: + - '@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.resync: + class: phpbb\attachment\resync + scope: prototype + arguments: + - '@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%' diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml new file mode 100644 index 0000000000..5306644256 --- /dev/null +++ b/phpBB/config/default/container/services_auth.yml @@ -0,0 +1,101 @@ +services: +# ----- Auth management ----- + auth: + class: phpbb\auth\auth + +# ----- Auth providers ----- + auth.provider_collection: + class: phpbb\auth\provider_collection + arguments: + - '@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%' + 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%' + tags: + - { name: auth.provider } + + auth.provider.ldap: + class: phpbb\auth\provider\ldap + arguments: + - '@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_states%' + - '%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 } + +# ----- OAuth services providers ----- + auth.provider.oauth.service_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: auth.provider.oauth.service } + + auth.provider.oauth.service.bitly: + class: phpbb\auth\provider\oauth\service\bitly + arguments: + - '@config' + - '@request' + tags: + - { name: auth.provider.oauth.service } + + auth.provider.oauth.service.facebook: + class: phpbb\auth\provider\oauth\service\facebook + arguments: + - '@config' + - '@request' + tags: + - { name: auth.provider.oauth.service } + + auth.provider.oauth.service.google: + class: phpbb\auth\provider\oauth\service\google + arguments: + - '@config' + - '@request' + tags: + - { name: auth.provider.oauth.service } diff --git a/phpBB/config/avatars.yml b/phpBB/config/default/container/services_avatar.yml index d22a5db2ae..6cc38516ae 100644 --- a/phpBB/config/avatars.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -1,12 +1,27 @@ services: + avatar.manager: + class: phpbb\avatar\manager + arguments: + - '@config' + - '@avatar.driver_collection' + +# ----- Avatar drivers ----- + avatar.driver_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: avatar.driver } + avatar.driver.gravatar: class: phpbb\avatar\driver\gravatar arguments: - - @config - - %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: @@ -15,11 +30,12 @@ services: avatar.driver.local: class: phpbb\avatar\driver\local arguments: - - @config - - %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: @@ -28,11 +44,12 @@ services: avatar.driver.remote: class: phpbb\avatar\driver\remote arguments: - - @config - - %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: @@ -41,19 +58,15 @@ services: avatar.driver.upload: class: phpbb\avatar\driver\upload arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver + - '@config' + - '%core.root_path%' + - '%core.php_ext%' + - '@filesystem' + - '@path_helper' + - '@dispatcher' + - '@files.factory' + - '@cache.driver' calls: - [set_name, [avatar.driver.upload]] tags: - { name: avatar.driver } - - avatar.driver_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: avatar.driver } diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml new file mode 100644 index 0000000000..a1d063ada8 --- /dev/null +++ b/phpBB/config/default/container/services_captcha.yml @@ -0,0 +1,59 @@ +services: + captcha.factory: + class: phpbb\captcha\factory + arguments: + - '@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' + tags: + - { name: service_collection, tag: captcha.plugins } + + core.captcha.plugins.gd: + class: phpbb\captcha\plugins\gd + scope: prototype + calls: + - [set_name, [core.captcha.plugins.gd]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.gd_wave: + class: phpbb\captcha\plugins\gd_wave + scope: prototype + calls: + - [set_name, [core.captcha.plugins.gd_wave]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.nogd: + class: phpbb\captcha\plugins\nogd + scope: prototype + calls: + - [set_name, [core.captcha.plugins.nogd]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.qa: + class: phpbb\captcha\plugins\qa + scope: prototype + arguments: + - '%tables.captcha_qa_questions%' + - '%tables.captcha_qa_answers%' + - '%tables.captcha_qa_confirm%' + calls: + - [set_name, [core.captcha.plugins.qa]] + tags: + - { name: captcha.plugins } + + core.captcha.plugins.recaptcha: + class: phpbb\captcha\plugins\recaptcha + scope: prototype + calls: + - [set_name, [core.captcha.plugins.recaptcha]] + tags: + - { name: captcha.plugins } diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml new file mode 100644 index 0000000000..2055fb68c5 --- /dev/null +++ b/phpBB/config/default/container/services_console.yml @@ -0,0 +1,221 @@ +services: + console.exception_subscriber: + class: phpbb\console\exception_subscriber + arguments: + - '@language' + - '%debug.exceptions%' + tags: + - { name: kernel.event_subscriber } + + console.command_collection: + class: phpbb\di\service_collection + arguments: + - '@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' + tags: + - { name: console.command } + + console.command.config.delete: + class: phpbb\console\command\config\delete + arguments: + - '@user' + - '@config' + tags: + - { name: console.command } + + console.command.config.increment: + class: phpbb\console\command\config\increment + arguments: + - '@user' + - '@config' + tags: + - { name: console.command } + + console.command.config.get: + class: phpbb\console\command\config\get + arguments: + - '@user' + - '@config' + tags: + - { name: console.command } + + console.command.config.set: + class: phpbb\console\command\config\set + arguments: + - '@user' + - '@config' + tags: + - { name: console.command } + + console.command.config.set_atomic: + class: phpbb\console\command\config\set_atomic + arguments: + - '@user' + - '@config' + tags: + - { name: console.command } + + console.command.cron.list: + class: phpbb\console\command\cron\cron_list + arguments: + - '@user' + - '@cron.manager' + tags: + - { name: console.command } + + console.command.cron.run: + class: phpbb\console\command\cron\run + arguments: + - '@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' + 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%' + 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%' + tags: + - { name: console.command } + + console.command.dev.migration_tips: + class: phpbb\console\command\dev\migration_tips + arguments: + - '@user' + - '@ext.manager' + tags: + - { name: console.command } + + console.command.extension.disable: + class: phpbb\console\command\extension\disable + arguments: + - '@user' + - '@ext.manager' + - '@log' + tags: + - { name: console.command } + + console.command.extension.enable: + class: phpbb\console\command\extension\enable + arguments: + - '@user' + - '@ext.manager' + - '@log' + tags: + - { name: console.command } + + console.command.extension.purge: + class: phpbb\console\command\extension\purge + arguments: + - '@user' + - '@ext.manager' + - '@log' + tags: + - { name: console.command } + + console.command.extension.show: + class: phpbb\console\command\extension\show + arguments: + - '@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' + tags: + - { name: console.command } + + console.command.reparser.list: + class: phpbb\console\command\reparser\list_all + arguments: + - '@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.manager' + - '@text_reparser_collection' + tags: + - { name: console.command } + + console.command.thumbnail.delete: + class: phpbb\console\command\thumbnail\delete + arguments: + - '@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%' + tags: + - { name: console.command } + + console.command.thumbnail.recreate: + class: phpbb\console\command\thumbnail\recreate + arguments: + - '@user' + tags: + - { name: console.command } diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml new file mode 100644 index 0000000000..602fd25f4e --- /dev/null +++ b/phpBB/config/default/container/services_content.yml @@ -0,0 +1,72 @@ +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%' + + groupposition.legend: + class: phpbb\groupposition\legend + arguments: + - '@dbal.conn' + - '@user' + + groupposition.teampage: + class: phpbb\groupposition\teampage + arguments: + - '@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%' + + message.form.topic: + class: phpbb\message\topic_form + arguments: + - '@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%' + + pagination: + class: phpbb\pagination + arguments: + - '@template' + - '@user' + - '@controller.helper' + - '@dispatcher' + + viewonline_helper: + class: phpbb\viewonline_helper + arguments: + - '@filesystem' diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml new file mode 100644 index 0000000000..eb7df540d7 --- /dev/null +++ b/phpBB/config/default/container/services_cron.yml @@ -0,0 +1,218 @@ +services: + cron.manager: + class: phpbb\cron\manager + arguments: + - '@cron.task_collection' + - '%core.root_path%' + - '%core.php_ext%' + + cron.lock_db: + class: phpbb\lock\db + arguments: + - cron_lock + - '@config' + - '@dbal.conn' + +# ----- Cron tasks ----- + cron.task_collection: + class: phpbb\di\service_collection + arguments: + - '@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' + calls: + - [set_name, [cron.task.core.prune_all_forums]] + tags: + - { name: cron.task } + + cron.task.core.prune_forum: + class: phpbb\cron\task\core\prune_forum + arguments: + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + - '@dbal.conn' + calls: + - [set_name, [cron.task.core.prune_forum]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.core.prune_shadow_topics]] + tags: + - { name: cron.task } + + cron.task.core.prune_notifications: + class: phpbb\cron\task\core\prune_notifications + arguments: + - '@config' + - '@notification_manager' + calls: + - [set_name, [cron.task.core.prune_notifications]] + tags: + - { name: cron.task } + + cron.task.core.queue: + class: phpbb\cron\task\core\queue + arguments: + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + calls: + - [set_name, [cron.task.core.queue]] + tags: + - { name: cron.task } + + cron.task.core.tidy_cache: + class: phpbb\cron\task\core\tidy_cache + arguments: + - '@config' + - '@cache.driver' + calls: + - [set_name, [cron.task.core.tidy_cache]] + tags: + - { name: cron.task } + + cron.task.core.tidy_database: + class: phpbb\cron\task\core\tidy_database + arguments: + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + calls: + - [set_name, [cron.task.core.tidy_database]] + tags: + - { name: cron.task } + + cron.task.core.tidy_plupload: + class: phpbb\cron\task\core\tidy_plupload + arguments: + - '%core.root_path%' + - '@config' + calls: + - [set_name, [cron.task.core.tidy_plupload]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.core.tidy_search]] + tags: + - { name: cron.task } + + cron.task.core.tidy_sessions: + class: phpbb\cron\task\core\tidy_sessions + arguments: + - '@config' + - '@user' + calls: + - [set_name, [cron.task.core.tidy_sessions]] + tags: + - { name: cron.task } + + cron.task.core.tidy_warnings: + class: phpbb\cron\task\core\tidy_warnings + arguments: + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + calls: + - [set_name, [cron.task.core.tidy_warnings]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.text_reparser.pm_text]] + - [set_reparser, [text_reparser.pm_text]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.text_reparser.poll_option]] + - [set_reparser, [text_reparser.poll_option]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.text_reparser.poll_title]] + - [set_reparser, [text_reparser.poll_title]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.text_reparser.post_text]] + - [set_reparser, [text_reparser.post_text]] + tags: + - { name: cron.task } + + 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' + calls: + - [set_name, [cron.task.text_reparser.user_signature]] + - [set_reparser, [text_reparser.user_signature]] + tags: + - { name: cron.task } diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml new file mode 100644 index 0000000000..20b3426e7e --- /dev/null +++ b/phpBB/config/default/container/services_db.yml @@ -0,0 +1,81 @@ +services: + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - '@service_container' + + dbal.conn.driver: + class: '%dbal.driver.class%' + calls: + - [sql_connect, ['%dbal.dbhost%', '%dbal.dbuser%', '%dbal.dbpasswd%', '%dbal.dbname%', '%dbal.dbport%', false, '%dbal.new_link%']] + +# ----- DB Tools ----- + dbal.tools.factory: + class: phpbb\db\tools\factory + + dbal.tools: + class: phpbb\db\tools\tools_interface + factory: ['@dbal.tools.factory', get] + arguments: + - '@dbal.conn.driver' + +# ----- DB Extractor ----- + dbal.extractor.factory: + class: phpbb\db\extractor\factory + arguments: + - '@dbal.conn.driver' + - '@service_container' + + dbal.extractor: + class: phpbb\db\extractor\extractor_interface + factory: ['@dbal.extractor.factory', get] + +# ----- DB Extractors for different drivers ----- +# Scope MUST be prototype for all the handlers to work correctly. + dbal.extractor.extractors.mssql_extractor: + class: phpbb\db\extractor\mssql_extractor + scope: prototype + arguments: + - '%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' + + dbal.extractor.extractors.oracle_extractor: + class: phpbb\db\extractor\oracle_extractor + scope: prototype + arguments: + - '%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' + + dbal.extractor.extractors.sqlite3_extractor: + class: phpbb\db\extractor\sqlite3_extractor + scope: prototype + arguments: + - '%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' diff --git a/phpBB/config/default/container/services_event.yml b/phpBB/config/default/container/services_event.yml new file mode 100644 index 0000000000..8a55b933ac --- /dev/null +++ b/phpBB/config/default/container/services_event.yml @@ -0,0 +1,25 @@ +services: + dispatcher: + class: phpbb\event\dispatcher + arguments: + - '@service_container' + + kernel_exception_subscriber: + class: phpbb\event\kernel_exception_subscriber + arguments: + - '@template' + - '@language' + tags: + - { name: kernel.event_subscriber } + + kernel_terminate_subscriber: + class: phpbb\event\kernel_terminate_subscriber + tags: + - { name: kernel.event_subscriber } + + symfony_response_listener: + class: Symfony\Component\HttpKernel\EventListener\ResponseListener + arguments: + - UTF-8 + tags: + - { name: kernel.event_subscriber } diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml new file mode 100644 index 0000000000..443016160b --- /dev/null +++ b/phpBB/config/default/container/services_feed.yml @@ -0,0 +1,113 @@ +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%' + + feed.helper: + class: phpbb\feed\helper + arguments: + - '@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.forums: + class: phpbb\feed\forums + scope: prototype + arguments: + - '@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.overall: + class: phpbb\feed\overall + scope: prototype + arguments: + - '@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.topics: + class: phpbb\feed\topics + scope: prototype + arguments: + - '@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%' diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml new file mode 100644 index 0000000000..39277bcd9d --- /dev/null +++ b/phpBB/config/default/container/services_files.yml @@ -0,0 +1,56 @@ +services: + files.factory: + class: phpbb\files\factory + arguments: + - '@service_container' + + files.filespec: + class: phpbb\files\filespec + scope: prototype + arguments: + - '@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' + + files.types.form: + class: phpbb\files\types\form + scope: prototype + arguments: + - '@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.types.remote: + class: phpbb\files\types\remote + scope: prototype + arguments: + - '@files.factory' + - '@language' + - '@php_ini' + - '@request' + - '%core.root_path%' diff --git a/phpBB/config/default/container/services_filesystem.yml b/phpBB/config/default/container/services_filesystem.yml new file mode 100644 index 0000000000..828f9076dd --- /dev/null +++ b/phpBB/config/default/container/services_filesystem.yml @@ -0,0 +1,3 @@ +services: + filesystem: + class: phpbb\filesystem\filesystem diff --git a/phpBB/config/default/container/services_help.yml b/phpBB/config/default/container/services_help.yml new file mode 100644 index 0000000000..1bff001523 --- /dev/null +++ b/phpBB/config/default/container/services_help.yml @@ -0,0 +1,27 @@ +services: + phpbb.help.manager: + class: phpbb\help\manager + arguments: + - '@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%' + + phpbb.help.controller.faq: + class: phpbb\help\controller\faq + arguments: + - '@controller.helper' + - '@phpbb.help.manager' + - '@template' + - '@language' + - '%core.root_path%' + - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_hook.yml b/phpBB/config/default/container/services_hook.yml new file mode 100644 index 0000000000..10a84184a0 --- /dev/null +++ b/phpBB/config/default/container/services_hook.yml @@ -0,0 +1,7 @@ +services: + hook_finder: + class: phpbb\hook\finder + arguments: + - '%core.root_path%' + - '%core.php_ext%' + - '@cache.driver' diff --git a/phpBB/config/default/container/services_http.yml b/phpBB/config/default/container/services_http.yml new file mode 100644 index 0000000000..49cfbf5b84 --- /dev/null +++ b/phpBB/config/default/container/services_http.yml @@ -0,0 +1,23 @@ +services: + http_kernel: + class: Symfony\Component\HttpKernel\HttpKernel + arguments: + - '@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_stack: + class: Symfony\Component\HttpFoundation\RequestStack + + request: + class: phpbb\request\request + arguments: + - null + - '%core.disable_super_globals%' diff --git a/phpBB/config/default/container/services_language.yml b/phpBB/config/default/container/services_language.yml new file mode 100644 index 0000000000..8201fbf9b6 --- /dev/null +++ b/phpBB/config/default/container/services_language.yml @@ -0,0 +1,22 @@ +services: + language.helper.language_file: + class: phpbb\language\language_file_helper + arguments: + - '%core.root_path%' + + language: + class: phpbb\language\language + arguments: + - '@language.loader' + + language.loader_abstract: + abstract: true + class: phpbb\language\language_file_loader + arguments: + - '%core.root_path%' + - '%core.php_ext%' + + language.loader: + parent: language.loader_abstract + calls: + - [set_extension_manager, ['@ext.manager']] diff --git a/phpBB/config/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml new file mode 100644 index 0000000000..c63b087adb --- /dev/null +++ b/phpBB/config/default/container/services_migrator.yml @@ -0,0 +1,64 @@ +services: +# ----- Migrator ----- + 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' + + migrator.helper: + class: phpbb\db\migration\helper + +# ----- Migrator's tools ----- + migrator.tool_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 + arguments: + - '@config' + tags: + - { name: migrator.tool } + + migrator.tool.config_text: + class: phpbb\db\migration\tool\config_text + arguments: + - '@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%' + tags: + - { name: migrator.tool } + + migrator.tool.permission: + class: phpbb\db\migration\tool\permission + arguments: + - '@dbal.conn' + - '@cache' + - '@auth' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: migrator.tool } diff --git a/phpBB/config/mimetype_guessers.yml b/phpBB/config/default/container/services_mimetype_guesser.yml index 0115146deb..432470d40c 100644 --- a/phpBB/config/mimetype_guessers.yml +++ b/phpBB/config/default/container/services_mimetype_guesser.yml @@ -1,11 +1,11 @@ -parameters: - mimetype.guesser.priority.lowest: -2 - mimetype.guesser.priority.low: -1 - mimetype.guesser.priority.default: 0 - mimetype.guesser.priority.high: 1 - mimetype.guesser.priority.highest: 2 - services: + mimetype.guesser_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: mimetype.guessers } + mimetype.fileinfo_mimetype_guesser: class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser tags: @@ -19,25 +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_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: mimetype.guessers } - mimetype.guesser: class: phpbb\mimetype\guesser arguments: - - @mimetype.guesser_collection + - '@mimetype.guesser_collection' diff --git a/phpBB/config/default/container/services_module.yml b/phpBB/config/default/container/services_module.yml new file mode 100644 index 0000000000..a057e55239 --- /dev/null +++ b/phpBB/config/default/container/services_module.yml @@ -0,0 +1,10 @@ +services: + module.manager: + class: phpbb\module\module_manager + arguments: + - '@cache.driver' + - '@dbal.conn' + - '@ext.manager' + - '%tables.modules%' + - '%core.root_path%' + - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml new file mode 100644 index 0000000000..0cf64f7f24 --- /dev/null +++ b/phpBB/config/default/container/services_notification.yml @@ -0,0 +1,224 @@ +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's types ----- +# Scope MUST be prototype for all the plugins to work. + notification.type_collection: + class: phpbb\di\service_collection + arguments: + - '@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%' + + 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']] + tags: + - { name: notification.type } + + notification.type.approve_post: + class: phpbb\notification\type\approve_post + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.approve_topic: + class: phpbb\notification\type\approve_topic + scope: prototype + parent: notification.type.topic + tags: + - { name: notification.type } + + notification.type.bookmark: + class: phpbb\notification\type\bookmark + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.disapprove_post: + class: phpbb\notification\type\disapprove_post + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.disapprove_topic: + class: phpbb\notification\type\disapprove_topic + scope: prototype + parent: notification.type.topic + tags: + - { name: notification.type } + + notification.type.group_request: + class: phpbb\notification\type\group_request + scope: prototype + parent: notification.type.base + calls: + - [set_user_loader, ['@user_loader']] + tags: + - { name: notification.type } + + notification.type.group_request_approved: + class: phpbb\notification\type\group_request_approved + scope: prototype + parent: notification.type.base + tags: + - { name: notification.type } + + notification.type.pm: + class: phpbb\notification\type\pm + scope: prototype + parent: notification.type.base + calls: + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] + tags: + - { name: notification.type } + + notification.type.post: + class: phpbb\notification\type\post + scope: prototype + parent: notification.type.base + calls: + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] + tags: + - { name: notification.type } + + notification.type.post_in_queue: + class: phpbb\notification\type\post_in_queue + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.quote: + class: phpbb\notification\type\quote + scope: prototype + parent: notification.type.post + calls: + - [set_utils, ['@text_formatter.utils']] + tags: + - { name: notification.type } + + notification.type.report_pm: + class: phpbb\notification\type\report_pm + scope: prototype + parent: notification.type.pm + tags: + - { name: notification.type } + + notification.type.report_pm_closed: + class: phpbb\notification\type\report_pm_closed + scope: prototype + parent: notification.type.pm + tags: + - { name: notification.type } + + notification.type.report_post: + class: phpbb\notification\type\report_post + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.report_post_closed: + class: phpbb\notification\type\report_post_closed + scope: prototype + parent: notification.type.post + tags: + - { name: notification.type } + + notification.type.topic: + class: phpbb\notification\type\topic + scope: prototype + parent: notification.type.base + calls: + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] + tags: + - { name: notification.type } + + notification.type.topic_in_queue: + class: phpbb\notification\type\topic_in_queue + scope: prototype + parent: notification.type.topic + tags: + - { name: notification.type } + +# ----- Notification's methods ----- +# Scope MUST be prototype for all the plugins to work. + notification.method_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: notification.method } + + notification.method.board: + 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%' + tags: + - { name: notification.method } + + notification.method.email: + class: phpbb\notification\method\email + scope: prototype + arguments: + - '@user_loader' + - '@user' + - '@config' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: notification.method } + + notification.method.jabber: + class: phpbb\notification\method\jabber + scope: prototype + arguments: + - '@user_loader' + - '@user' + - '@config' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: notification.method } diff --git a/phpBB/config/default/container/services_password.yml b/phpBB/config/default/container/services_password.yml new file mode 100644 index 0000000000..82850dc2a7 --- /dev/null +++ b/phpBB/config/default/container/services_password.yml @@ -0,0 +1,124 @@ +services: +# ----- Password management ----- + passwords.manager: + class: phpbb\passwords\manager + arguments: + - '@config' + - '@passwords.driver_collection' + - '@passwords.helper' + - '%passwords.algorithms%' + + passwords.helper: + class: phpbb\passwords\helper + + passwords.driver_helper: + class: phpbb\passwords\driver\helper + arguments: + - '@config' + +# ----- Password's drivers ----- + passwords.driver_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: passwords.driver } + + passwords.driver.bcrypt: + class: phpbb\passwords\driver\bcrypt + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.bcrypt_2y: + class: phpbb\passwords\driver\bcrypt_2y + arguments: + - '@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' + tags: + - { name: passwords.driver } + + passwords.driver.salted_md5: + class: phpbb\passwords\driver\salted_md5 + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.phpass: + class: phpbb\passwords\driver\phpass + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.convert_password: + class: phpbb\passwords\driver\convert_password + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.sha1_smf: + class: phpbb\passwords\driver\sha1_smf + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.sha1_wcf1: + class: phpbb\passwords\driver\sha1_wcf1 + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.sha1: + class: phpbb\passwords\driver\sha1 + arguments: + - '@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%' + tags: + - { name: passwords.driver } + + passwords.driver.md5_mybb: + class: phpbb\passwords\driver\md5_mybb + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } + + passwords.driver.md5_vb: + class: phpbb\passwords\driver\md5_vb + arguments: + - '@config' + - '@passwords.driver_helper' + tags: + - { name: passwords.driver } diff --git a/phpBB/config/default/container/services_php.yml b/phpBB/config/default/container/services_php.yml new file mode 100644 index 0000000000..29349960f3 --- /dev/null +++ b/phpBB/config/default/container/services_php.yml @@ -0,0 +1,3 @@ +services: + php_ini: + class: bantu\IniGetWrapper\IniGetWrapper diff --git a/phpBB/config/default/container/services_profilefield.yml b/phpBB/config/default/container/services_profilefield.yml new file mode 100644 index 0000000000..90b22836e5 --- /dev/null +++ b/phpBB/config/default/container/services_profilefield.yml @@ -0,0 +1,102 @@ +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%' + + profilefields.lang_helper: + class: phpbb\profilefields\lang_helper + arguments: + - '@dbal.conn' + - '%tables.profile_fields_options_language%' + +# ----- Profile fields types ----- + profilefields.type_collection: + class: phpbb\di\service_collection + arguments: + - '@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' + tags: + - { name: profilefield.type } + + profilefields.type.date: + class: phpbb\profilefields\type\type_date + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.dropdown: + class: phpbb\profilefields\type\type_dropdown + arguments: + - '@profilefields.lang_helper' + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.googleplus: + class: phpbb\profilefields\type\type_googleplus + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.int: + class: phpbb\profilefields\type\type_int + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.string: + class: phpbb\profilefields\type\type_string + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.text: + class: phpbb\profilefields\type\type_text + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } + + profilefields.type.url: + class: phpbb\profilefields\type\type_url + arguments: + - '@request' + - '@template' + - '@user' + tags: + - { name: profilefield.type } diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml new file mode 100644 index 0000000000..eaaf6ae4c4 --- /dev/null +++ b/phpBB/config/default/container/services_report.yml @@ -0,0 +1,53 @@ +services: +# ----- Report controller ----- + 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%' + +# ----- Report handler factory ----- + phpbb.report.handler_factory: + class: phpbb\report\handler_factory + arguments: + - '@service_container' + +# ----- Report UI provider ----- + phpbb.report.report_reason_list_provider: + class: phpbb\report\report_reason_list_provider + arguments: + - '@dbal.conn.driver' + - '@template' + - '@user' + +# ----- Report handlers ----- +# Scope MUST be prototype for all the handlers to work correctly. + phpbb.report.handlers.report_handler_pm: + class: phpbb\report\report_handler_pm + scope: prototype + arguments: + - '@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' diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml new file mode 100644 index 0000000000..3cb74ca2b1 --- /dev/null +++ b/phpBB/config/default/container/services_routing.yml @@ -0,0 +1,80 @@ +services: + router: + class: phpbb\routing\router + arguments: + - '@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' + - null + - null + - '@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%' + +# ---- Route loaders ---- + + routing.delegated_loader: + class: Symfony\Component\Config\Loader\DelegatingLoader + arguments: + - '@routing.resolver' + + routing.resolver: + class: phpbb\routing\loader_resolver + arguments: + - '@routing.loader.collection' + + routing.loader.collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: routing.loader } + + routing.loader.yaml: + class: Symfony\Component\Routing\Loader\YamlFileLoader + arguments: + - '@file_locator' + tags: + - { name: routing.loader } + +# ---- Resources Locators ---- + + routing.chained_resources_locator: + class: phpbb\routing\resources_locator\chained_resources_locator + arguments: + - '@routing.resources_locator.collection' + + routing.resources_locator.collection: + class: phpbb\di\service_collection + arguments: + - '@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' + tags: + - { name: routing.resources_locator } diff --git a/phpBB/config/default/container/services_text_formatter.yml b/phpBB/config/default/container/services_text_formatter.yml new file mode 100644 index 0000000000..943a79cd65 --- /dev/null +++ b/phpBB/config/default/container/services_text_formatter.yml @@ -0,0 +1,73 @@ +parameters: + 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 + +services: + text_formatter.cache: + alias: text_formatter.s9e.factory + + text_formatter.data_access: + class: phpbb\textformatter\data_access + arguments: + - '@dbal.conn' + - '%tables.bbcodes%' + - '%tables.smilies%' + - '%tables.styles%' + - '%tables.words%' + - '%core.root_path%styles/' + + text_formatter.parser: + alias: text_formatter.s9e.parser + + text_formatter.renderer: + alias: text_formatter.s9e.renderer + + text_formatter.utils: + alias: text_formatter.s9e.utils + + text_formatter.s9e.factory: + class: phpbb\textformatter\s9e\factory + arguments: + - '@text_formatter.data_access' + - '@cache.driver' + - '@dispatcher' + - '@config' + - '@text_formatter.s9e.link_helper' + - '%text_formatter.cache.dir%' + - '%text_formatter.cache.parser.key%' + - '%text_formatter.cache.renderer.key%' + + text_formatter.s9e.link_helper: + class: phpbb\textformatter\s9e\link_helper + + text_formatter.s9e.parser: + class: phpbb\textformatter\s9e\parser + arguments: + - '@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%' + + 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' + calls: + - [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 diff --git a/phpBB/config/default/container/services_text_reparser.yml b/phpBB/config/default/container/services_text_reparser.yml new file mode 100644 index 0000000000..6b0353cf5b --- /dev/null +++ b/phpBB/config/default/container/services_text_reparser.yml @@ -0,0 +1,91 @@ +services: + text_reparser.manager: + class: phpbb\textreparser\manager + arguments: + - '@config' + - '@config_text' + - '@text_reparser_collection' + + text_reparser.lock: + class: phpbb\lock\db + arguments: + - reparse_lock + - '@config' + - '@dbal.conn' + + text_reparser_collection: + class: phpbb\di\service_collection + arguments: + - '@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' + tags: + - { name: text_reparser.plugin } + + text_reparser.forum_description: + class: phpbb\textreparser\plugins\forum_description + arguments: + - '@dbal.conn' + - '%tables.forums%' + tags: + - { name: text_reparser.plugin } + + text_reparser.forum_rules: + class: phpbb\textreparser\plugins\forum_rules + arguments: + - '@dbal.conn' + - '%tables.forums%' + tags: + - { name: text_reparser.plugin } + + text_reparser.group_description: + class: phpbb\textreparser\plugins\group_description + arguments: + - '@dbal.conn' + - '%tables.groups%' + tags: + - { name: text_reparser.plugin } + + text_reparser.pm_text: + class: phpbb\textreparser\plugins\pm_text + arguments: + - '@dbal.conn' + - '%tables.privmsgs%' + tags: + - { name: text_reparser.plugin } + + text_reparser.poll_option: + class: phpbb\textreparser\plugins\poll_option + arguments: + - '@dbal.conn' + tags: + - { name: text_reparser.plugin } + + text_reparser.poll_title: + class: phpbb\textreparser\plugins\poll_title + arguments: + - '@dbal.conn' + - '%tables.topics%' + tags: + - { name: text_reparser.plugin } + + text_reparser.post_text: + class: phpbb\textreparser\plugins\post_text + arguments: + - '@dbal.conn' + - '%tables.posts%' + tags: + - { name: text_reparser.plugin } + + text_reparser.user_signature: + class: phpbb\textreparser\plugins\user_signature + arguments: + - '@dbal.conn' + - '%tables.users%' + tags: + - { name: text_reparser.plugin } diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml new file mode 100644 index 0000000000..2dbf444e0c --- /dev/null +++ b/phpBB/config/default/container/services_twig.yml @@ -0,0 +1,65 @@ +parameters: + 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' + - [] + + template.twig.lexer: + class: phpbb\template\twig\lexer + arguments: + - '@template.twig.environment' + + template.twig.loader: + class: phpbb\template\twig\loader + arguments: + - '@filesystem' + + template.twig.extensions.collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: twig.extension } + + template.twig.extensions.phpbb: + class: phpbb\template\twig\extension + arguments: + - '@template_context' + - '@language' + tags: + - { name: twig.extension } + + template.twig.extensions.routing: + class: phpbb\template\twig\extension\routing + arguments: + - '@routing.helper' + tags: + - { name: twig.extension } + + template.twig.extensions.debug: + class: Twig_Extension_Debug + + 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' + + template_context: + class: phpbb\template\context diff --git a/phpBB/config/default/container/services_user.yml b/phpBB/config/default/container/services_user.yml new file mode 100644 index 0000000000..7e634c60c3 --- /dev/null +++ b/phpBB/config/default/container/services_user.yml @@ -0,0 +1,20 @@ +services: + acl.permissions: + class: phpbb\permissions + arguments: + - '@dispatcher' + - '@user' + + user: + class: phpbb\user + arguments: + - '@language' + - '%datetime.class%' + + user_loader: + class: phpbb\user_loader + arguments: + - '@dbal.conn' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.users%' diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml new file mode 100644 index 0000000000..4aed35710b --- /dev/null +++ b/phpBB/config/default/container/tables.yml @@ -0,0 +1,78 @@ +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_states: '%core.table_prefix%oauth_states' + 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' diff --git a/phpBB/config/default/routing/feed.yml b/phpBB/config/default/routing/feed.yml new file mode 100644 index 0000000000..22c9ea5755 --- /dev/null +++ b/phpBB/config/default/routing/feed.yml @@ -0,0 +1,35 @@ +phpbb_feed_forums: + path: /forums + defaults: { _controller: phpbb.feed.controller:forums } + +phpbb_feed_news: + path: /news + defaults: { _controller: phpbb.feed.controller:news } + +phpbb_feed_topics: + path: /topics + defaults: { _controller: phpbb.feed.controller:topics } + +phpbb_feed_topics_active: + path: /topics_active + defaults: { _controller: phpbb.feed.controller:topics_active } + +phpbb_feed_topics_new: + path: /topics_new + defaults: { _controller: phpbb.feed.controller:topics_new } + +phpbb_feed_forum: + path: /forum/{forum_id} + defaults: { _controller: phpbb.feed.controller:forum } + requirements: + forum_id: \d+ + +phpbb_feed_topic: + path: /topic/{topic_id} + defaults: { _controller: phpbb.feed.controller:topic } + requirements: + topic_id: \d+ + +phpbb_feed_overall: + path: /{mode} + defaults: { _controller: phpbb.feed.controller:overall } diff --git a/phpBB/config/default/routing/help.yml b/phpBB/config/default/routing/help.yml new file mode 100644 index 0000000000..8d43839d1e --- /dev/null +++ b/phpBB/config/default/routing/help.yml @@ -0,0 +1,7 @@ +phpbb_help_bbcode_controller: + path: /bbcode + defaults: { _controller: phpbb.help.controller.bbcode:handle } + +phpbb_help_faq_controller: + path: /faq + defaults: { _controller: phpbb.help.controller.faq:handle } diff --git a/phpBB/config/default/routing/report.yml b/phpBB/config/default/routing/report.yml new file mode 100644 index 0000000000..c386770e42 --- /dev/null +++ b/phpBB/config/default/routing/report.yml @@ -0,0 +1,17 @@ +phpbb_report_pm_controller: + path: /pm/{id}/report + methods: [GET, POST] + defaults: + _controller: phpbb.report.controller:handle + mode: 'pm' + requirements: + id: \d+ + +phpbb_report_post_controller: + path: /post/{id}/report + methods: [GET, POST] + defaults: + _controller: phpbb.report.controller:handle + mode: 'post' + requirements: + id: \d+ diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml new file mode 100644 index 0000000000..f381f024ad --- /dev/null +++ b/phpBB/config/default/routing/routing.yml @@ -0,0 +1,24 @@ +# Structure: +# +# foo_controller: +# path: /foo +# defaults: { _controller: foo_sevice:method } +# +# The above will be accessed via app.php?controller=foo and it will +# instantiate the 'foo_service' service and call the 'method' method. +# + +phpbb_feed_routing: + resource: feed.yml + prefix: /feed + +phpbb_feed_index: + path: /feed + defaults: { _controller: phpbb.feed.controller:overall } + +phpbb_help_routing: + resource: help.yml + prefix: /help + +phpbb_report_routing: + resource: report.yml diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml new file mode 100644 index 0000000000..f39eb52e73 --- /dev/null +++ b/phpBB/config/development/config.yml @@ -0,0 +1,13 @@ +imports: + - { resource: ../default/config.yml } + +core: + require_dev_dependencies: true + + debug: + exceptions: true + + twig: + debug: true + auto_reload: true + enable_debug_extension: true diff --git a/phpBB/config/development/container/environment.yml b/phpBB/config/development/container/environment.yml new file mode 100644 index 0000000000..40a3c7a683 --- /dev/null +++ b/phpBB/config/development/container/environment.yml @@ -0,0 +1,3 @@ +imports: + - { resource: services.yml } + - { resource: parameters.yml } diff --git a/phpBB/config/development/container/parameters.yml b/phpBB/config/development/container/parameters.yml new file mode 100644 index 0000000000..0447646806 --- /dev/null +++ b/phpBB/config/development/container/parameters.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/parameters.yml } diff --git a/phpBB/config/development/container/services.yml b/phpBB/config/development/container/services.yml new file mode 100644 index 0000000000..b302f0f966 --- /dev/null +++ b/phpBB/config/development/container/services.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/services.yml } diff --git a/phpBB/config/development/routing/environment.yml b/phpBB/config/development/routing/environment.yml new file mode 100644 index 0000000000..301183bbae --- /dev/null +++ b/phpBB/config/development/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: ../../default/routing/routing.yml diff --git a/phpBB/config/feed.yml b/phpBB/config/feed.yml deleted file mode 100644 index 7712a832f3..0000000000 --- a/phpBB/config/feed.yml +++ /dev/null @@ -1,105 +0,0 @@ -services: - feed.helper: - class: phpbb\feed\helper - arguments: - - @config - - @user - - %core.root_path% - - feed.factory: - class: phpbb\feed\factory - arguments: - - @service_container - - @config - - @dbal.conn - - feed.forum: - class: phpbb\feed\forum - scope: prototype - arguments: - - @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.news: - class: phpbb\feed\news - scope: prototype - arguments: - - @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.topic: - class: phpbb\feed\topic - scope: prototype - arguments: - - @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.topics_active: - class: phpbb\feed\topics_active - scope: prototype - arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% diff --git a/phpBB/config/installer/config.yml b/phpBB/config/installer/config.yml new file mode 100644 index 0000000000..979dbbcdd9 --- /dev/null +++ b/phpBB/config/installer/config.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../default/config.yml } diff --git a/phpBB/config/installer/container/environment.yml b/phpBB/config/installer/container/environment.yml new file mode 100644 index 0000000000..40a3c7a683 --- /dev/null +++ b/phpBB/config/installer/container/environment.yml @@ -0,0 +1,3 @@ +imports: + - { resource: services.yml } + - { resource: parameters.yml } diff --git a/phpBB/config/installer/container/parameters.yml b/phpBB/config/installer/container/parameters.yml new file mode 100644 index 0000000000..f11f7e2d84 --- /dev/null +++ b/phpBB/config/installer/container/parameters.yml @@ -0,0 +1,5 @@ +imports: + - { resource: ../../default/container/parameters.yml } + +parameters: + installer.create_config_file.options: [] diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml new file mode 100644 index 0000000000..16782dec10 --- /dev/null +++ b/phpBB/config/installer/container/services.yml @@ -0,0 +1,94 @@ +imports: + - { resource: services_installer.yml } + - { resource: ../../default/container/services_event.yml } + - { resource: ../../default/container/services_filesystem.yml } + - { resource: ../../default/container/services_http.yml } + - { resource: ../../default/container/services_language.yml } + - { resource: ../../default/container/services_php.yml } + - { resource: ../../default/container/services_routing.yml } + - { resource: ../../default/container/services_twig.yml } + +services: + cache.driver: + class: '%cache.driver.class%' + arguments: + - '%core.root_path%/cache/installer/' + + config: + class: phpbb\config\config + arguments: + - [] + + controller.resolver: + class: phpbb\controller\resolver + arguments: + - '@service_container' + - '%core.root_path%' + - '@template' + + file_locator: + class: phpbb\routing\file_locator + arguments: + - '@filesystem' + - '%core.root_path%' + + kernel_exception_subscriber: + class: phpbb\install\event\kernel_exception_subscriber + arguments: + - '@phpbb.installer.controller.helper' + - '@language' + - '@template' + tags: + - { name: kernel.event_subscriber } + + language.loader: + parent: language.loader_abstract + + path_helper: + class: phpbb\path_helper + arguments: + - '@symfony_request' + - '@filesystem' + - '@request' + - '%core.root_path%' + - '%core.php_ext%' + + routing.resources_locator.default: + class: phpbb\routing\resources_locator\installer_resources_locator + arguments: + - '@filesystem' + - '%core.root_path%' + - '%core.environment%' + tags: + - { name: routing.resources_locator } + + template: + class: phpbb\template\twig\twig + arguments: + - '@path_helper' + - '@config' + - '@template_context' + - '@template.twig.environment' + - '%core.template.cache_path%' + - null + - '@template.twig.extensions.collection' + + template.twig.environment: + class: phpbb\template\twig\environment + arguments: + - '@config' + - '@filesystem' + - '@path_helper' + - '@service_container' + - '%core.template.cache_path%' + - null + - '@template.twig.loader' + - [] + + console.exception_subscriber: + class: phpbb\console\exception_subscriber + arguments: + - '@language' + - '%debug.exceptions%' + tags: + - { name: kernel.event_subscriber } diff --git a/phpBB/config/installer/container/services_file_updater.yml b/phpBB/config/installer/container/services_file_updater.yml new file mode 100644 index 0000000000..9d39bb8b89 --- /dev/null +++ b/phpBB/config/installer/container/services_file_updater.yml @@ -0,0 +1,38 @@ +services: + installer.file_updater.factory: + class: phpbb\install\helper\file_updater\factory + arguments: + - '@installer.file_updater.collection' + + installer.file_updater.collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: file_updater } + + installer.file_updater.compress: + class: phpbb\install\helper\file_updater\compression_file_updater + arguments: + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: file_updater } + + installer.file_updater.ftp: + class: phpbb\install\helper\file_updater\ftp_file_updater + arguments: + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: file_updater } + + installer.file_updater.file: + class: phpbb\install\helper\file_updater\file_updater + arguments: + - '@filesystem' + - '%core.root_path%' + tags: + - { name: file_updater } diff --git a/phpBB/config/installer/container/services_install_console.yml b/phpBB/config/installer/container/services_install_console.yml new file mode 100644 index 0000000000..73c804d9ff --- /dev/null +++ b/phpBB/config/installer/container/services_install_console.yml @@ -0,0 +1,36 @@ +services: + console.installer.command_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: console.installer.command } + + console.installer.command.install: + class: phpbb\install\console\command\install\install + arguments: + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' + - '@installer.helper.install_helper' + tags: + - { name: console.installer.command } + + console.installer.command.config.show: + class: phpbb\install\console\command\install\config\show + arguments: + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' + tags: + - { name: console.installer.command } + + + console.installer.command.config.validate: + class: phpbb\install\console\command\install\config\validate + arguments: + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' + tags: + - { name: console.installer.command } diff --git a/phpBB/config/installer/container/services_install_controller.yml b/phpBB/config/installer/container/services_install_controller.yml new file mode 100644 index 0000000000..5be28c5746 --- /dev/null +++ b/phpBB/config/installer/container/services_install_controller.yml @@ -0,0 +1,51 @@ +services: + phpbb.installer.controller.welcome: + class: phpbb\install\controller\installer_index + arguments: + - '@phpbb.installer.controller.helper' + - '@language' + - '@template' + - '%core.root_path%' + + phpbb.installer.controller.helper: + class: phpbb\install\controller\helper + arguments: + - '@installer.helper.config' + - '@language' + - '@language.helper.language_file' + - '@installer.navigation.provider' + - '@template' + - '@path_helper' + - '@request' + - '@symfony_request' + - '@router' + - '%core.root_path%' + + phpbb.installer.controller.install: + class: phpbb\install\controller\install + arguments: + - '@phpbb.installer.controller.helper' + - '@installer.helper.iohandler_factory' + - '@installer.navigation.provider' + - '@language' + - '@template' + - '@request' + - '@installer.installer.install' + - '@installer.helper.install_helper' + + phpbb.installer.controller.update: + class: phpbb\install\controller\update + arguments: + - '@phpbb.installer.controller.helper' + - '@installer.installer.update' + - '@installer.helper.install_helper' + - '@installer.helper.iohandler_factory' + - '@language' + - '@installer.navigation.provider' + - '@request' + - '@template' + + phpbb.installer.controller.file_downloader: + class: phpbb\install\controller\archive_download + arguments: + - '@installer.helper.config' diff --git a/phpBB/config/installer/container/services_install_data.yml b/phpBB/config/installer/container/services_install_data.yml new file mode 100644 index 0000000000..d119ba6ebb --- /dev/null +++ b/phpBB/config/installer/container/services_install_data.yml @@ -0,0 +1,44 @@ +services: + installer.install_data.add_bots: + class: phpbb\install\module\install_data\task\add_bots + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: install_data_install, order: 20 } + + installer.install_data.add_languages: + class: phpbb\install\module\install_data\task\add_languages + arguments: + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language.helper.language_file' + tags: + - { name: install_data_install, order: 10 } + + installer.install_data.add_modules: + class: phpbb\install\module\install_data\task\add_modules + arguments: + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + tags: + - { name: install_data_install, order: 30 } + + installer.module.data_install_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: install_data_install, class_name_aware: true } + + installer.module.data_install: + class: phpbb\install\module\install_data\module + parent: installer.module_base + arguments: + - '@installer.module.data_install_collection' + tags: + - { name: installer_install_module, order: 50 } diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml new file mode 100644 index 0000000000..8324cd6086 --- /dev/null +++ b/phpBB/config/installer/container/services_install_database.yml @@ -0,0 +1,51 @@ +services: + installer.install_database.create_schema: + class: phpbb\install\module\install_database\task\create_schema + arguments: + - '@installer.helper.config' + - '@installer.helper.database' + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: install_database_install, order: 10 } + + installer.install_database.add_default_data: + class: phpbb\install\module\install_database\task\add_default_data + arguments: + - '@installer.helper.database' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' + tags: + - { name: install_database_install, order: 20 } + + installer.install_database.add_config_settings: + class: phpbb\install\module\install_database\task\add_config_settings + arguments: + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' + tags: + - { name: install_database_install, order: 30 } + + installer.module.install_database_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: install_database_install, class_name_aware: true } + + installer.module.database_install: + class: phpbb\install\module\install_database\module + parent: installer.module_base + arguments: + - '@installer.module.install_database_collection' + tags: + - { name: installer_install_module, order: 40 } diff --git a/phpBB/config/installer/container/services_install_filesystem.yml b/phpBB/config/installer/container/services_install_filesystem.yml new file mode 100644 index 0000000000..65b2a6eddd --- /dev/null +++ b/phpBB/config/installer/container/services_install_filesystem.yml @@ -0,0 +1,28 @@ +services: + installer.install_filesystem.create_config_file: + class: phpbb\install\module\install_filesystem\task\create_config_file + arguments: + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.database' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + - '%installer.create_config_file.options%' + tags: + - { name: install_filesystem_install, order: 10 } + + installer.module.install_filesystem_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: install_filesystem_install, class_name_aware: true } + + installer.module.filesystem_install: + class: phpbb\install\module\install_filesystem\module + parent: installer.module_base + arguments: + - '@installer.module.install_filesystem_collection' + tags: + - { name: installer_install_module, order: 30 } diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml new file mode 100644 index 0000000000..854b129b69 --- /dev/null +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -0,0 +1,33 @@ +services: + installer.install_finish.populate_migrations: + class: phpbb\install\module\install_finish\task\populate_migrations + arguments: + - '@installer.helper.container_factory' + tags: + - { name: install_finish, order: 10 } + + installer.install_finish.notify_user: + class: phpbb\install\module\install_finish\task\notify_user + arguments: + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: install_finish, order: 20 } + + installer.module.install_finish_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: install_finish, class_name_aware: true } + + installer.module.finish_install: + class: phpbb\install\module\install_filesystem\module + parent: installer.module_base + arguments: + - '@installer.module.install_finish_collection' + tags: + - { name: installer_install_module, order: 60 } diff --git a/phpBB/config/installer/container/services_install_navigation.yml b/phpBB/config/installer/container/services_install_navigation.yml new file mode 100644 index 0000000000..301d6f3434 --- /dev/null +++ b/phpBB/config/installer/container/services_install_navigation.yml @@ -0,0 +1,35 @@ +services: + installer.navigation.provider: + class: phpbb\install\helper\navigation\navigation_provider + arguments: + - '@installer.navigation.service_collection' + + installer.navigation.service_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: installer.navigation } + + installer.navigation.main_navigation: + class: phpbb\install\helper\navigation\main_navigation + scope: prototype + tags: + - { name: installer.navigation } + + installer.navigation.install_navigation: + class: phpbb\install\helper\navigation\install_navigation + arguments: + - '@installer.helper.install_helper' + scope: prototype + tags: + - { name: installer.navigation } + + installer.navigation.update_navigation: + class: phpbb\install\helper\navigation\update_navigation + arguments: + - '@installer.helper.install_helper' + scope: prototype + tags: + - { name: installer.navigation } + diff --git a/phpBB/config/installer/container/services_install_obtain_data.yml b/phpBB/config/installer/container/services_install_obtain_data.yml new file mode 100644 index 0000000000..cd8d0c8072 --- /dev/null +++ b/phpBB/config/installer/container/services_install_obtain_data.yml @@ -0,0 +1,66 @@ +services: + installer.obtain_data.obtain_admin_data: + class: phpbb\install\module\obtain_data\task\obtain_admin_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: install_obtain_data, order: 10 } + + installer.obtain_data.obtain_board_data: + class: phpbb\install\module\obtain_data\task\obtain_board_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@language.helper.language_file' + tags: + - { name: install_obtain_data, order: 50 } + + installer.obtain_data.obtain_database_data: + class: phpbb\install\module\obtain_data\task\obtain_database_data + arguments: + - '@installer.helper.database' + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: install_obtain_data, order: 20 } + + installer.obtain_data.obtain_email_data: + class: phpbb\install\module\obtain_data\task\obtain_email_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: install_obtain_data, order: 40 } + + installer.obtain_data.obtain_imagick_path: + class: phpbb\install\module\obtain_data\task\obtain_imagick_path + arguments: + - '@installer.helper.config' + tags: + - { name: install_obtain_data, order: 60 } + + installer.obtain_data.obtain_server_data: + class: phpbb\install\module\obtain_data\task\obtain_server_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: install_obtain_data, order: 30 } + + installer.module.install_obtain_data_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: install_obtain_data, class_name_aware: true } + + installer.module.obtain_data_install: + class: phpbb\install\module\obtain_data\install_module + parent: installer.module_base + arguments: + - '@installer.module.install_obtain_data_collection' + - true + - false + tags: + - { name: installer_install_module, order: 20 } diff --git a/phpBB/config/installer/container/services_install_requirements.yml b/phpBB/config/installer/container/services_install_requirements.yml new file mode 100644 index 0000000000..c03eb1fb93 --- /dev/null +++ b/phpBB/config/installer/container/services_install_requirements.yml @@ -0,0 +1,37 @@ +services: + installer.requirements.check_filesystem: + class: phpbb\install\module\requirements\task\check_filesystem + arguments: + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: installer_requirements, order: 10 } + + installer.requirements.check_server_environment: + class: phpbb\install\module\requirements\task\check_server_environment + arguments: + - '@installer.helper.database' + - '@installer.helper.iohandler' + tags: + - { name: installer_requirements, order: 20 } + - { name: update_requirements, order: 20 } + + installer.module.install_requirements_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: installer_requirements, class_name_aware: true } + +# Please note, that the name of this module is hard coded in the installer service + installer.module.requirements_install: + class: phpbb\install\module\requirements\install_module + parent: installer.module_base + arguments: + - '@installer.module.install_requirements_collection' + - true + - false + tags: + - { name: installer_install_module, order: 10 } diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml new file mode 100644 index 0000000000..bf9d28ec65 --- /dev/null +++ b/phpBB/config/installer/container/services_installer.yml @@ -0,0 +1,115 @@ +imports: + - { resource: services_file_updater.yml } + - { resource: services_install_console.yml } + - { resource: services_install_controller.yml } + - { resource: services_install_data.yml } + - { resource: services_install_database.yml } + - { resource: services_install_filesystem.yml } + - { resource: services_install_finish.yml } + - { resource: services_install_navigation.yml } + - { resource: services_install_obtain_data.yml } + - { resource: services_install_requirements.yml } + - { resource: services_update_database.yml } + - { resource: services_update_filesystem.yml } + - { resource: services_update_obtain_data.yml } + - { resource: services_update_requirements.yml } + +services: +# -------- Installer helpers ------------------------ + installer.helper.config: + class: phpbb\install\helper\config + arguments: + - '@filesystem' + - '@php_ini' + - '%core.root_path%' + + installer.helper.database: + class: phpbb\install\helper\database + arguments: + - '@filesystem' + - '%core.root_path%' + + installer.helper.iohandler_factory: + class: phpbb\install\helper\iohandler\factory + arguments: + - '@service_container' + + installer.helper.iohandler_abstract: + abstract: true + calls: + - [set_language, ['@language']] + + installer.helper.iohandler_ajax: + class: phpbb\install\helper\iohandler\ajax_iohandler + parent: installer.helper.iohandler_abstract + arguments: + - '@path_helper' + - '@request' + - '@template' + - '@router' + + installer.helper.iohandler_cli: + class: phpbb\install\helper\iohandler\cli_iohandler + parent: installer.helper.iohandler_abstract + + installer.helper.iohandler: + class: phpbb\install\helper\iohandler\iohandler_interface + factory: ['@installer.helper.iohandler_factory', get] + + installer.helper.container_factory: + class: phpbb\install\helper\container_factory + arguments: + - '@language' + - '@request' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' + + installer.helper.install_helper: + class: phpbb\install\helper\install_helper + arguments: + - '%core.root_path%' + - '%core.php_ext%' + + installer.helper.update_helper: + class: phpbb\install\helper\update_helper + arguments: + - '%core.root_path%' + +# -------- Installer -------------------------------- + installer.module_base: + abstract: true + calls: + - [setup, ['@installer.helper.config', '@installer.helper.iohandler']] + + installer.installer.abstract: + class: phpbb\install\installer + abstract: true + arguments: + - '@cache.driver' + - '@installer.helper.config' + - '@path_helper' + + installer.install.module_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: installer_install_module } + + installer.update.module_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: installer_update_module } + + installer.installer.install: + parent: installer.installer.abstract + calls: + - [set_modules, ['@installer.install.module_collection']] + + installer.installer.update: + parent: installer.installer.abstract + calls: + - [set_modules, ['@installer.update.module_collection']] diff --git a/phpBB/config/installer/container/services_update_database.yml b/phpBB/config/installer/container/services_update_database.yml new file mode 100644 index 0000000000..9cb9cb9abf --- /dev/null +++ b/phpBB/config/installer/container/services_update_database.yml @@ -0,0 +1,29 @@ +services: + installer.update_database.update_task: + class: phpbb\install\module\update_database\task\update + arguments: + - '@installer.helper.container_factory' + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@language' + - '%core.root_path%' + tags: + - { name: update_database_task, order: 10 } + + installer.module.update_database_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: update_database_task, class_name_aware: true } + + installer.module.update_database: + class: phpbb\install\module\update_database\module + parent: installer.module_base + arguments: + - '@installer.module.update_database_collection' + - true + - false + tags: + - { name: installer_update_module, order: 40 } diff --git a/phpBB/config/installer/container/services_update_filesystem.yml b/phpBB/config/installer/container/services_update_filesystem.yml new file mode 100644 index 0000000000..c0a04676f6 --- /dev/null +++ b/phpBB/config/installer/container/services_update_filesystem.yml @@ -0,0 +1,72 @@ +services: + installer.update_filesystem.check_task: + class: phpbb\install\module\update_filesystem\task\file_check + arguments: + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' + tags: + - { name: update_filesystem, order: 10 } + + installer.update_filesystem.diff_files: + class: phpbb\install\module\update_filesystem\task\diff_files + arguments: + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: update_filesystem, order: 20 } + + installer.update_filesystem.show_file_status: + class: phpbb\install\module\update_filesystem\task\show_file_status + arguments: + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@filesystem' + - '@installer.file_updater.factory' + tags: + - { name: update_filesystem, order: 30 } + + installer.update_filesystem.update_files: + class: phpbb\install\module\update_filesystem\task\update_files + arguments: + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.file_updater.factory' + - '@installer.helper.update_helper' + - '%core.root_path%' + tags: + - { name: update_filesystem, order: 40 } + + installer.update_filesystem.download_updated_files: + class: phpbb\install\module\update_filesystem\task\download_updated_files + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@filesystem' + tags: + - { name: update_filesystem, order: 50 } + + installer.module.update_filesystem_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: update_filesystem, class_name_aware: true } + + installer.module.filesystem_update: + class: phpbb\install\module\update_filesystem\module + parent: installer.module_base + arguments: + - '@installer.module.update_filesystem_collection' + - true + - false + tags: + - { name: installer_update_module, order: 30 } diff --git a/phpBB/config/installer/container/services_update_obtain_data.yml b/phpBB/config/installer/container/services_update_obtain_data.yml new file mode 100644 index 0000000000..999976aed0 --- /dev/null +++ b/phpBB/config/installer/container/services_update_obtain_data.yml @@ -0,0 +1,53 @@ +services: + installer.obtain_data.update_options: + class: phpbb\install\module\obtain_data\task\obtain_update_settings + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: update_obtain_data, order: 10 } + + installer.obtain_data.file_updater_method: + class: phpbb\install\module\obtain_data\task\obtain_file_updater_method + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: update_obtain_data, order: 20 } + + installer.obtain_data.update_files: + class: phpbb\install\module\obtain_data\task\obtain_update_files + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: update_obtain_data, order: 30 } + + installer.obtain_data.update_ftp_settings: + class: phpbb\install\module\obtain_data\task\obtain_update_ftp_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.php_ext%' + tags: + - { name: update_obtain_data, order: 40 } + + installer.module.update_obtain_data_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: update_obtain_data, class_name_aware: true } + + installer.module.obtain_data_update: + class: phpbb\install\module\obtain_data\update_module + parent: installer.module_base + arguments: + - '@installer.module.update_obtain_data_collection' + - true + - false + tags: + - { name: installer_update_module, order: 20 } diff --git a/phpBB/config/installer/container/services_update_requirements.yml b/phpBB/config/installer/container/services_update_requirements.yml new file mode 100644 index 0000000000..c5272ef549 --- /dev/null +++ b/phpBB/config/installer/container/services_update_requirements.yml @@ -0,0 +1,40 @@ +services: + installer.requirements.check_filesystem_update: + class: phpbb\install\module\requirements\task\check_filesystem + arguments: + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + - false + tags: + - { name: update_requirements, order: 10 } + + installer.requirements.update_requirements: + class: phpbb\install\module\requirements\task\check_update + arguments: + - '@installer.helper.container_factory' + - '@filesystem' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: update_requirements, order: 30 } + + installer.module.update_requirements_collection: + class: phpbb\di\ordered_service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: update_requirements, class_name_aware: true } + + installer.module.requirements_update: + class: phpbb\install\module\requirements\update_module + parent: installer.module_base + arguments: + - '@installer.module.update_requirements_collection' + - true + - false + tags: + - { name: installer_update_module, order: 10 } diff --git a/phpBB/config/installer/routing/environment.yml b/phpBB/config/installer/routing/environment.yml new file mode 100644 index 0000000000..7a1f588fa1 --- /dev/null +++ b/phpBB/config/installer/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: installer.yml diff --git a/phpBB/config/installer/routing/installer.yml b/phpBB/config/installer/routing/installer.yml new file mode 100644 index 0000000000..6190799737 --- /dev/null +++ b/phpBB/config/installer/routing/installer.yml @@ -0,0 +1,37 @@ +phpbb_installer_index: + path: / + defaults: + _controller: phpbb.installer.controller.welcome:handle + mode: 'intro' + +phpbb_installer_license: + path: /license + defaults: + _controller: phpbb.installer.controller.welcome:handle + mode: 'license' + +phpbb_installer_support: + path: /support + defaults: + _controller: phpbb.installer.controller.welcome:handle + mode: 'support' + +phpbb_installer_install: + path: /install + defaults: + _controller: phpbb.installer.controller.install:handle + +phpbb_installer_update: + path: /update + defaults: + _controller: phpbb.installer.controller.update:handle + +phpbb_installer_update_file_download: + path: /download/updated + defaults: + _controller: phpbb.installer.controller.file_downloader:update_archive + +phpbb_installer_update_conflict_download: + path: /download/conflict + defaults: + _controller: phpbb.installer.controller.file_downloader:conflict_archive diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml deleted file mode 100644 index 202421c09f..0000000000 --- a/phpBB/config/migrator.yml +++ /dev/null @@ -1,53 +0,0 @@ -services: - migrator: - class: phpbb\db\migrator - arguments: - - @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 - - migrator.tool_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 - arguments: - - @config - tags: - - { name: migrator.tool } - - migrator.tool.module: - class: phpbb\db\migration\tool\module - arguments: - - @dbal.conn - - @cache - - @user - - %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% - tags: - - { name: migrator.tool } diff --git a/phpBB/config/notifications.yml b/phpBB/config/notifications.yml deleted file mode 100644 index 5675e76a99..0000000000 --- a/phpBB/config/notifications.yml +++ /dev/null @@ -1,368 +0,0 @@ -services: - notification.type_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: notification.type } - - notification.method_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 - scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.approve_topic: - class: phpbb\notification\type\approve_topic - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.bookmark: - class: phpbb\notification\type\bookmark - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.disapprove_post: - class: phpbb\notification\type\disapprove_post - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.disapprove_topic: - class: phpbb\notification\type\disapprove_topic - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.group_request: - class: phpbb\notification\type\group_request - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.group_request_approved: - class: phpbb\notification\type\group_request_approved - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.pm: - class: phpbb\notification\type\pm - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.post: - class: phpbb\notification\type\post - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - 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 - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.quote: - class: phpbb\notification\type\quote - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.report_pm: - class: phpbb\notification\type\report_pm - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - 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 - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.report_post: - class: phpbb\notification\type\report_post - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.report_post_closed: - class: phpbb\notification\type\report_post_closed - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.topic: - class: phpbb\notification\type\topic - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - 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 - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.type.admin_activate_user: - class: phpbb\notification\type\admin_activate_user - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - tags: - - { name: notification.type } - - notification.method.email: - class: phpbb\notification\method\email - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - tags: - - { name: notification.method } - - notification.method.jabber: - class: phpbb\notification\method\jabber - scope: prototype # scope MUST be prototype for this to work! - arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @auth - - @config - - %core.root_path% - - %core.php_ext% - tags: - - { name: notification.method } diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml deleted file mode 100644 index 9e249a2c12..0000000000 --- a/phpBB/config/passwords.yml +++ /dev/null @@ -1,62 +0,0 @@ -parameters: - passwords.algorithms: - - passwords.driver.bcrypt_2y - - passwords.driver.bcrypt - - passwords.driver.salted_md5 - - passwords.driver.phpass - -services: - passwords.driver.bcrypt: - class: phpbb\passwords\driver\bcrypt - arguments: - - @config - - @passwords.driver_helper - tags: - - { name: passwords.driver } - - passwords.driver.bcrypt_2y: - class: phpbb\passwords\driver\bcrypt_2y - arguments: - - @config - - @passwords.driver_helper - tags: - - { name: passwords.driver } - - passwords.driver.salted_md5: - class: phpbb\passwords\driver\salted_md5 - arguments: - - @config - - @passwords.driver_helper - tags: - - { name: passwords.driver } - - passwords.driver.phpass: - class: phpbb\passwords\driver\phpass - arguments: - - @config - - @passwords.driver_helper - tags: - - { name: passwords.driver } - - passwords.driver_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: passwords.driver } - - passwords.driver_helper: - class: phpbb\passwords\driver\helper - arguments: - - @config - - passwords.manager: - class: phpbb\passwords\manager - arguments: - - @config - - @passwords.driver_collection - - @passwords.helper - - %passwords.algorithms% - - passwords.helper: - class: phpbb\passwords\helper diff --git a/phpBB/config/production/config.yml b/phpBB/config/production/config.yml new file mode 100644 index 0000000000..979dbbcdd9 --- /dev/null +++ b/phpBB/config/production/config.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../default/config.yml } diff --git a/phpBB/config/production/container/environment.yml b/phpBB/config/production/container/environment.yml new file mode 100644 index 0000000000..40a3c7a683 --- /dev/null +++ b/phpBB/config/production/container/environment.yml @@ -0,0 +1,3 @@ +imports: + - { resource: services.yml } + - { resource: parameters.yml } diff --git a/phpBB/config/production/container/parameters.yml b/phpBB/config/production/container/parameters.yml new file mode 100644 index 0000000000..0447646806 --- /dev/null +++ b/phpBB/config/production/container/parameters.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/parameters.yml } diff --git a/phpBB/config/production/container/services.yml b/phpBB/config/production/container/services.yml new file mode 100644 index 0000000000..b302f0f966 --- /dev/null +++ b/phpBB/config/production/container/services.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/services.yml } diff --git a/phpBB/config/production/routing/environment.yml b/phpBB/config/production/routing/environment.yml new file mode 100644 index 0000000000..301183bbae --- /dev/null +++ b/phpBB/config/production/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: ../../default/routing/routing.yml diff --git a/phpBB/config/profilefields.yml b/phpBB/config/profilefields.yml deleted file mode 100644 index 5a861a4b56..0000000000 --- a/phpBB/config/profilefields.yml +++ /dev/null @@ -1,82 +0,0 @@ -services: - profilefields.manager: - class: phpbb\profilefields\manager - arguments: - - @auth - - @dbal.conn - - @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% - - profilefields.type_collection: - class: phpbb\di\service_collection - arguments: - - @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 - tags: - - { name: profilefield.type } - - profilefields.type.date: - class: phpbb\profilefields\type\type_date - arguments: - - @request - - @template - - @user - tags: - - { name: profilefield.type } - - profilefields.type.dropdown: - class: phpbb\profilefields\type\type_dropdown - arguments: - - @profilefields.lang_helper - - @request - - @template - - @user - tags: - - { name: profilefield.type } - - profilefields.type.int: - class: phpbb\profilefields\type\type_int - arguments: - - @request - - @template - - @user - tags: - - { name: profilefield.type } - - profilefields.type.string: - class: phpbb\profilefields\type\type_string - arguments: - - @request - - @template - - @user - tags: - - { name: profilefield.type } - - profilefields.type.text: - class: phpbb\profilefields\type\type_text - arguments: - - @request - - @template - - @user - tags: - - { name: profilefield.type } diff --git a/phpBB/config/routing.yml b/phpBB/config/routing.yml deleted file mode 100644 index d8e890d063..0000000000 --- a/phpBB/config/routing.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Structure: -# -# foo_controller: -# pattern: /foo -# defaults: { _controller: foo_sevice:method } -# -# The above will be accessed via app.php?controller=foo and it will -# instantiate the "foo_service" service and call the "method" method. -# diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml deleted file mode 100644 index 735626810f..0000000000 --- a/phpBB/config/services.yml +++ /dev/null @@ -1,317 +0,0 @@ -imports: - - { resource: tables.yml } - - { resource: cron_tasks.yml } - - { resource: notifications.yml } - - { resource: migrator.yml } - - { resource: avatars.yml } - - { resource: feed.yml } - - { resource: auth_providers.yml } - - { resource: console.yml } - - { resource: mimetype_guessers.yml } - - { resource: passwords.yml } - - { resource: profilefields.yml } - -services: - acl.permissions: - class: phpbb\permissions - arguments: - - @dispatcher - - @user - - auth: - class: phpbb\auth\auth - - avatar.manager: - class: phpbb\avatar\manager - arguments: - - @config - - @avatar.driver_collection - - cache: - class: phpbb\cache\service - arguments: - - @cache.driver - - @config - - @dbal.conn - - %core.root_path% - - %core.php_ext% - - cache.driver: - class: %cache.driver.class% - - cache.driver.install: - class: phpbb\cache\driver\file - - class_loader: - class: phpbb\class_loader - arguments: - - phpbb\ - - %core.root_path%includes/ - - %core.php_ext% - calls: - - [register, []] - - [set_cache, [@cache.driver]] - - class_loader.ext: - class: phpbb\class_loader - arguments: - - \ - - %core.root_path%ext/ - - %core.php_ext% - calls: - - [register, []] - - [set_cache, [@cache.driver]] - - config: - class: phpbb\config\db - arguments: - - @dbal.conn - - @cache.driver - - %tables.config% - - config_text: - class: phpbb\config\db_text - arguments: - - @dbal.conn - - %tables.config_text% - - content.visibility: - class: phpbb\content_visibility - arguments: - - @auth - - @dbal.conn - - @user - - %core.root_path% - - %core.php_ext% - - %tables.forums% - - %tables.posts% - - %tables.topics% - - %tables.users% - - controller.helper: - class: phpbb\controller\helper - arguments: - - @template - - @user - - @config - - %core.root_path% - - %core.php_ext% - - controller.resolver: - class: phpbb\controller\resolver - arguments: - - @user - - @service_container - - @template - - cron.task_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: cron.task } - - cron.manager: - class: phpbb\cron\manager - arguments: - - @cron.task_collection - - %core.root_path% - - %core.php_ext% - - cron.lock_db: - class: phpbb\lock\db - arguments: - - cron_lock - - @config - - @dbal.conn - - dispatcher: - class: phpbb\event\dispatcher - arguments: - - @service_container - - dbal.conn: - class: %dbal.driver.class% - calls: - - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] - - dbal.tools: - class: phpbb\db\tools - arguments: - - @dbal.conn - - event.subscriber_loader: - class: phpbb\event\extension_subscriber_loader - arguments: - - @dispatcher - - @event.listener_collection - calls: - - [load, []] - - event.listener_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: event.listener } - - ext.manager: - class: phpbb\extension\manager - arguments: - - @service_container - - @dbal.conn - - @config - - @filesystem - - %tables.ext% - - %core.root_path% - - %core.php_ext% - - @cache.driver - - ext.finder: - class: phpbb\extension\finder - arguments: - - @ext.manager - - @filesystem - - %core.root_path% - - @cache.driver - - %core.php_ext% - - _ext_finder - - filesystem: - class: phpbb\filesystem - - groupposition.legend: - class: phpbb\groupposition\legend - arguments: - - @dbal.conn - - @user - - groupposition.teampage: - class: phpbb\groupposition\teampage - arguments: - - @dbal.conn - - @user - - @cache.driver - - http_kernel: - class: Symfony\Component\HttpKernel\HttpKernel - arguments: - - @dispatcher - - @controller.resolver - - hook_finder: - class: phpbb\hook\finder - arguments: - - %core.root_path% - - %core.php_ext% - - @cache.driver - - kernel_request_subscriber: - class: phpbb\event\kernel_request_subscriber - arguments: - - @ext.finder - - %core.root_path% - - %core.php_ext% - tags: - - { name: kernel.event_subscriber } - - kernel_exception_subscriber: - class: phpbb\event\kernel_exception_subscriber - arguments: - - @template - - @user - tags: - - { name: kernel.event_subscriber } - - kernel_terminate_subscriber: - class: phpbb\event\kernel_terminate_subscriber - tags: - - { name: kernel.event_subscriber } - - log: - class: phpbb\log\log - arguments: - - @dbal.conn - - @user - - @auth - - @dispatcher - - %core.root_path% - - %core.adm_relative_path% - - %core.php_ext% - - %tables.log% - - notification_manager: - class: phpbb\notification\manager - arguments: - - @notification.type_collection - - @notification.method_collection - - @service_container - - @user_loader - - @config - - @dbal.conn - - @cache - - @user - - %core.root_path% - - %core.php_ext% - - %tables.notification_types% - - %tables.notifications% - - %tables.user_notifications% - - pagination: - class: phpbb\pagination - arguments: - - @template - - @user - - path_helper: - class: phpbb\path_helper - arguments: - - @symfony_request - - @filesystem - - %core.root_path% - - %core.php_ext% - - %core.adm_relative_path% - - php_ini: - class: phpbb\php\ini - - plupload: - class: phpbb\plupload\plupload - arguments: - - %core.root_path% - - @config - - @request - - @user - - @php_ini - - @mimetype.guesser - - request: - class: phpbb\request\request - - symfony_request: - class: phpbb\symfony_request - arguments: - - @request - - template: - class: phpbb\template\twig\twig - arguments: - - @path_helper - - @config - - @user - - @template_context - - @ext.manager - - template_context: - class: phpbb\template\context - - user: - class: phpbb\user - - user_loader: - class: phpbb\user_loader - arguments: - - @dbal.conn - - %core.root_path% - - %core.php_ext% - - %tables.users% diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml deleted file mode 100644 index e4f7bda89b..0000000000 --- a/phpBB/config/tables.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens - tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts - tables.config: %core.table_prefix%config - tables.config_text: %core.table_prefix%config_text - tables.ext: %core.table_prefix%ext - tables.forums: %core.table_prefix%forums - tables.log: %core.table_prefix%log - tables.migrations: %core.table_prefix%migrations - tables.modules: %core.table_prefix%modules - tables.notification_types: %core.table_prefix%notification_types - tables.notifications: %core.table_prefix%notifications - 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.posts: %core.table_prefix%posts - tables.topics: %core.table_prefix%topics - tables.user_notifications: %core.table_prefix%user_notifications - tables.users: %core.table_prefix%users diff --git a/phpBB/config/test/config.yml b/phpBB/config/test/config.yml new file mode 100644 index 0000000000..1c17b08931 --- /dev/null +++ b/phpBB/config/test/config.yml @@ -0,0 +1,5 @@ +imports: + - { resource: ../default/config.yml } + +core: + require_dev_dependencies: true diff --git a/phpBB/config/test/container/environment.yml b/phpBB/config/test/container/environment.yml new file mode 100644 index 0000000000..40a3c7a683 --- /dev/null +++ b/phpBB/config/test/container/environment.yml @@ -0,0 +1,3 @@ +imports: + - { resource: services.yml } + - { resource: parameters.yml } diff --git a/phpBB/config/test/container/parameters.yml b/phpBB/config/test/container/parameters.yml new file mode 100644 index 0000000000..0447646806 --- /dev/null +++ b/phpBB/config/test/container/parameters.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/parameters.yml } diff --git a/phpBB/config/test/container/services.yml b/phpBB/config/test/container/services.yml new file mode 100644 index 0000000000..b302f0f966 --- /dev/null +++ b/phpBB/config/test/container/services.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/services.yml } diff --git a/phpBB/config/test/routing/environment.yml b/phpBB/config/test/routing/environment.yml new file mode 100644 index 0000000000..301183bbae --- /dev/null +++ b/phpBB/config/test/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: ../../default/routing/routing.yml |