From 6cbb60d13f75da6d9b6c6d60555ea119df79b5c0 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 4 Oct 2014 16:30:34 +0200 Subject: [ticket/12620] Adds a yaml config file PHPBB3-12620 --- phpBB/common.php | 8 - phpBB/config/default/config.yml | 0 phpBB/config/default/container/parameters.yml | 20 ++ phpBB/config/default/container/services.yml | 196 +++++++++++ .../default/container/services_auth_providers.yml | 86 +++++ .../config/default/container/services_avatars.yml | 60 ++++ .../config/default/container/services_captcha.yml | 59 ++++ .../config/default/container/services_console.yml | 141 ++++++++ .../default/container/services_cron_tasks.yml | 125 +++++++ phpBB/config/default/container/services_feed.yml | 106 ++++++ .../config/default/container/services_migrator.yml | 60 ++++ .../container/services_mimetype_guessers.yml | 43 +++ .../default/container/services_notifications.yml | 368 +++++++++++++++++++++ .../default/container/services_passwords.yml | 128 +++++++ .../default/container/services_profilefields.yml | 101 ++++++ phpBB/config/default/container/services_twig.yml | 43 +++ phpBB/config/default/container/tables.yml | 23 ++ phpBB/config/default/parameters.yml | 20 -- phpBB/config/default/services.yml | 196 ----------- phpBB/config/default/services_auth_providers.yml | 86 ----- phpBB/config/default/services_avatars.yml | 60 ---- phpBB/config/default/services_captcha.yml | 59 ---- phpBB/config/default/services_console.yml | 141 -------- phpBB/config/default/services_cron_tasks.yml | 125 ------- phpBB/config/default/services_feed.yml | 106 ------ phpBB/config/default/services_migrator.yml | 60 ---- .../config/default/services_mimetype_guessers.yml | 43 --- phpBB/config/default/services_notifications.yml | 368 --------------------- phpBB/config/default/services_passwords.yml | 128 ------- phpBB/config/default/services_profilefields.yml | 101 ------ phpBB/config/default/services_twig.yml | 43 --- phpBB/config/default/tables.yml | 23 -- phpBB/config/development/config.yml | 5 + phpBB/config/development/container/environment.yml | 3 + phpBB/config/development/container/parameters.yml | 2 + phpBB/config/development/container/services.yml | 2 + phpBB/config/development/environment.yml | 3 - phpBB/config/development/parameters.yml | 2 - phpBB/config/development/services.yml | 2 - phpBB/config/production/config.yml | 2 + phpBB/config/production/container/environment.yml | 3 + phpBB/config/production/container/parameters.yml | 2 + phpBB/config/production/container/services.yml | 2 + phpBB/config/production/environment.yml | 3 - phpBB/config/production/parameters.yml | 2 - phpBB/config/production/services.yml | 2 - phpBB/phpbb/di/container_builder.php | 63 +++- .../phpbb/di/extension/container_configuration.php | 38 +++ phpBB/phpbb/di/extension/core.php | 37 ++- phpBB/phpbb/di/extension/ext.php | 8 +- .../config/development/container/environment.yml | 14 + .../di/fixtures/config/development/environment.yml | 14 - .../config/development/container/environment.yml | 2 + .../disabled/config/development/environment.yml | 2 - .../config/development/container/environment.yml | 2 + .../enabled-2/config/development/environment.yml | 2 - .../config/default/container/environment.yml | 2 + .../vendor/enabled/config/default/environment.yml | 2 - .../development/container/environment.yml | 14 + .../other_config/development/environment.yml | 14 - 60 files changed, 1733 insertions(+), 1642 deletions(-) create mode 100644 phpBB/config/default/config.yml create mode 100644 phpBB/config/default/container/parameters.yml create mode 100644 phpBB/config/default/container/services.yml create mode 100644 phpBB/config/default/container/services_auth_providers.yml create mode 100644 phpBB/config/default/container/services_avatars.yml create mode 100644 phpBB/config/default/container/services_captcha.yml create mode 100644 phpBB/config/default/container/services_console.yml create mode 100644 phpBB/config/default/container/services_cron_tasks.yml create mode 100644 phpBB/config/default/container/services_feed.yml create mode 100644 phpBB/config/default/container/services_migrator.yml create mode 100644 phpBB/config/default/container/services_mimetype_guessers.yml create mode 100644 phpBB/config/default/container/services_notifications.yml create mode 100644 phpBB/config/default/container/services_passwords.yml create mode 100644 phpBB/config/default/container/services_profilefields.yml create mode 100644 phpBB/config/default/container/services_twig.yml create mode 100644 phpBB/config/default/container/tables.yml delete mode 100644 phpBB/config/default/parameters.yml delete mode 100644 phpBB/config/default/services.yml delete mode 100644 phpBB/config/default/services_auth_providers.yml delete mode 100644 phpBB/config/default/services_avatars.yml delete mode 100644 phpBB/config/default/services_captcha.yml delete mode 100644 phpBB/config/default/services_console.yml delete mode 100644 phpBB/config/default/services_cron_tasks.yml delete mode 100644 phpBB/config/default/services_feed.yml delete mode 100644 phpBB/config/default/services_migrator.yml delete mode 100644 phpBB/config/default/services_mimetype_guessers.yml delete mode 100644 phpBB/config/default/services_notifications.yml delete mode 100644 phpBB/config/default/services_passwords.yml delete mode 100644 phpBB/config/default/services_profilefields.yml delete mode 100644 phpBB/config/default/services_twig.yml delete mode 100644 phpBB/config/default/tables.yml create mode 100644 phpBB/config/development/config.yml create mode 100644 phpBB/config/development/container/environment.yml create mode 100644 phpBB/config/development/container/parameters.yml create mode 100644 phpBB/config/development/container/services.yml delete mode 100644 phpBB/config/development/environment.yml delete mode 100644 phpBB/config/development/parameters.yml delete mode 100644 phpBB/config/development/services.yml create mode 100644 phpBB/config/production/config.yml create mode 100644 phpBB/config/production/container/environment.yml create mode 100644 phpBB/config/production/container/parameters.yml create mode 100644 phpBB/config/production/container/services.yml delete mode 100644 phpBB/config/production/environment.yml delete mode 100644 phpBB/config/production/parameters.yml delete mode 100644 phpBB/config/production/services.yml create mode 100644 phpBB/phpbb/di/extension/container_configuration.php create mode 100644 tests/di/fixtures/config/development/container/environment.yml delete mode 100644 tests/di/fixtures/config/development/environment.yml create mode 100644 tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml delete mode 100644 tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml create mode 100644 tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml delete mode 100644 tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml create mode 100644 tests/di/fixtures/ext/vendor/enabled/config/default/container/environment.yml delete mode 100644 tests/di/fixtures/ext/vendor/enabled/config/default/environment.yml create mode 100644 tests/di/fixtures/other_config/development/container/environment.yml delete mode 100644 tests/di/fixtures/other_config/development/environment.yml diff --git a/phpBB/common.php b/phpBB/common.php index 85568ab10e..2fa0c46b22 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -96,14 +96,6 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); -if (PHPBB_ENVIRONMENT == 'debug' && !class_exists('Goutte\Client', true)) -{ - trigger_error( - 'Composer development dependencies have not been set up for the development environment yet, run ' . - "'php ../composer.phar install --dev' from the phpBB directory to do so.", - E_USER_ERROR - ); -} phpbb_load_extensions_autoloaders($phpbb_root_path); // Set up container diff --git a/phpBB/config/default/config.yml b/phpBB/config/default/config.yml new file mode 100644 index 0000000000..e69de29bb2 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..3f36a5178a --- /dev/null +++ b/phpBB/config/default/container/services.yml @@ -0,0 +1,196 @@ +imports: + - { 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_mimetype_guesser.yml } + - { resource: services_notification.yml } + - { resource: services_password.yml } + - { resource: services_profilefield.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 + - @router + - @symfony_request + - @request + - @filesystem + - %core.root_path% + - %core.php_ext% + + controller.resolver: + class: phpbb\controller\resolver + arguments: + - @user + - @service_container + - %core.root_path% + - @template + + ext.manager: + class: phpbb\extension\manager + arguments: + - @service_container + - @dbal.conn + - @config + - @filesystem + - @user + - %tables.ext% + - %core.root_path% + - %core.php_ext% + - @cache.driver + + filesystem: + class: phpbb\filesystem + + http_kernel: + class: Symfony\Component\HttpKernel\HttpKernel + arguments: + - @dispatcher + - @controller.resolver + + 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% + + 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 + arguments: + - null + - %core.disable_super_globals% + + router: + class: phpbb\routing\router + arguments: + - @ext.manager + - %core.root_path% + - %core.php_ext% + + router.listener: + class: Symfony\Component\HttpKernel\EventListener\RouterListener + arguments: + - @router + tags: + - { name: kernel.event_subscriber } + + # 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 + + template: + class: phpbb\template\twig\twig + arguments: + - @path_helper + - @config + - @user + - @template_context + - @template.twig.environment + - %core.template.cache_path% + - @template.twig.extensions.collection + - @ext.manager + + template_context: + class: phpbb\template\context + + version_helper: + class: phpbb\version_helper + scope: prototype + arguments: + - @cache + - @config + - @user diff --git a/phpBB/config/default/container/services_auth_providers.yml b/phpBB/config/default/container/services_auth_providers.yml new file mode 100644 index 0000000000..89303a684a --- /dev/null +++ b/phpBB/config/default/container/services_auth_providers.yml @@ -0,0 +1,86 @@ +services: + 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_account_assoc% + - @auth.provider.oauth.service_collection + - %tables.users% + - @service_container + - %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/default/container/services_avatars.yml b/phpBB/config/default/container/services_avatars.yml new file mode 100644 index 0000000000..8e5b1fdbfe --- /dev/null +++ b/phpBB/config/default/container/services_avatars.yml @@ -0,0 +1,60 @@ +services: + avatar.driver.gravatar: + class: phpbb\avatar\driver\gravatar + arguments: + - @config + - %core.root_path% + - %core.php_ext% + - @path_helper + - @cache.driver + calls: + - [set_name, [avatar.driver.gravatar]] + tags: + - { name: avatar.driver } + + avatar.driver.local: + class: phpbb\avatar\driver\local + arguments: + - @config + - %core.root_path% + - %core.php_ext% + - @path_helper + - @cache.driver + calls: + - [set_name, [avatar.driver.local]] + tags: + - { name: avatar.driver } + + avatar.driver.remote: + class: phpbb\avatar\driver\remote + arguments: + - @config + - %core.root_path% + - %core.php_ext% + - @path_helper + - @cache.driver + calls: + - [set_name, [avatar.driver.remote]] + tags: + - { name: avatar.driver } + + avatar.driver.upload: + class: phpbb\avatar\driver\upload + arguments: + - @config + - %core.root_path% + - %core.php_ext% + - @path_helper + - @mimetype.guesser + - @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..e3f617e909 --- /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..1e18a7dd37 --- /dev/null +++ b/phpBB/config/default/container/services_console.yml @@ -0,0 +1,141 @@ +services: + 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.migrate: + class: phpbb\console\command\db\migrate + arguments: + - @user + - @migrator + - @ext.manager + - @config + - @cache + - @log + - %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 } diff --git a/phpBB/config/default/container/services_cron_tasks.yml b/phpBB/config/default/container/services_cron_tasks.yml new file mode 100644 index 0000000000..acf9a48bf9 --- /dev/null +++ b/phpBB/config/default/container/services_cron_tasks.yml @@ -0,0 +1,125 @@ +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_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 + 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/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml new file mode 100644 index 0000000000..48bd9fe76f --- /dev/null +++ b/phpBB/config/default/container/services_feed.yml @@ -0,0 +1,106 @@ +services: + feed.helper: + class: phpbb\feed\helper + arguments: + - @config + - @user + - %core.root_path% + - %core.php_ext% + + 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/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml new file mode 100644 index 0000000000..cd04eea5c2 --- /dev/null +++ b/phpBB/config/default/container/services_migrator.yml @@ -0,0 +1,60 @@ +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.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 + - %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/default/container/services_mimetype_guessers.yml b/phpBB/config/default/container/services_mimetype_guessers.yml new file mode 100644 index 0000000000..0115146deb --- /dev/null +++ b/phpBB/config/default/container/services_mimetype_guessers.yml @@ -0,0 +1,43 @@ +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.fileinfo_mimetype_guesser: + class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser + tags: + - { name: mimetype.guessers } + + mimetype.filebinary_mimetype_guesser: + class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser + tags: + - { name: mimetype.guessers } + + mimetype.content_guesser: + class: phpbb\mimetype\content_guesser + calls: + - [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%]] + 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 diff --git a/phpBB/config/default/container/services_notifications.yml b/phpBB/config/default/container/services_notifications.yml new file mode 100644 index 0000000000..5675e76a99 --- /dev/null +++ b/phpBB/config/default/container/services_notifications.yml @@ -0,0 +1,368 @@ +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/default/container/services_passwords.yml b/phpBB/config/default/container/services_passwords.yml new file mode 100644 index 0000000000..3dc217286f --- /dev/null +++ b/phpBB/config/default/container/services_passwords.yml @@ -0,0 +1,128 @@ +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.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 + - %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 } + + 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/default/container/services_profilefields.yml b/phpBB/config/default/container/services_profilefields.yml new file mode 100644 index 0000000000..ce2a84b12b --- /dev/null +++ b/phpBB/config/default/container/services_profilefields.yml @@ -0,0 +1,101 @@ +services: + profilefields.manager: + class: phpbb\profilefields\manager + arguments: + - @auth + - @dbal.conn + - @dispatcher + - @request + - @template + - @profilefields.type_collection + - @user + - %tables.profile_fields% + - %tables.profile_fields_language% + - %tables.profile_fields_data% + + 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.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_twig.yml b/phpBB/config/default/container/services_twig.yml new file mode 100644 index 0000000000..fc5f9ba6a1 --- /dev/null +++ b/phpBB/config/default/container/services_twig.yml @@ -0,0 +1,43 @@ +parameters: + core.template.cache_path: %core.root_path%cache/%core.environment%/twig/ + +services: + template.twig.environment: + class: phpbb\template\twig\environment + arguments: + - @config + - @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 + + 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 + - @user + tags: + - { name: twig.extension } + + template.twig.extensions.routing: + class: Symfony\Bridge\Twig\Extension\RoutingExtension + arguments: + - @router + tags: + - { name: twig.extension } diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml new file mode 100644 index 0000000000..2fe2a33be8 --- /dev/null +++ b/phpBB/config/default/container/tables.yml @@ -0,0 +1,23 @@ +parameters: + tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens + tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts + 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.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/default/parameters.yml b/phpBB/config/default/parameters.yml deleted file mode 100644 index 8ecc1428f4..0000000000 --- a/phpBB/config/default/parameters.yml +++ /dev/null @@ -1,20 +0,0 @@ -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/services.yml b/phpBB/config/default/services.yml deleted file mode 100644 index 3f36a5178a..0000000000 --- a/phpBB/config/default/services.yml +++ /dev/null @@ -1,196 +0,0 @@ -imports: - - { 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_mimetype_guesser.yml } - - { resource: services_notification.yml } - - { resource: services_password.yml } - - { resource: services_profilefield.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 - - @router - - @symfony_request - - @request - - @filesystem - - %core.root_path% - - %core.php_ext% - - controller.resolver: - class: phpbb\controller\resolver - arguments: - - @user - - @service_container - - %core.root_path% - - @template - - ext.manager: - class: phpbb\extension\manager - arguments: - - @service_container - - @dbal.conn - - @config - - @filesystem - - @user - - %tables.ext% - - %core.root_path% - - %core.php_ext% - - @cache.driver - - filesystem: - class: phpbb\filesystem - - http_kernel: - class: Symfony\Component\HttpKernel\HttpKernel - arguments: - - @dispatcher - - @controller.resolver - - 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% - - 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 - arguments: - - null - - %core.disable_super_globals% - - router: - class: phpbb\routing\router - arguments: - - @ext.manager - - %core.root_path% - - %core.php_ext% - - router.listener: - class: Symfony\Component\HttpKernel\EventListener\RouterListener - arguments: - - @router - tags: - - { name: kernel.event_subscriber } - - # 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 - - template: - class: phpbb\template\twig\twig - arguments: - - @path_helper - - @config - - @user - - @template_context - - @template.twig.environment - - %core.template.cache_path% - - @template.twig.extensions.collection - - @ext.manager - - template_context: - class: phpbb\template\context - - version_helper: - class: phpbb\version_helper - scope: prototype - arguments: - - @cache - - @config - - @user diff --git a/phpBB/config/default/services_auth_providers.yml b/phpBB/config/default/services_auth_providers.yml deleted file mode 100644 index 89303a684a..0000000000 --- a/phpBB/config/default/services_auth_providers.yml +++ /dev/null @@ -1,86 +0,0 @@ -services: - 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_account_assoc% - - @auth.provider.oauth.service_collection - - %tables.users% - - @service_container - - %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/default/services_avatars.yml b/phpBB/config/default/services_avatars.yml deleted file mode 100644 index 8e5b1fdbfe..0000000000 --- a/phpBB/config/default/services_avatars.yml +++ /dev/null @@ -1,60 +0,0 @@ -services: - avatar.driver.gravatar: - class: phpbb\avatar\driver\gravatar - arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver - calls: - - [set_name, [avatar.driver.gravatar]] - tags: - - { name: avatar.driver } - - avatar.driver.local: - class: phpbb\avatar\driver\local - arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver - calls: - - [set_name, [avatar.driver.local]] - tags: - - { name: avatar.driver } - - avatar.driver.remote: - class: phpbb\avatar\driver\remote - arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver - calls: - - [set_name, [avatar.driver.remote]] - tags: - - { name: avatar.driver } - - avatar.driver.upload: - class: phpbb\avatar\driver\upload - arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @path_helper - - @mimetype.guesser - - @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/services_captcha.yml b/phpBB/config/default/services_captcha.yml deleted file mode 100644 index e3f617e909..0000000000 --- a/phpBB/config/default/services_captcha.yml +++ /dev/null @@ -1,59 +0,0 @@ -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/services_console.yml b/phpBB/config/default/services_console.yml deleted file mode 100644 index 1e18a7dd37..0000000000 --- a/phpBB/config/default/services_console.yml +++ /dev/null @@ -1,141 +0,0 @@ -services: - 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.migrate: - class: phpbb\console\command\db\migrate - arguments: - - @user - - @migrator - - @ext.manager - - @config - - @cache - - @log - - %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 } diff --git a/phpBB/config/default/services_cron_tasks.yml b/phpBB/config/default/services_cron_tasks.yml deleted file mode 100644 index acf9a48bf9..0000000000 --- a/phpBB/config/default/services_cron_tasks.yml +++ /dev/null @@ -1,125 +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_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 - 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/services_feed.yml b/phpBB/config/default/services_feed.yml deleted file mode 100644 index 48bd9fe76f..0000000000 --- a/phpBB/config/default/services_feed.yml +++ /dev/null @@ -1,106 +0,0 @@ -services: - feed.helper: - class: phpbb\feed\helper - arguments: - - @config - - @user - - %core.root_path% - - %core.php_ext% - - 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/default/services_migrator.yml b/phpBB/config/default/services_migrator.yml deleted file mode 100644 index cd04eea5c2..0000000000 --- a/phpBB/config/default/services_migrator.yml +++ /dev/null @@ -1,60 +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.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 - - %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/default/services_mimetype_guessers.yml b/phpBB/config/default/services_mimetype_guessers.yml deleted file mode 100644 index 0115146deb..0000000000 --- a/phpBB/config/default/services_mimetype_guessers.yml +++ /dev/null @@ -1,43 +0,0 @@ -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.fileinfo_mimetype_guesser: - class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser - tags: - - { name: mimetype.guessers } - - mimetype.filebinary_mimetype_guesser: - class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser - tags: - - { name: mimetype.guessers } - - mimetype.content_guesser: - class: phpbb\mimetype\content_guesser - calls: - - [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%]] - 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 diff --git a/phpBB/config/default/services_notifications.yml b/phpBB/config/default/services_notifications.yml deleted file mode 100644 index 5675e76a99..0000000000 --- a/phpBB/config/default/services_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/default/services_passwords.yml b/phpBB/config/default/services_passwords.yml deleted file mode 100644 index 3dc217286f..0000000000 --- a/phpBB/config/default/services_passwords.yml +++ /dev/null @@ -1,128 +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.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 - - %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 } - - 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/default/services_profilefields.yml b/phpBB/config/default/services_profilefields.yml deleted file mode 100644 index ce2a84b12b..0000000000 --- a/phpBB/config/default/services_profilefields.yml +++ /dev/null @@ -1,101 +0,0 @@ -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% - - 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/services_twig.yml b/phpBB/config/default/services_twig.yml deleted file mode 100644 index 06ce5bc15c..0000000000 --- a/phpBB/config/default/services_twig.yml +++ /dev/null @@ -1,43 +0,0 @@ -parameters: - core.template.cache_path: %core.root_path%cache/%environment%/twig/ - -services: - template.twig.environment: - class: phpbb\template\twig\environment - arguments: - - @config - - @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 - - 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 - - @user - tags: - - { name: twig.extension } - - template.twig.extensions.routing: - class: Symfony\Bridge\Twig\Extension\RoutingExtension - arguments: - - @router - tags: - - { name: twig.extension } diff --git a/phpBB/config/default/tables.yml b/phpBB/config/default/tables.yml deleted file mode 100644 index 2fe2a33be8..0000000000 --- a/phpBB/config/default/tables.yml +++ /dev/null @@ -1,23 +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.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.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/development/config.yml b/phpBB/config/development/config.yml new file mode 100644 index 0000000000..1c17b08931 --- /dev/null +++ b/phpBB/config/development/config.yml @@ -0,0 +1,5 @@ +imports: + - { resource: ../default/config.yml } + +core: + require_dev_dependencies: 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/environment.yml b/phpBB/config/development/environment.yml deleted file mode 100644 index 40a3c7a683..0000000000 --- a/phpBB/config/development/environment.yml +++ /dev/null @@ -1,3 +0,0 @@ -imports: - - { resource: services.yml } - - { resource: parameters.yml } diff --git a/phpBB/config/development/parameters.yml b/phpBB/config/development/parameters.yml deleted file mode 100644 index 02743729f9..0000000000 --- a/phpBB/config/development/parameters.yml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: ../default/parameters.yml } diff --git a/phpBB/config/development/services.yml b/phpBB/config/development/services.yml deleted file mode 100644 index 6342885067..0000000000 --- a/phpBB/config/development/services.yml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: ../default/services.yml } 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/environment.yml b/phpBB/config/production/environment.yml deleted file mode 100644 index 40a3c7a683..0000000000 --- a/phpBB/config/production/environment.yml +++ /dev/null @@ -1,3 +0,0 @@ -imports: - - { resource: services.yml } - - { resource: parameters.yml } diff --git a/phpBB/config/production/parameters.yml b/phpBB/config/production/parameters.yml deleted file mode 100644 index 02743729f9..0000000000 --- a/phpBB/config/production/parameters.yml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: ../default/parameters.yml } diff --git a/phpBB/config/production/services.yml b/phpBB/config/production/services.yml deleted file mode 100644 index 6342885067..0000000000 --- a/phpBB/config/production/services.yml +++ /dev/null @@ -1,2 +0,0 @@ -imports: - - { resource: ../default/services.yml } diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index b264b0182f..45dbaaf303 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -14,9 +14,13 @@ namespace phpbb\di; use Symfony\Component\Config\ConfigCache; +use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Dumper\PhpDumper; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass; +use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass; class container_builder { @@ -151,7 +155,6 @@ class container_builder } else { - $container_extensions = array(new \phpbb\di\extension\core($this->get_config_path())); if ($this->use_extensions) @@ -179,7 +182,8 @@ class container_builder } } - $this->inject_custom_parameters(); + $loader = new YamlFileLoader($this->container, new FileLocator(phpbb_realpath($this->get_config_path()))); + $loader->load(PHPBB_ENVIRONMENT . '/config.yml'); if ($this->compile_container) { @@ -400,36 +404,59 @@ class container_builder */ protected function create_container(array $extensions) { - $container = new ContainerBuilder(); + $container = new ContainerBuilder(new ParameterBag($this->get_core_parameters())); + + $extensions_alias = array(); foreach ($extensions as $extension) { $container->registerExtension($extension); - $container->loadFromExtension($extension->getAlias()); + $extensions_alias[] = $extension->getAlias(); + //$container->loadFromExtension($extension->getAlias()); } + $container->getCompilerPassConfig()->setMergePass(new MergeExtensionConfigurationPass($extensions_alias)); + return $container; } /** - * Inject the customs parameters into the container - */ - protected function inject_custom_parameters() + * Returns the core parameters. + * + * @return array An array of core parameters + */ + protected function get_core_parameters() { - if ($this->custom_parameters === null) - { - $this->custom_parameters = array( - 'core.root_path' => $this->phpbb_root_path, - 'core.php_ext' => $this->php_ext, - ); - } - - $this->custom_parameters['environment'] = PHPBB_ENVIRONMENT; + return array_merge( + array( + 'core.root_path' => $this->phpbb_root_path, + 'core.php_ext' => $this->php_ext, + 'core.environment' => PHPBB_ENVIRONMENT, + 'core.debug' => DEBUG, + ), + $this->get_env_parameters() + ); + } - foreach ($this->custom_parameters as $key => $value) + /** + * Gets the environment parameters. + * + * Only the parameters starting with "PHPBB__" are considered. + * + * @return array An array of parameters + */ + protected function get_env_parameters() + { + $parameters = array(); + foreach ($_SERVER as $key => $value) { - $this->container->setParameter($key, $value); + if (0 === strpos($key, 'PHPBB__')) + { + $parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value; + } } + + return $parameters; } /** diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php new file mode 100644 index 0000000000..1f1c077472 --- /dev/null +++ b/phpBB/phpbb/di/extension/container_configuration.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\di\extension; + +use Symfony\Component\Config\Definition\Builder\TreeBuilder; +use Symfony\Component\Config\Definition\ConfigurationInterface; + +class container_configuration implements ConfigurationInterface +{ + + /** + * Generates the configuration tree builder. + * + * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder + */ + public function getConfigTreeBuilder() + { + $treeBuilder = new TreeBuilder(); + $rootNode = $treeBuilder->root('core'); + $rootNode + ->children() + ->booleanNode('require_dev_dependencies')->defaultValue(false)->end() + ->end() + ; + return $treeBuilder; + } +} diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 7787602aba..62fcf46ad5 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -13,10 +13,11 @@ namespace phpbb\di\extension; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -use Symfony\Component\Config\FileLocator; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * Container core extension @@ -42,15 +43,41 @@ class core extends Extension /** * Loads a specific configuration. * - * @param array $config An array of configuration values + * @param array $configs An array of configuration values * @param ContainerBuilder $container A ContainerBuilder instance * * @throws \InvalidArgumentException When provided tag is not defined in this extension */ - public function load(array $config, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container) { $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path))); - $loader->load(PHPBB_ENVIRONMENT . '/environment.yml'); + $loader->load(PHPBB_ENVIRONMENT . '/container/environment.yml'); + + $config = $this->getConfiguration($configs, $container); + $config = $this->processConfiguration($config, $configs); + + if ($config['require_dev_dependencies']) + { + if (!class_exists('Goutte\Client', true)) + { + trigger_error( + 'Composer development dependencies have not been set up for the ' . $container->getParameter('core.environment') . ' environment yet, run ' . + "'php ../composer.phar install --dev' from the phpBB directory to do so.", + E_USER_ERROR + ); + } + } + } + + /** + * {@inheritdoc} + */ + public function getConfiguration(array $config, ContainerBuilder $container) + { + $r = new \ReflectionClass('\phpbb\di\extension\container_configuration'); + $container->addResource(new FileResource($r->getFileName())); + + return new container_configuration(); } /** diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php index 330303ca0c..021e862118 100644 --- a/phpBB/phpbb/di/extension/ext.php +++ b/phpBB/phpbb/di/extension/ext.php @@ -48,16 +48,16 @@ class ext extends Extension $services_directory = false; $services_file = false; - if (file_exists($path . 'config/' . PHPBB_ENVIRONMENT . '/environment.yml')) + if (file_exists($path . 'config/' . PHPBB_ENVIRONMENT . '/container/environment.yml')) { - $services_directory = $path . 'config/' . PHPBB_ENVIRONMENT; + $services_directory = $path . 'config/' . PHPBB_ENVIRONMENT . '/container/'; $services_file = 'environment.yml'; } else if (!is_dir($path . 'config/' . PHPBB_ENVIRONMENT)) { - if (file_exists($path . 'config/default/environment.yml')) + if (file_exists($path . 'config/default/container/environment.yml')) { - $services_directory = $path . 'config/default'; + $services_directory = $path . 'config/default/container/'; $services_file = 'environment.yml'; } else if (!is_dir($path . 'config/default') && file_exists($path . '/config/services.yml')) diff --git a/tests/di/fixtures/config/development/container/environment.yml b/tests/di/fixtures/config/development/container/environment.yml new file mode 100644 index 0000000000..f2a22ae109 --- /dev/null +++ b/tests/di/fixtures/config/development/container/environment.yml @@ -0,0 +1,14 @@ +parameters: + core: true + +services: + config.php: + synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/config/development/environment.yml b/tests/di/fixtures/config/development/environment.yml deleted file mode 100644 index f2a22ae109..0000000000 --- a/tests/di/fixtures/config/development/environment.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - core: true - -services: - config.php: - synthetic: true - - dbal.conn: - class: phpbb\db\driver\factory - arguments: - - @service_container - - dispatcher: - class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml b/tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml new file mode 100644 index 0000000000..31ada384bf --- /dev/null +++ b/tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml @@ -0,0 +1,2 @@ +parameters: + disabled: true diff --git a/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml b/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml deleted file mode 100644 index 31ada384bf..0000000000 --- a/tests/di/fixtures/ext/vendor/disabled/config/development/environment.yml +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - disabled: true diff --git a/tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml b/tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml new file mode 100644 index 0000000000..feeb5a7a2d --- /dev/null +++ b/tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml @@ -0,0 +1,2 @@ +parameters: + enabled_2: true diff --git a/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml b/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml deleted file mode 100644 index feeb5a7a2d..0000000000 --- a/tests/di/fixtures/ext/vendor/enabled-2/config/development/environment.yml +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - enabled_2: true diff --git a/tests/di/fixtures/ext/vendor/enabled/config/default/container/environment.yml b/tests/di/fixtures/ext/vendor/enabled/config/default/container/environment.yml new file mode 100644 index 0000000000..88a7919ed1 --- /dev/null +++ b/tests/di/fixtures/ext/vendor/enabled/config/default/container/environment.yml @@ -0,0 +1,2 @@ +parameters: + enabled: true diff --git a/tests/di/fixtures/ext/vendor/enabled/config/default/environment.yml b/tests/di/fixtures/ext/vendor/enabled/config/default/environment.yml deleted file mode 100644 index 88a7919ed1..0000000000 --- a/tests/di/fixtures/ext/vendor/enabled/config/default/environment.yml +++ /dev/null @@ -1,2 +0,0 @@ -parameters: - enabled: true diff --git a/tests/di/fixtures/other_config/development/container/environment.yml b/tests/di/fixtures/other_config/development/container/environment.yml new file mode 100644 index 0000000000..c299bfc648 --- /dev/null +++ b/tests/di/fixtures/other_config/development/container/environment.yml @@ -0,0 +1,14 @@ +parameters: + other_config: true + +services: + config.php: + synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/other_config/development/environment.yml b/tests/di/fixtures/other_config/development/environment.yml deleted file mode 100644 index c299bfc648..0000000000 --- a/tests/di/fixtures/other_config/development/environment.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - other_config: true - -services: - config.php: - synthetic: true - - dbal.conn: - class: phpbb\db\driver\factory - arguments: - - @service_container - - dispatcher: - class: phpbb\db\driver\container_mock -- cgit v1.2.1