diff options
Diffstat (limited to 'phpBB')
70 files changed, 1457 insertions, 1133 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index e67af18a9c..f5f85fbcad 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -36,41 +36,41 @@ services: cache: class: phpbb\cache\service arguments: - - @cache.driver - - @config - - @dbal.conn - - %core.root_path% - - %core.php_ext% + - '@cache.driver' + - '@config' + - '@dbal.conn' + - '%core.root_path%' + - '%core.php_ext%' cache.driver: - class: %cache.driver.class% + class: '%cache.driver.class%' class_loader: class: phpbb\class_loader arguments: - phpbb\ - - %core.root_path%includes/ - - %core.php_ext% + - '%core.root_path%includes/' + - '%core.php_ext%' calls: - [register, []] - - [set_cache, [@cache.driver]] + - [set_cache, ['@cache.driver']] class_loader.ext: class: phpbb\class_loader arguments: - \ - - %core.root_path%ext/ - - %core.php_ext% + - '%core.root_path%ext/' + - '%core.php_ext%' calls: - [register, []] - - [set_cache, [@cache.driver]] + - [set_cache, ['@cache.driver']] config: class: phpbb\config\db arguments: - - @dbal.conn - - @cache.driver - - %tables.config% + - '@dbal.conn' + - '@cache.driver' + - '%tables.config%' config.php: synthetic: true @@ -78,37 +78,37 @@ services: config_text: class: phpbb\config\db_text arguments: - - @dbal.conn - - %tables.config_text% + - '@dbal.conn' + - '%tables.config_text%' controller.helper: class: phpbb\controller\helper arguments: - - @template - - @user - - @config - - @symfony_request - - @request - - @routing.helper + - '@template' + - '@user' + - '@config' + - '@symfony_request' + - '@request' + - '@routing.helper' controller.resolver: class: phpbb\controller\resolver arguments: - - @service_container - - %core.root_path% - - @template + - '@service_container' + - '%core.root_path%' + - '@template' ext.manager: class: phpbb\extension\manager arguments: - - @service_container - - @dbal.conn - - @config - - @filesystem - - %tables.ext% - - %core.root_path% - - %core.php_ext% - - @cache.driver + - '@service_container' + - '@dbal.conn' + - '@config' + - '@filesystem' + - '%tables.ext%' + - '%core.root_path%' + - '%core.php_ext%' + - '@cache.driver' file_downloader: class: phpbb\file_downloader @@ -116,45 +116,45 @@ services: file_locator: class: phpbb\routing\file_locator arguments: - - @filesystem - - %core.root_path% + - '@filesystem' + - '%core.root_path%' group_helper: class: phpbb\group\helper arguments: - - @language + - '@language' log: class: phpbb\log\log arguments: - - @dbal.conn - - @user - - @auth - - @dispatcher - - %core.root_path% - - %core.adm_relative_path% - - %core.php_ext% - - %tables.log% + - '@dbal.conn' + - '@user' + - '@auth' + - '@dispatcher' + - '%core.root_path%' + - '%core.adm_relative_path%' + - '%core.php_ext%' + - '%tables.log%' path_helper: class: phpbb\path_helper arguments: - - @symfony_request - - @filesystem - - @request - - %core.root_path% - - %core.php_ext% - - %core.adm_relative_path% + - '@symfony_request' + - '@filesystem' + - '@request' + - '%core.root_path%' + - '%core.php_ext%' + - '%core.adm_relative_path%' plupload: class: phpbb\plupload\plupload arguments: - - %core.root_path% - - @config - - @request - - @user - - @php_ini - - @mimetype.guesser + - '%core.root_path%' + - '@config' + - '@request' + - '@user' + - '@php_ini' + - '@mimetype.guesser' upload_imagesize: class: FastImageSize\FastImageSize @@ -163,7 +163,7 @@ services: class: phpbb\version_helper scope: prototype arguments: - - @cache - - @config - - @file_downloader - - @user + - '@cache' + - '@config' + - '@file_downloader' + - '@user' diff --git a/phpBB/config/default/container/services_attachment.yml b/phpBB/config/default/container/services_attachment.yml index 5506b2ec90..f448367473 100644 --- a/phpBB/config/default/container/services_attachment.yml +++ b/phpBB/config/default/container/services_attachment.yml @@ -3,38 +3,38 @@ services: class: phpbb\attachment\delete scope: prototype arguments: - - @config - - @dbal.conn - - @dispatcher - - @filesystem - - @attachment.resync - - %core.root_path% + - '@config' + - '@dbal.conn' + - '@dispatcher' + - '@filesystem' + - '@attachment.resync' + - '%core.root_path%' attachment.manager: class: phpbb\attachment\manager scope: prototype arguments: - - @attachment.delete - - @attachment.resync - - @attachment.upload + - '@attachment.delete' + - '@attachment.resync' + - '@attachment.upload' attachment.resync: class: phpbb\attachment\resync scope: prototype arguments: - - @dbal.conn + - '@dbal.conn' attachment.upload: class: phpbb\attachment\upload scope: prototype arguments: - - @auth - - @cache - - @config - - @files.upload - - @language - - @mimetype.guesser - - @dispatcher - - @plupload - - @user - - %core.root_path% + - '@auth' + - '@cache' + - '@config' + - '@files.upload' + - '@language' + - '@mimetype.guesser' + - '@dispatcher' + - '@plupload' + - '@user' + - '%core.root_path%' diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index 88a90ca2d6..57c6c73525 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -7,63 +7,63 @@ services: auth.provider_collection: class: phpbb\auth\provider_collection arguments: - - @service_container - - @config + - '@service_container' + - '@config' tags: - { name: service_collection, tag: auth.provider } auth.provider.db: class: phpbb\auth\provider\db arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - @service_container - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '@service_container' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } auth.provider.apache: class: phpbb\auth\provider\apache arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } auth.provider.ldap: class: phpbb\auth\provider\ldap arguments: - - @dbal.conn - - @config - - @passwords.manager - - @user + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@user' tags: - { name: auth.provider } auth.provider.oauth: class: phpbb\auth\provider\oauth\oauth arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - %tables.auth_provider_oauth_token_storage% - - %tables.auth_provider_oauth_account_assoc% - - @auth.provider.oauth.service_collection - - %tables.users% - - @service_container - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '%tables.auth_provider_oauth_token_storage%' + - '%tables.auth_provider_oauth_account_assoc%' + - '@auth.provider.oauth.service_collection' + - '%tables.users%' + - '@service_container' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } @@ -71,30 +71,30 @@ services: auth.provider.oauth.service_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: auth.provider.oauth.service } auth.provider.oauth.service.bitly: class: phpbb\auth\provider\oauth\service\bitly arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.facebook: class: phpbb\auth\provider\oauth\service\facebook arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.google: class: phpbb\auth\provider\oauth\service\google arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index 76057cf5a7..6cc38516ae 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -2,26 +2,26 @@ services: avatar.manager: class: phpbb\avatar\manager arguments: - - @config - - @avatar.driver_collection + - '@config' + - '@avatar.driver_collection' # ----- Avatar drivers ----- avatar.driver_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: avatar.driver } avatar.driver.gravatar: class: phpbb\avatar\driver\gravatar arguments: - - @config - - @upload_imagesize - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver + - '@config' + - '@upload_imagesize' + - '%core.root_path%' + - '%core.php_ext%' + - '@path_helper' + - '@cache.driver' calls: - [set_name, [avatar.driver.gravatar]] tags: @@ -30,12 +30,12 @@ services: avatar.driver.local: class: phpbb\avatar\driver\local arguments: - - @config - - @upload_imagesize - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver + - '@config' + - '@upload_imagesize' + - '%core.root_path%' + - '%core.php_ext%' + - '@path_helper' + - '@cache.driver' calls: - [set_name, [avatar.driver.local]] tags: @@ -44,12 +44,12 @@ services: avatar.driver.remote: class: phpbb\avatar\driver\remote arguments: - - @config - - @upload_imagesize - - %core.root_path% - - %core.php_ext% - - @path_helper - - @cache.driver + - '@config' + - '@upload_imagesize' + - '%core.root_path%' + - '%core.php_ext%' + - '@path_helper' + - '@cache.driver' calls: - [set_name, [avatar.driver.remote]] tags: @@ -58,14 +58,14 @@ services: avatar.driver.upload: class: phpbb\avatar\driver\upload arguments: - - @config - - %core.root_path% - - %core.php_ext% - - @filesystem - - @path_helper - - @dispatcher - - @files.factory - - @cache.driver + - '@config' + - '%core.root_path%' + - '%core.php_ext%' + - '@filesystem' + - '@path_helper' + - '@dispatcher' + - '@files.factory' + - '@cache.driver' calls: - [set_name, [avatar.driver.upload]] tags: diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index e3f617e909..a1d063ada8 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -2,15 +2,15 @@ services: captcha.factory: class: phpbb\captcha\factory arguments: - - @service_container - - @captcha.plugins.service_collection + - '@service_container' + - '@captcha.plugins.service_collection' # ----- Captcha plugins ----- # Scope MUST be prototype for all the plugins to work. captcha.plugins.service_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: captcha.plugins } @@ -42,9 +42,9 @@ services: class: phpbb\captcha\plugins\qa scope: prototype arguments: - - %tables.captcha_qa_questions% - - %tables.captcha_qa_answers% - - %tables.captcha_qa_confirm% + - '%tables.captcha_qa_questions%' + - '%tables.captcha_qa_answers%' + - '%tables.captcha_qa_confirm%' calls: - [set_name, [core.captcha.plugins.qa]] tags: diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 169bf82098..2055fb68c5 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -2,220 +2,220 @@ services: console.exception_subscriber: class: phpbb\console\exception_subscriber arguments: - - @language - - %debug.exceptions% + - '@language' + - '%debug.exceptions%' tags: - { name: kernel.event_subscriber } console.command_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: console.command } console.command.cache.purge: class: phpbb\console\command\cache\purge arguments: - - @user - - @cache.driver - - @dbal.conn - - @auth - - @log - - @config + - '@user' + - '@cache.driver' + - '@dbal.conn' + - '@auth' + - '@log' + - '@config' tags: - { name: console.command } console.command.config.delete: class: phpbb\console\command\config\delete arguments: - - @user - - @config + - '@user' + - '@config' tags: - { name: console.command } console.command.config.increment: class: phpbb\console\command\config\increment arguments: - - @user - - @config + - '@user' + - '@config' tags: - { name: console.command } console.command.config.get: class: phpbb\console\command\config\get arguments: - - @user - - @config + - '@user' + - '@config' tags: - { name: console.command } console.command.config.set: class: phpbb\console\command\config\set arguments: - - @user - - @config + - '@user' + - '@config' tags: - { name: console.command } console.command.config.set_atomic: class: phpbb\console\command\config\set_atomic arguments: - - @user - - @config + - '@user' + - '@config' tags: - { name: console.command } console.command.cron.list: class: phpbb\console\command\cron\cron_list arguments: - - @user - - @cron.manager + - '@user' + - '@cron.manager' tags: - { name: console.command } console.command.cron.run: class: phpbb\console\command\cron\run arguments: - - @user - - @cron.manager - - @cron.lock_db + - '@user' + - '@cron.manager' + - '@cron.lock_db' tags: - { name: console.command } console.command.db.list: class: phpbb\console\command\db\list_command arguments: - - @user - - @migrator - - @ext.manager - - @config - - @cache + - '@user' + - '@migrator' + - '@ext.manager' + - '@config' + - '@cache' tags: - { name: console.command } console.command.db.migrate: class: phpbb\console\command\db\migrate arguments: - - @user - - @language - - @migrator - - @ext.manager - - @config - - @cache - - @log - - @filesystem - - %core.root_path% + - '@user' + - '@language' + - '@migrator' + - '@ext.manager' + - '@config' + - '@cache' + - '@log' + - '@filesystem' + - '%core.root_path%' tags: - { name: console.command } console.command.db.revert: class: phpbb\console\command\db\revert arguments: - - @user - - @language - - @migrator - - @ext.manager - - @config - - @cache - - @filesystem - - %core.root_path% + - '@user' + - '@language' + - '@migrator' + - '@ext.manager' + - '@config' + - '@cache' + - '@filesystem' + - '%core.root_path%' tags: - { name: console.command } console.command.dev.migration_tips: class: phpbb\console\command\dev\migration_tips arguments: - - @user - - @ext.manager + - '@user' + - '@ext.manager' tags: - { name: console.command } console.command.extension.disable: class: phpbb\console\command\extension\disable arguments: - - @user - - @ext.manager - - @log + - '@user' + - '@ext.manager' + - '@log' tags: - { name: console.command } console.command.extension.enable: class: phpbb\console\command\extension\enable arguments: - - @user - - @ext.manager - - @log + - '@user' + - '@ext.manager' + - '@log' tags: - { name: console.command } console.command.extension.purge: class: phpbb\console\command\extension\purge arguments: - - @user - - @ext.manager - - @log + - '@user' + - '@ext.manager' + - '@log' tags: - { name: console.command } console.command.extension.show: class: phpbb\console\command\extension\show arguments: - - @user - - @ext.manager - - @log + - '@user' + - '@ext.manager' + - '@log' tags: - { name: console.command } console.command.fixup.recalculate_email_hash: class: phpbb\console\command\fixup\recalculate_email_hash arguments: - - @user - - @dbal.conn + - '@user' + - '@dbal.conn' tags: - { name: console.command } console.command.reparser.list: class: phpbb\console\command\reparser\list_all arguments: - - @user - - @text_reparser_collection + - '@user' + - '@text_reparser_collection' tags: - { name: console.command } console.command.reparser.reparse: class: phpbb\console\command\reparser\reparse arguments: - - @user - - @text_reparser.lock - - @text_reparser_collection - - @text_reparser.manager + - '@user' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' tags: - { name: console.command } console.command.thumbnail.delete: class: phpbb\console\command\thumbnail\delete arguments: - - @user - - @dbal.conn - - %core.root_path% + - '@user' + - '@dbal.conn' + - '%core.root_path%' tags: - { name: console.command } console.command.thumbnail.generate: class: phpbb\console\command\thumbnail\generate arguments: - - @user - - @dbal.conn - - @cache - - %core.root_path% - - %core.php_ext% + - '@user' + - '@dbal.conn' + - '@cache' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: console.command } console.command.thumbnail.recreate: class: phpbb\console\command\thumbnail\recreate arguments: - - @user + - '@user' tags: - { name: console.command } diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml index 4d9ee31335..602fd25f4e 100644 --- a/phpBB/config/default/container/services_content.yml +++ b/phpBB/config/default/container/services_content.yml @@ -2,71 +2,71 @@ services: content.visibility: class: phpbb\content_visibility arguments: - - @auth - - @config - - @dispatcher - - @dbal.conn - - @user - - %core.root_path% - - %core.php_ext% - - %tables.forums% - - %tables.posts% - - %tables.topics% - - %tables.users% + - '@auth' + - '@config' + - '@dispatcher' + - '@dbal.conn' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.forums%' + - '%tables.posts%' + - '%tables.topics%' + - '%tables.users%' groupposition.legend: class: phpbb\groupposition\legend arguments: - - @dbal.conn - - @user + - '@dbal.conn' + - '@user' groupposition.teampage: class: phpbb\groupposition\teampage arguments: - - @dbal.conn - - @user - - @cache.driver + - '@dbal.conn' + - '@user' + - '@cache.driver' message.form.admin: class: phpbb\message\admin_form arguments: - - @auth - - @config - - @config_text - - @dbal.conn - - @user - - %core.root_path% - - %core.php_ext% + - '@auth' + - '@config' + - '@config_text' + - '@dbal.conn' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' message.form.topic: class: phpbb\message\topic_form arguments: - - @auth - - @config - - @dbal.conn - - @user - - %core.root_path% - - %core.php_ext% + - '@auth' + - '@config' + - '@dbal.conn' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' message.form.user: class: phpbb\message\user_form arguments: - - @auth - - @config - - @dbal.conn - - @user - - %core.root_path% - - %core.php_ext% + - '@auth' + - '@config' + - '@dbal.conn' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' pagination: class: phpbb\pagination arguments: - - @template - - @user - - @controller.helper - - @dispatcher + - '@template' + - '@user' + - '@controller.helper' + - '@dispatcher' viewonline_helper: class: phpbb\viewonline_helper arguments: - - @filesystem + - '@filesystem' diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml index 4b76bdaf6a..eb7df540d7 100644 --- a/phpBB/config/default/container/services_cron.yml +++ b/phpBB/config/default/container/services_cron.yml @@ -2,32 +2,32 @@ services: cron.manager: class: phpbb\cron\manager arguments: - - @cron.task_collection - - %core.root_path% - - %core.php_ext% + - '@cron.task_collection' + - '%core.root_path%' + - '%core.php_ext%' cron.lock_db: class: phpbb\lock\db arguments: - cron_lock - - @config - - @dbal.conn + - '@config' + - '@dbal.conn' # ----- Cron tasks ----- cron.task_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: cron.task } cron.task.core.prune_all_forums: class: phpbb\cron\task\core\prune_all_forums arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @dbal.conn + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + - '@dbal.conn' calls: - [set_name, [cron.task.core.prune_all_forums]] tags: @@ -36,10 +36,10 @@ services: cron.task.core.prune_forum: class: phpbb\cron\task\core\prune_forum arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @dbal.conn + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + - '@dbal.conn' calls: - [set_name, [cron.task.core.prune_forum]] tags: @@ -48,12 +48,12 @@ services: cron.task.core.prune_shadow_topics: class: phpbb\cron\task\core\prune_shadow_topics arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @dbal.conn - - @log - - @user + - '%core.root_path%' + - '%core.php_ext%' + - '@config' + - '@dbal.conn' + - '@log' + - '@user' calls: - [set_name, [cron.task.core.prune_shadow_topics]] tags: @@ -62,8 +62,8 @@ services: cron.task.core.prune_notifications: class: phpbb\cron\task\core\prune_notifications arguments: - - @config - - @notification_manager + - '@config' + - '@notification_manager' calls: - [set_name, [cron.task.core.prune_notifications]] tags: @@ -72,9 +72,9 @@ services: cron.task.core.queue: class: phpbb\cron\task\core\queue arguments: - - %core.root_path% - - %core.php_ext% - - @config + - '%core.root_path%' + - '%core.php_ext%' + - '@config' calls: - [set_name, [cron.task.core.queue]] tags: @@ -83,8 +83,8 @@ services: cron.task.core.tidy_cache: class: phpbb\cron\task\core\tidy_cache arguments: - - @config - - @cache.driver + - '@config' + - '@cache.driver' calls: - [set_name, [cron.task.core.tidy_cache]] tags: @@ -93,9 +93,9 @@ services: cron.task.core.tidy_database: class: phpbb\cron\task\core\tidy_database arguments: - - %core.root_path% - - %core.php_ext% - - @config + - '%core.root_path%' + - '%core.php_ext%' + - '@config' calls: - [set_name, [cron.task.core.tidy_database]] tags: @@ -104,8 +104,8 @@ services: cron.task.core.tidy_plupload: class: phpbb\cron\task\core\tidy_plupload arguments: - - %core.root_path% - - @config + - '%core.root_path%' + - '@config' calls: - [set_name, [cron.task.core.tidy_plupload]] tags: @@ -114,13 +114,13 @@ services: cron.task.core.tidy_search: class: phpbb\cron\task\core\tidy_search arguments: - - %core.root_path% - - %core.php_ext% - - @auth - - @config - - @dbal.conn - - @user - - @dispatcher + - '%core.root_path%' + - '%core.php_ext%' + - '@auth' + - '@config' + - '@dbal.conn' + - '@user' + - '@dispatcher' calls: - [set_name, [cron.task.core.tidy_search]] tags: @@ -129,8 +129,8 @@ services: cron.task.core.tidy_sessions: class: phpbb\cron\task\core\tidy_sessions arguments: - - @config - - @user + - '@config' + - '@user' calls: - [set_name, [cron.task.core.tidy_sessions]] tags: @@ -139,9 +139,9 @@ services: cron.task.core.tidy_warnings: class: phpbb\cron\task\core\tidy_warnings arguments: - - %core.root_path% - - %core.php_ext% - - @config + - '%core.root_path%' + - '%core.php_ext%' + - '@config' calls: - [set_name, [cron.task.core.tidy_warnings]] tags: @@ -150,11 +150,11 @@ services: cron.task.text_reparser.pm_text: class: phpbb\cron\task\text_reparser\reparser arguments: - - @config - - @config_text - - @text_reparser.lock - - @text_reparser.manager - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' calls: - [set_name, [cron.task.text_reparser.pm_text]] - [set_reparser, [text_reparser.pm_text]] @@ -164,11 +164,11 @@ services: cron.task.text_reparser.poll_option: class: phpbb\cron\task\text_reparser\reparser arguments: - - @config - - @config_text - - @text_reparser.lock - - @text_reparser.manager - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' calls: - [set_name, [cron.task.text_reparser.poll_option]] - [set_reparser, [text_reparser.poll_option]] @@ -178,11 +178,11 @@ services: cron.task.text_reparser.poll_title: class: phpbb\cron\task\text_reparser\reparser arguments: - - @config - - @config_text - - @text_reparser.lock - - @text_reparser.manager - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' calls: - [set_name, [cron.task.text_reparser.poll_title]] - [set_reparser, [text_reparser.poll_title]] @@ -192,11 +192,11 @@ services: cron.task.text_reparser.post_text: class: phpbb\cron\task\text_reparser\reparser arguments: - - @config - - @config_text - - @text_reparser.lock - - @text_reparser.manager - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' calls: - [set_name, [cron.task.text_reparser.post_text]] - [set_reparser, [text_reparser.post_text]] @@ -206,11 +206,11 @@ services: cron.task.text_reparser.user_signature: class: phpbb\cron\task\text_reparser\reparser arguments: - - @config - - @config_text - - @text_reparser.lock - - @text_reparser.manager - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser.lock' + - '@text_reparser.manager' + - '@text_reparser_collection' calls: - [set_name, [cron.task.text_reparser.user_signature]] - [set_reparser, [text_reparser.user_signature]] diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml index ed3f88c704..20b3426e7e 100644 --- a/phpBB/config/default/container/services_db.yml +++ b/phpBB/config/default/container/services_db.yml @@ -2,12 +2,12 @@ services: dbal.conn: class: phpbb\db\driver\factory arguments: - - @service_container + - '@service_container' dbal.conn.driver: - class: %dbal.driver.class% + class: '%dbal.driver.class%' calls: - - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] + - [sql_connect, ['%dbal.dbhost%', '%dbal.dbuser%', '%dbal.dbpasswd%', '%dbal.dbname%', '%dbal.dbport%', false, '%dbal.new_link%']] # ----- DB Tools ----- dbal.tools.factory: @@ -15,20 +15,20 @@ services: dbal.tools: class: phpbb\db\tools\tools_interface - factory: ["@dbal.tools.factory", get] + factory: ['@dbal.tools.factory', get] arguments: - - @dbal.conn.driver + - '@dbal.conn.driver' # ----- DB Extractor ----- dbal.extractor.factory: class: phpbb\db\extractor\factory arguments: - - @dbal.conn.driver - - @service_container + - '@dbal.conn.driver' + - '@service_container' dbal.extractor: class: phpbb\db\extractor\extractor_interface - factory: ["@dbal.extractor.factory", get] + factory: ['@dbal.extractor.factory', get] # ----- DB Extractors for different drivers ----- # Scope MUST be prototype for all the handlers to work correctly. @@ -36,46 +36,46 @@ services: class: phpbb\db\extractor\mssql_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' dbal.extractor.extractors.mysql_extractor: class: phpbb\db\extractor\mysql_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' dbal.extractor.extractors.oracle_extractor: class: phpbb\db\extractor\oracle_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' dbal.extractor.extractors.postgres_extractor: class: phpbb\db\extractor\postgres_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' dbal.extractor.extractors.sqlite3_extractor: class: phpbb\db\extractor\sqlite3_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' dbal.extractor.extractors.sqlite_extractor: class: phpbb\db\extractor\sqlite_extractor scope: prototype arguments: - - %core.root_path% - - @request - - @dbal.conn.driver + - '%core.root_path%' + - '@request' + - '@dbal.conn.driver' diff --git a/phpBB/config/default/container/services_event.yml b/phpBB/config/default/container/services_event.yml index 4a35add776..8a55b933ac 100644 --- a/phpBB/config/default/container/services_event.yml +++ b/phpBB/config/default/container/services_event.yml @@ -2,13 +2,13 @@ services: dispatcher: class: phpbb\event\dispatcher arguments: - - @service_container + - '@service_container' kernel_exception_subscriber: class: phpbb\event\kernel_exception_subscriber arguments: - - @template - - @language + - '@template' + - '@language' tags: - { name: kernel.event_subscriber } diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml index 2133b3c489..443016160b 100644 --- a/phpBB/config/default/container/services_feed.yml +++ b/phpBB/config/default/container/services_feed.yml @@ -2,112 +2,112 @@ services: phpbb.feed.controller: class: phpbb\feed\controller\feed arguments: - - @template.twig.environment - - @symfony_request - - @controller.helper - - @config - - @dbal.conn - - @service_container - - @feed.helper - - @user - - @auth - - %core.php_ext% + - '@template.twig.environment' + - '@symfony_request' + - '@controller.helper' + - '@config' + - '@dbal.conn' + - '@service_container' + - '@feed.helper' + - '@user' + - '@auth' + - '%core.php_ext%' feed.helper: class: phpbb\feed\helper arguments: - - @config - - @user - - %core.root_path% - - %core.php_ext% + - '@config' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' feed.forum: class: phpbb\feed\forum scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.forums: class: phpbb\feed\forums scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.news: class: phpbb\feed\news scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.overall: class: phpbb\feed\overall scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.topic: class: phpbb\feed\topic scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.topics: class: phpbb\feed\topics scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' feed.topics_active: class: phpbb\feed\topics_active scope: prototype arguments: - - @feed.helper - - @config - - @dbal.conn - - @cache.driver - - @user - - @auth - - @content.visibility - - %core.php_ext% + - '@feed.helper' + - '@config' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@auth' + - '@content.visibility' + - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 2624ae5e06..39277bcd9d 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -2,55 +2,55 @@ services: files.factory: class: phpbb\files\factory arguments: - - @service_container + - '@service_container' files.filespec: class: phpbb\files\filespec scope: prototype arguments: - - @filesystem - - @language - - @php_ini - - @upload_imagesize - - %core.root_path% - - @mimetype.guesser - - @plupload + - '@filesystem' + - '@language' + - '@php_ini' + - '@upload_imagesize' + - '%core.root_path%' + - '@mimetype.guesser' + - '@plupload' files.upload: class: phpbb\files\upload scope: prototype arguments: - - @filesystem - - @files.factory - - @language - - @php_ini - - @request + - '@filesystem' + - '@files.factory' + - '@language' + - '@php_ini' + - '@request' files.types.form: class: phpbb\files\types\form scope: prototype arguments: - - @files.factory - - @language - - @php_ini - - @plupload - - @request + - '@files.factory' + - '@language' + - '@php_ini' + - '@plupload' + - '@request' files.types.local: class: phpbb\files\types\form scope: prototype arguments: - - @files.factory - - @language - - @php_ini - - @request + - '@files.factory' + - '@language' + - '@php_ini' + - '@request' files.types.remote: class: phpbb\files\types\remote scope: prototype arguments: - - @files.factory - - @language - - @php_ini - - @request - - %core.root_path% + - '@files.factory' + - '@language' + - '@php_ini' + - '@request' + - '%core.root_path%' diff --git a/phpBB/config/default/container/services_help.yml b/phpBB/config/default/container/services_help.yml index 8b9d497945..1bff001523 100644 --- a/phpBB/config/default/container/services_help.yml +++ b/phpBB/config/default/container/services_help.yml @@ -2,26 +2,26 @@ services: phpbb.help.manager: class: phpbb\help\manager arguments: - - @dispatcher - - @language - - @template + - '@dispatcher' + - '@language' + - '@template' phpbb.help.controller.bbcode: class: phpbb\help\controller\bbcode arguments: - - @controller.helper - - @phpbb.help.manager - - @template - - @language - - %core.root_path% - - %core.php_ext% + - '@controller.helper' + - '@phpbb.help.manager' + - '@template' + - '@language' + - '%core.root_path%' + - '%core.php_ext%' phpbb.help.controller.faq: class: phpbb\help\controller\faq arguments: - - @controller.helper - - @phpbb.help.manager - - @template - - @language - - %core.root_path% - - %core.php_ext% + - '@controller.helper' + - '@phpbb.help.manager' + - '@template' + - '@language' + - '%core.root_path%' + - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_hook.yml b/phpBB/config/default/container/services_hook.yml index 9d0d355cff..10a84184a0 100644 --- a/phpBB/config/default/container/services_hook.yml +++ b/phpBB/config/default/container/services_hook.yml @@ -2,6 +2,6 @@ services: hook_finder: class: phpbb\hook\finder arguments: - - %core.root_path% - - %core.php_ext% - - @cache.driver + - '%core.root_path%' + - '%core.php_ext%' + - '@cache.driver' diff --git a/phpBB/config/default/container/services_http.yml b/phpBB/config/default/container/services_http.yml index 1285fd1d88..49cfbf5b84 100644 --- a/phpBB/config/default/container/services_http.yml +++ b/phpBB/config/default/container/services_http.yml @@ -2,16 +2,16 @@ services: http_kernel: class: Symfony\Component\HttpKernel\HttpKernel arguments: - - @dispatcher - - @controller.resolver - - @request_stack + - '@dispatcher' + - '@controller.resolver' + - '@request_stack' # WARNING: The Symfony request does not escape the input and should be used very carefully # prefer the phpbb request (service @request) as possible symfony_request: class: phpbb\symfony_request arguments: - - @request + - '@request' request_stack: class: Symfony\Component\HttpFoundation\RequestStack @@ -20,4 +20,4 @@ services: class: phpbb\request\request arguments: - null - - %core.disable_super_globals% + - '%core.disable_super_globals%' diff --git a/phpBB/config/default/container/services_language.yml b/phpBB/config/default/container/services_language.yml index aa3631ded1..8201fbf9b6 100644 --- a/phpBB/config/default/container/services_language.yml +++ b/phpBB/config/default/container/services_language.yml @@ -2,21 +2,21 @@ services: language.helper.language_file: class: phpbb\language\language_file_helper arguments: - - %core.root_path% + - '%core.root_path%' language: class: phpbb\language\language arguments: - - @language.loader + - '@language.loader' language.loader_abstract: abstract: true class: phpbb\language\language_file_loader arguments: - - %core.root_path% - - %core.php_ext% + - '%core.root_path%' + - '%core.php_ext%' language.loader: parent: language.loader_abstract calls: - - [set_extension_manager, ["@ext.manager"]] + - [set_extension_manager, ['@ext.manager']] diff --git a/phpBB/config/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml index 01bd7d3a11..c63b087adb 100644 --- a/phpBB/config/default/container/services_migrator.yml +++ b/phpBB/config/default/container/services_migrator.yml @@ -3,16 +3,16 @@ services: migrator: class: phpbb\db\migrator arguments: - - @service_container - - @config - - @dbal.conn - - @dbal.tools - - %tables.migrations% - - %core.root_path% - - %core.php_ext% - - %core.table_prefix% - - @migrator.tool_collection - - @migrator.helper + - '@service_container' + - '@config' + - '@dbal.conn' + - '@dbal.tools' + - '%tables.migrations%' + - '%core.root_path%' + - '%core.php_ext%' + - '%core.table_prefix%' + - '@migrator.tool_collection' + - '@migrator.helper' migrator.helper: class: phpbb\db\migration\helper @@ -21,44 +21,44 @@ services: migrator.tool_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: migrator.tool } migrator.tool.config: class: phpbb\db\migration\tool\config arguments: - - @config + - '@config' tags: - { name: migrator.tool } migrator.tool.config_text: class: phpbb\db\migration\tool\config_text arguments: - - @config_text + - '@config_text' tags: - { name: migrator.tool } migrator.tool.module: class: phpbb\db\migration\tool\module arguments: - - @dbal.conn - - @cache - - @user - - @module.manager - - %core.root_path% - - %core.php_ext% - - %tables.modules% + - '@dbal.conn' + - '@cache' + - '@user' + - '@module.manager' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.modules%' tags: - { name: migrator.tool } migrator.tool.permission: class: phpbb\db\migration\tool\permission arguments: - - @dbal.conn - - @cache - - @auth - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@cache' + - '@auth' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: migrator.tool } diff --git a/phpBB/config/default/container/services_mimetype_guesser.yml b/phpBB/config/default/container/services_mimetype_guesser.yml index 2e89ed3c1f..432470d40c 100644 --- a/phpBB/config/default/container/services_mimetype_guesser.yml +++ b/phpBB/config/default/container/services_mimetype_guesser.yml @@ -2,7 +2,7 @@ services: mimetype.guesser_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: mimetype.guessers } @@ -19,18 +19,18 @@ services: mimetype.content_guesser: class: phpbb\mimetype\content_guesser calls: - - [set_priority, [%mimetype.guesser.priority.low%]] + - [set_priority, ['%mimetype.guesser.priority.low%']] tags: - { name: mimetype.guessers } mimetype.extension_guesser: class: phpbb\mimetype\extension_guesser calls: - - [set_priority, [%mimetype.guesser.priority.lowest%]] + - [set_priority, ['%mimetype.guesser.priority.lowest%']] tags: - { name: mimetype.guessers } mimetype.guesser: class: phpbb\mimetype\guesser arguments: - - @mimetype.guesser_collection + - '@mimetype.guesser_collection' diff --git a/phpBB/config/default/container/services_module.yml b/phpBB/config/default/container/services_module.yml index 513b71553a..a057e55239 100644 --- a/phpBB/config/default/container/services_module.yml +++ b/phpBB/config/default/container/services_module.yml @@ -2,9 +2,9 @@ services: module.manager: class: phpbb\module\module_manager arguments: - - @cache.driver - - @dbal.conn - - @ext.manager - - %tables.modules% - - %core.root_path% - - %core.php_ext% + - '@cache.driver' + - '@dbal.conn' + - '@ext.manager' + - '%tables.modules%' + - '%core.root_path%' + - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index 7337dd7904..0cf64f7f24 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -2,45 +2,45 @@ services: notification_manager: class: phpbb\notification\manager arguments: - - @notification.type_collection - - @notification.method_collection - - @service_container - - @user_loader - - @dispatcher - - @dbal.conn - - @cache - - @language - - @user - - %tables.notification_types% - - %tables.user_notifications% + - '@notification.type_collection' + - '@notification.method_collection' + - '@service_container' + - '@user_loader' + - '@dispatcher' + - '@dbal.conn' + - '@cache' + - '@language' + - '@user' + - '%tables.notification_types%' + - '%tables.user_notifications%' # ----- Notification's types ----- # Scope MUST be prototype for all the plugins to work. notification.type_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: notification.type } notification.type.base: abstract: true arguments: - - @dbal.conn - - @language - - @user - - @auth - - %core.root_path% - - %core.php_ext% - - %tables.user_notifications% + - '@dbal.conn' + - '@language' + - '@user' + - '@auth' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.user_notifications%' notification.type.admin_activate_user: class: phpbb\notification\type\admin_activate_user scope: prototype parent: notification.type.base calls: - - [set_user_loader, [@user_loader]] - - [set_config, [@config]] + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] tags: - { name: notification.type } @@ -84,7 +84,7 @@ services: scope: prototype parent: notification.type.base calls: - - [set_user_loader, [@user_loader]] + - [set_user_loader, ['@user_loader']] tags: - { name: notification.type } @@ -100,8 +100,8 @@ services: scope: prototype parent: notification.type.base calls: - - [set_user_loader, [@user_loader]] - - [set_config, [@config]] + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] tags: - { name: notification.type } @@ -110,8 +110,8 @@ services: scope: prototype parent: notification.type.base calls: - - [set_user_loader, [@user_loader]] - - [set_config, [@config]] + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] tags: - { name: notification.type } @@ -127,7 +127,7 @@ services: scope: prototype parent: notification.type.post calls: - - [set_utils, [@text_formatter.utils]] + - [set_utils, ['@text_formatter.utils']] tags: - { name: notification.type } @@ -164,8 +164,8 @@ services: scope: prototype parent: notification.type.base calls: - - [set_user_loader, [@user_loader]] - - [set_config, [@config]] + - [set_user_loader, ['@user_loader']] + - [set_config, ['@config']] tags: - { name: notification.type } @@ -181,7 +181,7 @@ services: notification.method_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: notification.method } @@ -189,13 +189,13 @@ services: class: phpbb\notification\method\board scope: prototype # scope MUST be prototype for this to work! arguments: - - @user_loader - - @dbal.conn - - @cache.driver - - @user - - @config - - %tables.notification_types% - - %tables.notifications% + - '@user_loader' + - '@dbal.conn' + - '@cache.driver' + - '@user' + - '@config' + - '%tables.notification_types%' + - '%tables.notifications%' tags: - { name: notification.method } @@ -203,11 +203,11 @@ services: class: phpbb\notification\method\email scope: prototype arguments: - - @user_loader - - @user - - @config - - %core.root_path% - - %core.php_ext% + - '@user_loader' + - '@user' + - '@config' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: notification.method } @@ -215,10 +215,10 @@ services: class: phpbb\notification\method\jabber scope: prototype arguments: - - @user_loader - - @user - - @config - - %core.root_path% - - %core.php_ext% + - '@user_loader' + - '@user' + - '@config' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: notification.method } diff --git a/phpBB/config/default/container/services_password.yml b/phpBB/config/default/container/services_password.yml index cb45ec3d42..82850dc2a7 100644 --- a/phpBB/config/default/container/services_password.yml +++ b/phpBB/config/default/container/services_password.yml @@ -3,10 +3,10 @@ services: passwords.manager: class: phpbb\passwords\manager arguments: - - @config - - @passwords.driver_collection - - @passwords.helper - - %passwords.algorithms% + - '@config' + - '@passwords.driver_collection' + - '@passwords.helper' + - '%passwords.algorithms%' passwords.helper: class: phpbb\passwords\helper @@ -14,111 +14,111 @@ services: passwords.driver_helper: class: phpbb\passwords\driver\helper arguments: - - @config + - '@config' # ----- Password's drivers ----- passwords.driver_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: passwords.driver } passwords.driver.bcrypt: class: phpbb\passwords\driver\bcrypt arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.bcrypt_2y: class: phpbb\passwords\driver\bcrypt_2y arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.bcrypt_wcf2: class: phpbb\passwords\driver\bcrypt_wcf2 arguments: - - @passwords.driver.bcrypt - - @passwords.driver_helper + - '@passwords.driver.bcrypt' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.salted_md5: class: phpbb\passwords\driver\salted_md5 arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.phpass: class: phpbb\passwords\driver\phpass arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.convert_password: class: phpbb\passwords\driver\convert_password arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.sha1_smf: class: phpbb\passwords\driver\sha1_smf arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.sha1_wcf1: class: phpbb\passwords\driver\sha1_wcf1 arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.sha1: class: phpbb\passwords\driver\sha1 arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.md5_phpbb2: class: phpbb\passwords\driver\md5_phpbb2 arguments: - - @request - - @passwords.driver.salted_md5 - - @passwords.driver_helper - - %core.root_path% - - %core.php_ext% + - '@request' + - '@passwords.driver.salted_md5' + - '@passwords.driver_helper' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: passwords.driver } passwords.driver.md5_mybb: class: phpbb\passwords\driver\md5_mybb arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } passwords.driver.md5_vb: class: phpbb\passwords\driver\md5_vb arguments: - - @config - - @passwords.driver_helper + - '@config' + - '@passwords.driver_helper' tags: - { name: passwords.driver } diff --git a/phpBB/config/default/container/services_profilefield.yml b/phpBB/config/default/container/services_profilefield.yml index 5ccfef9148..90b22836e5 100644 --- a/phpBB/config/default/container/services_profilefield.yml +++ b/phpBB/config/default/container/services_profilefield.yml @@ -2,101 +2,101 @@ services: profilefields.manager: class: phpbb\profilefields\manager arguments: - - @auth - - @dbal.conn - - @dispatcher - - @request - - @template - - @profilefields.type_collection - - @user - - %tables.profile_fields% - - %tables.profile_fields_language% - - %tables.profile_fields_data% + - '@auth' + - '@dbal.conn' + - '@dispatcher' + - '@request' + - '@template' + - '@profilefields.type_collection' + - '@user' + - '%tables.profile_fields%' + - '%tables.profile_fields_language%' + - '%tables.profile_fields_data%' profilefields.lang_helper: class: phpbb\profilefields\lang_helper arguments: - - @dbal.conn - - %tables.profile_fields_options_language% + - '@dbal.conn' + - '%tables.profile_fields_options_language%' # ----- Profile fields types ----- profilefields.type_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: profilefield.type } profilefields.type.bool: class: phpbb\profilefields\type\type_bool arguments: - - @profilefields.lang_helper - - @request - - @template - - @user + - '@profilefields.lang_helper' + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.date: class: phpbb\profilefields\type\type_date arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.dropdown: class: phpbb\profilefields\type\type_dropdown arguments: - - @profilefields.lang_helper - - @request - - @template - - @user + - '@profilefields.lang_helper' + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.googleplus: class: phpbb\profilefields\type\type_googleplus arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.int: class: phpbb\profilefields\type\type_int arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.string: class: phpbb\profilefields\type\type_string arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.text: class: phpbb\profilefields\type\type_text arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } profilefields.type.url: class: phpbb\profilefields\type\type_url arguments: - - @request - - @template - - @user + - '@request' + - '@template' + - '@user' tags: - { name: profilefield.type } diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml index 4bf929429e..eaaf6ae4c4 100644 --- a/phpBB/config/default/container/services_report.yml +++ b/phpBB/config/default/container/services_report.yml @@ -3,30 +3,30 @@ services: phpbb.report.controller: class: phpbb\report\controller\report arguments: - - @config - - @user - - @template - - @controller.helper - - @request - - @captcha.factory - - @phpbb.report.handler_factory - - @phpbb.report.report_reason_list_provider - - %core.root_path% - - %core.php_ext% + - '@config' + - '@user' + - '@template' + - '@controller.helper' + - '@request' + - '@captcha.factory' + - '@phpbb.report.handler_factory' + - '@phpbb.report.report_reason_list_provider' + - '%core.root_path%' + - '%core.php_ext%' # ----- Report handler factory ----- phpbb.report.handler_factory: class: phpbb\report\handler_factory arguments: - - @service_container + - '@service_container' # ----- Report UI provider ----- phpbb.report.report_reason_list_provider: class: phpbb\report\report_reason_list_provider arguments: - - @dbal.conn.driver - - @template - - @user + - '@dbal.conn.driver' + - '@template' + - '@user' # ----- Report handlers ----- # Scope MUST be prototype for all the handlers to work correctly. @@ -34,20 +34,20 @@ services: class: phpbb\report\report_handler_pm scope: prototype arguments: - - @dbal.conn.driver - - @dispatcher - - @config - - @auth - - @user - - @notification_manager + - '@dbal.conn.driver' + - '@dispatcher' + - '@config' + - '@auth' + - '@user' + - '@notification_manager' phpbb.report.handlers.report_handler_post: class: phpbb\report\report_handler_post scope: prototype arguments: - - @dbal.conn.driver - - @dispatcher - - @config - - @auth - - @user - - @notification_manager + - '@dbal.conn.driver' + - '@dispatcher' + - '@config' + - '@auth' + - '@user' + - '@notification_manager' diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml index 4bedc951ee..3cb74ca2b1 100644 --- a/phpBB/config/default/container/services_routing.yml +++ b/phpBB/config/default/container/services_routing.yml @@ -2,57 +2,57 @@ services: router: class: phpbb\routing\router arguments: - - @service_container - - @routing.chained_resources_locator - - @routing.delegated_loader - - %core.root_path% - - %core.php_ext% - - %core.environment% + - '@service_container' + - '@routing.chained_resources_locator' + - '@routing.delegated_loader' + - '%core.root_path%' + - '%core.php_ext%' + - '%core.environment%' router.listener: class: Symfony\Component\HttpKernel\EventListener\RouterListener arguments: - - @router + - '@router' - null - null - - @request_stack + - '@request_stack' tags: - { name: kernel.event_subscriber } routing.helper: class: phpbb\routing\helper arguments: - - @config - - @router - - @symfony_request - - @request - - @filesystem - - %core.root_path% - - %core.php_ext% + - '@config' + - '@router' + - '@symfony_request' + - '@request' + - '@filesystem' + - '%core.root_path%' + - '%core.php_ext%' # ---- Route loaders ---- routing.delegated_loader: class: Symfony\Component\Config\Loader\DelegatingLoader arguments: - - @routing.resolver + - '@routing.resolver' routing.resolver: class: phpbb\routing\loader_resolver arguments: - - @routing.loader.collection + - '@routing.loader.collection' routing.loader.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: routing.loader } routing.loader.yaml: class: Symfony\Component\Routing\Loader\YamlFileLoader arguments: - - @file_locator + - '@file_locator' tags: - { name: routing.loader } @@ -61,20 +61,20 @@ services: routing.chained_resources_locator: class: phpbb\routing\resources_locator\chained_resources_locator arguments: - - @routing.resources_locator.collection + - '@routing.resources_locator.collection' routing.resources_locator.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: routing.resources_locator } routing.resources_locator.default: class: phpbb\routing\resources_locator\default_resources_locator arguments: - - %core.root_path% - - %core.environment% - - @ext.manager + - '%core.root_path%' + - '%core.environment%' + - '@ext.manager' tags: - { name: routing.resources_locator } diff --git a/phpBB/config/default/container/services_text_formatter.yml b/phpBB/config/default/container/services_text_formatter.yml index 5a3307175f..f86d30658e 100644 --- a/phpBB/config/default/container/services_text_formatter.yml +++ b/phpBB/config/default/container/services_text_formatter.yml @@ -1,5 +1,5 @@ parameters: - text_formatter.cache.dir: %core.root_path%cache/%core.environment%/ + text_formatter.cache.dir: '%core.root_path%cache/%core.environment%/' text_formatter.cache.parser.key: _text_formatter_parser text_formatter.cache.renderer.key: _text_formatter_renderer @@ -10,12 +10,12 @@ services: text_formatter.data_access: class: phpbb\textformatter\data_access arguments: - - @dbal.conn - - %tables.bbcodes% - - %tables.smilies% - - %tables.styles% - - %tables.words% - - %core.root_path%styles/ + - '@dbal.conn' + - '%tables.bbcodes%' + - '%tables.smilies%' + - '%tables.styles%' + - '%tables.words%' + - '%core.root_path%styles/' text_formatter.parser: alias: text_formatter.s9e.parser @@ -29,41 +29,41 @@ services: text_formatter.s9e.factory: class: phpbb\textformatter\s9e\factory arguments: - - @text_formatter.data_access - - @cache.driver - - @dispatcher - - @config - - %text_formatter.cache.dir% - - %text_formatter.cache.parser.key% - - %text_formatter.cache.renderer.key% + - '@text_formatter.data_access' + - '@cache.driver' + - '@dispatcher' + - '@config' + - '%text_formatter.cache.dir%' + - '%text_formatter.cache.parser.key%' + - '%text_formatter.cache.renderer.key%' text_formatter.s9e.parser: class: phpbb\textformatter\s9e\parser arguments: - - @cache.driver - - %text_formatter.cache.parser.key% - - @text_formatter.s9e.factory - - @dispatcher + - '@cache.driver' + - '%text_formatter.cache.parser.key%' + - '@text_formatter.s9e.factory' + - '@dispatcher' text_formatter.s9e.quote_helper: class: phpbb\textformatter\s9e\quote_helper arguments: - - @user - - %core.root_path% - - %core.php_ext% + - '@user' + - '%core.root_path%' + - '%core.php_ext%' text_formatter.s9e.renderer: class: phpbb\textformatter\s9e\renderer arguments: - - @cache.driver - - %text_formatter.cache.dir% - - %text_formatter.cache.renderer.key% - - @text_formatter.s9e.factory - - @dispatcher + - '@cache.driver' + - '%text_formatter.cache.dir%' + - '%text_formatter.cache.renderer.key%' + - '@text_formatter.s9e.factory' + - '@dispatcher' calls: - - [configure_quote_helper, [@text_formatter.s9e.quote_helper]] - - [configure_smilies_path, [@config, @path_helper]] - - [configure_user, [@user, @config, @auth]] + - [configure_quote_helper, ['@text_formatter.s9e.quote_helper']] + - [configure_smilies_path, ['@config', '@path_helper']] + - [configure_user, ['@user', '@config', '@auth']] text_formatter.s9e.utils: class: phpbb\textformatter\s9e\utils diff --git a/phpBB/config/default/container/services_text_reparser.yml b/phpBB/config/default/container/services_text_reparser.yml index 3c3707e7cf..6b0353cf5b 100644 --- a/phpBB/config/default/container/services_text_reparser.yml +++ b/phpBB/config/default/container/services_text_reparser.yml @@ -2,90 +2,90 @@ services: text_reparser.manager: class: phpbb\textreparser\manager arguments: - - @config - - @config_text - - @text_reparser_collection + - '@config' + - '@config_text' + - '@text_reparser_collection' text_reparser.lock: class: phpbb\lock\db arguments: - reparse_lock - - @config - - @dbal.conn + - '@config' + - '@dbal.conn' text_reparser_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: text_reparser.plugin } text_reparser.contact_admin_info: class: phpbb\textreparser\plugins\contact_admin_info arguments: - - @config_text + - '@config_text' tags: - { name: text_reparser.plugin } text_reparser.forum_description: class: phpbb\textreparser\plugins\forum_description arguments: - - @dbal.conn - - %tables.forums% + - '@dbal.conn' + - '%tables.forums%' tags: - { name: text_reparser.plugin } text_reparser.forum_rules: class: phpbb\textreparser\plugins\forum_rules arguments: - - @dbal.conn - - %tables.forums% + - '@dbal.conn' + - '%tables.forums%' tags: - { name: text_reparser.plugin } text_reparser.group_description: class: phpbb\textreparser\plugins\group_description arguments: - - @dbal.conn - - %tables.groups% + - '@dbal.conn' + - '%tables.groups%' tags: - { name: text_reparser.plugin } text_reparser.pm_text: class: phpbb\textreparser\plugins\pm_text arguments: - - @dbal.conn - - %tables.privmsgs% + - '@dbal.conn' + - '%tables.privmsgs%' tags: - { name: text_reparser.plugin } text_reparser.poll_option: class: phpbb\textreparser\plugins\poll_option arguments: - - @dbal.conn + - '@dbal.conn' tags: - { name: text_reparser.plugin } text_reparser.poll_title: class: phpbb\textreparser\plugins\poll_title arguments: - - @dbal.conn - - %tables.topics% + - '@dbal.conn' + - '%tables.topics%' tags: - { name: text_reparser.plugin } text_reparser.post_text: class: phpbb\textreparser\plugins\post_text arguments: - - @dbal.conn - - %tables.posts% + - '@dbal.conn' + - '%tables.posts%' tags: - { name: text_reparser.plugin } text_reparser.user_signature: class: phpbb\textreparser\plugins\user_signature arguments: - - @dbal.conn - - %tables.users% + - '@dbal.conn' + - '%tables.users%' tags: - { name: text_reparser.plugin } diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index 4132be49fa..2dbf444e0c 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/phpBB/config/default/container/services_twig.yml @@ -1,48 +1,48 @@ parameters: - core.template.cache_path: %core.root_path%cache/%core.environment%/twig/ + core.template.cache_path: '%core.root_path%cache/%core.environment%/twig/' services: template.twig.environment: class: phpbb\template\twig\environment arguments: - - @config - - @filesystem - - @path_helper - - @service_container - - %core.template.cache_path% - - @ext.manager - - @template.twig.loader + - '@config' + - '@filesystem' + - '@path_helper' + - '@service_container' + - '%core.template.cache_path%' + - '@ext.manager' + - '@template.twig.loader' - [] template.twig.lexer: class: phpbb\template\twig\lexer arguments: - - @template.twig.environment + - '@template.twig.environment' template.twig.loader: class: phpbb\template\twig\loader arguments: - - @filesystem + - '@filesystem' template.twig.extensions.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: twig.extension } template.twig.extensions.phpbb: class: phpbb\template\twig\extension arguments: - - @template_context - - @language + - '@template_context' + - '@language' tags: - { name: twig.extension } template.twig.extensions.routing: class: phpbb\template\twig\extension\routing arguments: - - @routing.helper + - '@routing.helper' tags: - { name: twig.extension } @@ -52,14 +52,14 @@ services: template: class: phpbb\template\twig\twig arguments: - - @path_helper - - @config - - @template_context - - @template.twig.environment - - %core.template.cache_path% - - @user - - @template.twig.extensions.collection - - @ext.manager + - '@path_helper' + - '@config' + - '@template_context' + - '@template.twig.environment' + - '%core.template.cache_path%' + - '@user' + - '@template.twig.extensions.collection' + - '@ext.manager' template_context: class: phpbb\template\context diff --git a/phpBB/config/default/container/services_user.yml b/phpBB/config/default/container/services_user.yml index ff114f022a..7e634c60c3 100644 --- a/phpBB/config/default/container/services_user.yml +++ b/phpBB/config/default/container/services_user.yml @@ -2,19 +2,19 @@ services: acl.permissions: class: phpbb\permissions arguments: - - @dispatcher - - @user + - '@dispatcher' + - '@user' user: class: phpbb\user arguments: - - @language - - %datetime.class% + - '@language' + - '%datetime.class%' user_loader: class: phpbb\user_loader arguments: - - @dbal.conn - - %core.root_path% - - %core.php_ext% - - %tables.users% + - '@dbal.conn' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.users%' diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml index ec3bf95d1f..18d0203f21 100644 --- a/phpBB/config/default/container/tables.yml +++ b/phpBB/config/default/container/tables.yml @@ -1,77 +1,77 @@ parameters: - tables.acl_groups: %core.table_prefix%acl_groups - tables.acl_options: %core.table_prefix%acl_options - tables.acl_roles: %core.table_prefix%acl_roles - tables.acl_roles_data: %core.table_prefix%acl_roles_data - tables.acl_users: %core.table_prefix%acl_users - tables.attachments: %core.table_prefix%attachments - tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens - tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts - tables.banlist: %core.table_prefix%banlist - tables.bbcodes: %core.table_prefix%bbcodes - tables.bookmarks: %core.table_prefix%bookmarks - tables.bots: %core.table_prefix%bots - tables.captcha_qa_questions: %core.table_prefix%captcha_questions - tables.captcha_qa_answers: %core.table_prefix%captcha_answers - tables.captcha_qa_confirm: %core.table_prefix%qa_confirm - tables.config: %core.table_prefix%config - tables.config_text: %core.table_prefix%config_text - tables.confirm: %core.table_prefix%confirm - tables.disallow: %core.table_prefix%disallow - tables.drafts: %core.table_prefix%drafts - tables.ext: %core.table_prefix%ext - tables.extensions: %core.table_prefix%extensions - tables.extension_groups: %core.table_prefix%extension_groups - tables.forums: %core.table_prefix%forums - tables.forums_access: %core.table_prefix%forums_access - tables.forums_track: %core.table_prefix%forums_track - tables.forums_watch: %core.table_prefix%forums_watch - tables.groups: %core.table_prefix%groups - tables.icons: %core.table_prefix%icons - tables.lang: %core.table_prefix%lang - tables.log: %core.table_prefix%log - tables.login_attempts: %core.table_prefix%login_attempts - tables.migrations: %core.table_prefix%migrations - tables.moderator_cache: %core.table_prefix%moderator_cache - tables.modules: %core.table_prefix%modules - tables.notification_types: %core.table_prefix%notification_types - tables.notifications: %core.table_prefix%notifications - tables.poll_options: %core.table_prefix%poll_options - tables.poll_votes: %core.table_prefix%poll_votes - tables.posts: %core.table_prefix%posts - tables.privmsgs: %core.table_prefix%privmsgs - tables.privmsgs_folder: %core.table_prefix%privmsgs_folder - tables.privmsgs_rules: %core.table_prefix%privmsgs_rules - tables.privmsgs_to: %core.table_prefix%privmsgs_to - tables.profile_fields: %core.table_prefix%profile_fields - tables.profile_fields_data: %core.table_prefix%profile_fields_data - tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang - tables.profile_fields_language: %core.table_prefix%profile_lang - tables.ranks: %core.table_prefix%ranks - tables.reports: %core.table_prefix%reports - tables.reports_reasons: %core.table_prefix%reports_reasons - tables.search_results: %core.table_prefix%search_results - tables.search_wordlist: %core.table_prefix%search_wordlist - tables.search_wordmatch: %core.table_prefix%search_wordmatch - tables.sessions: %core.table_prefix%sessions - tables.sessions_keys: %core.table_prefix%sessions_keys - tables.sitelist: %core.table_prefix%sitelist - tables.smilies: %core.table_prefix%smilies - tables.sphinx: %core.table_prefix%sphinx - tables.styles: %core.table_prefix%styles - tables.styles_template: %core.table_prefix%styles_template - tables.styles_template_data: %core.table_prefix%styles_template_data - tables.styles_theme: %core.table_prefix%styles_theme - tables.styles_imageset: %core.table_prefix%styles_imageset - tables.styles_imageset_data: %core.table_prefix%styles_imageset_data - tables.teampage: %core.table_prefix%teampage - tables.topics: %core.table_prefix%topics - tables.topics_posted: %core.table_prefix%topics_posted - tables.topics_track: %core.table_prefix%topics_track - tables.topics_watch: %core.table_prefix%topics_watch - tables.user_group: %core.table_prefix%user_group - tables.user_notifications: %core.table_prefix%user_notifications - tables.users: %core.table_prefix%users - tables.warnings: %core.table_prefix%warnings - tables.words: %core.table_prefix%words - tables.zebra: %core.table_prefix%zebra + tables.acl_groups: '%core.table_prefix%acl_groups' + tables.acl_options: '%core.table_prefix%acl_options' + tables.acl_roles: '%core.table_prefix%acl_roles' + tables.acl_roles_data: '%core.table_prefix%acl_roles_data' + tables.acl_users: '%core.table_prefix%acl_users' + tables.attachments: '%core.table_prefix%attachments' + tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens' + tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts' + tables.banlist: '%core.table_prefix%banlist' + tables.bbcodes: '%core.table_prefix%bbcodes' + tables.bookmarks: '%core.table_prefix%bookmarks' + tables.bots: '%core.table_prefix%bots' + tables.captcha_qa_questions: '%core.table_prefix%captcha_questions' + tables.captcha_qa_answers: '%core.table_prefix%captcha_answers' + tables.captcha_qa_confirm: '%core.table_prefix%qa_confirm' + tables.config: '%core.table_prefix%config' + tables.config_text: '%core.table_prefix%config_text' + tables.confirm: '%core.table_prefix%confirm' + tables.disallow: '%core.table_prefix%disallow' + tables.drafts: '%core.table_prefix%drafts' + tables.ext: '%core.table_prefix%ext' + tables.extensions: '%core.table_prefix%extensions' + tables.extension_groups: '%core.table_prefix%extension_groups' + tables.forums: '%core.table_prefix%forums' + tables.forums_access: '%core.table_prefix%forums_access' + tables.forums_track: '%core.table_prefix%forums_track' + tables.forums_watch: '%core.table_prefix%forums_watch' + tables.groups: '%core.table_prefix%groups' + tables.icons: '%core.table_prefix%icons' + tables.lang: '%core.table_prefix%lang' + tables.log: '%core.table_prefix%log' + tables.login_attempts: '%core.table_prefix%login_attempts' + tables.migrations: '%core.table_prefix%migrations' + tables.moderator_cache: '%core.table_prefix%moderator_cache' + tables.modules: '%core.table_prefix%modules' + tables.notification_types: '%core.table_prefix%notification_types' + tables.notifications: '%core.table_prefix%notifications' + tables.poll_options: '%core.table_prefix%poll_options' + tables.poll_votes: '%core.table_prefix%poll_votes' + tables.posts: '%core.table_prefix%posts' + tables.privmsgs: '%core.table_prefix%privmsgs' + tables.privmsgs_folder: '%core.table_prefix%privmsgs_folder' + tables.privmsgs_rules: '%core.table_prefix%privmsgs_rules' + tables.privmsgs_to: '%core.table_prefix%privmsgs_to' + tables.profile_fields: '%core.table_prefix%profile_fields' + tables.profile_fields_data: '%core.table_prefix%profile_fields_data' + tables.profile_fields_options_language: '%core.table_prefix%profile_fields_lang' + tables.profile_fields_language: '%core.table_prefix%profile_lang' + tables.ranks: '%core.table_prefix%ranks' + tables.reports: '%core.table_prefix%reports' + tables.reports_reasons: '%core.table_prefix%reports_reasons' + tables.search_results: '%core.table_prefix%search_results' + tables.search_wordlist: '%core.table_prefix%search_wordlist' + tables.search_wordmatch: '%core.table_prefix%search_wordmatch' + tables.sessions: '%core.table_prefix%sessions' + tables.sessions_keys: '%core.table_prefix%sessions_keys' + tables.sitelist: '%core.table_prefix%sitelist' + tables.smilies: '%core.table_prefix%smilies' + tables.sphinx: '%core.table_prefix%sphinx' + tables.styles: '%core.table_prefix%styles' + tables.styles_template: '%core.table_prefix%styles_template' + tables.styles_template_data: '%core.table_prefix%styles_template_data' + tables.styles_theme: '%core.table_prefix%styles_theme' + tables.styles_imageset: '%core.table_prefix%styles_imageset' + tables.styles_imageset_data: '%core.table_prefix%styles_imageset_data' + tables.teampage: '%core.table_prefix%teampage' + tables.topics: '%core.table_prefix%topics' + tables.topics_posted: '%core.table_prefix%topics_posted' + tables.topics_track: '%core.table_prefix%topics_track' + tables.topics_watch: '%core.table_prefix%topics_watch' + tables.user_group: '%core.table_prefix%user_group' + tables.user_notifications: '%core.table_prefix%user_notifications' + tables.users: '%core.table_prefix%users' + tables.warnings: '%core.table_prefix%warnings' + tables.words: '%core.table_prefix%words' + tables.zebra: '%core.table_prefix%zebra' diff --git a/phpBB/config/default/routing/report.yml b/phpBB/config/default/routing/report.yml index dbe2d853c0..c386770e42 100644 --- a/phpBB/config/default/routing/report.yml +++ b/phpBB/config/default/routing/report.yml @@ -3,7 +3,7 @@ phpbb_report_pm_controller: methods: [GET, POST] defaults: _controller: phpbb.report.controller:handle - mode: "pm" + mode: 'pm' requirements: id: \d+ @@ -12,6 +12,6 @@ phpbb_report_post_controller: methods: [GET, POST] defaults: _controller: phpbb.report.controller:handle - mode: "post" + mode: 'post' requirements: id: \d+ diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 073984841a..f381f024ad 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -5,11 +5,11 @@ # defaults: { _controller: foo_sevice:method } # # The above will be accessed via app.php?controller=foo and it will -# instantiate the "foo_service" service and call the "method" method. +# instantiate the 'foo_service' service and call the 'method' method. # phpbb_feed_routing: - resource: "feed.yml" + resource: feed.yml prefix: /feed phpbb_feed_index: @@ -17,8 +17,8 @@ phpbb_feed_index: defaults: { _controller: phpbb.feed.controller:overall } phpbb_help_routing: - resource: "help.yml" + resource: help.yml prefix: /help phpbb_report_routing: - resource: "report.yml" + resource: report.yml diff --git a/phpBB/config/development/routing/environment.yml b/phpBB/config/development/routing/environment.yml index 0cddfb7521..301183bbae 100644 --- a/phpBB/config/development/routing/environment.yml +++ b/phpBB/config/development/routing/environment.yml @@ -1,2 +1,2 @@ core.default: - resource: "../../default/routing/routing.yml" + resource: ../../default/routing/routing.yml diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index 401451cfc0..16782dec10 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -10,9 +10,9 @@ imports: services: cache.driver: - class: %cache.driver.class% + class: '%cache.driver.class%' arguments: - - "%core.root_path%/cache/installer/" + - '%core.root_path%/cache/installer/' config: class: phpbb\config\config @@ -22,22 +22,22 @@ services: controller.resolver: class: phpbb\controller\resolver arguments: - - @service_container - - %core.root_path% - - @template + - '@service_container' + - '%core.root_path%' + - '@template' file_locator: class: phpbb\routing\file_locator arguments: - - @filesystem - - %core.root_path% + - '@filesystem' + - '%core.root_path%' kernel_exception_subscriber: class: phpbb\install\event\kernel_exception_subscriber arguments: - - @phpbb.installer.controller.helper - - @language - - @template + - '@phpbb.installer.controller.helper' + - '@language' + - '@template' tags: - { name: kernel.event_subscriber } @@ -47,48 +47,48 @@ services: path_helper: class: phpbb\path_helper arguments: - - @symfony_request - - @filesystem - - @request - - %core.root_path% - - %core.php_ext% + - '@symfony_request' + - '@filesystem' + - '@request' + - '%core.root_path%' + - '%core.php_ext%' routing.resources_locator.default: class: phpbb\routing\resources_locator\installer_resources_locator arguments: - - @filesystem - - %core.root_path% - - %core.environment% + - '@filesystem' + - '%core.root_path%' + - '%core.environment%' tags: - { name: routing.resources_locator } template: class: phpbb\template\twig\twig arguments: - - @path_helper - - @config - - @template_context - - @template.twig.environment - - %core.template.cache_path% + - '@path_helper' + - '@config' + - '@template_context' + - '@template.twig.environment' + - '%core.template.cache_path%' - null - - @template.twig.extensions.collection + - '@template.twig.extensions.collection' template.twig.environment: class: phpbb\template\twig\environment arguments: - - @config - - @filesystem - - @path_helper - - @service_container - - %core.template.cache_path% + - '@config' + - '@filesystem' + - '@path_helper' + - '@service_container' + - '%core.template.cache_path%' - null - - @template.twig.loader + - '@template.twig.loader' - [] console.exception_subscriber: class: phpbb\console\exception_subscriber arguments: - - @language - - %debug.exceptions% + - '@language' + - '%debug.exceptions%' tags: - { name: kernel.event_subscriber } diff --git a/phpBB/config/installer/container/services_file_updater.yml b/phpBB/config/installer/container/services_file_updater.yml index 10e52acd16..9d39bb8b89 100644 --- a/phpBB/config/installer/container/services_file_updater.yml +++ b/phpBB/config/installer/container/services_file_updater.yml @@ -2,37 +2,37 @@ services: installer.file_updater.factory: class: phpbb\install\helper\file_updater\factory arguments: - - @installer.file_updater.collection + - '@installer.file_updater.collection' installer.file_updater.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: file_updater } installer.file_updater.compress: class: phpbb\install\helper\file_updater\compression_file_updater arguments: - - @installer.helper.update_helper - - %core.root_path% - - %core.php_ext% + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: file_updater } installer.file_updater.ftp: class: phpbb\install\helper\file_updater\ftp_file_updater arguments: - - @installer.helper.update_helper - - %core.root_path% - - %core.php_ext% + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: file_updater } installer.file_updater.file: class: phpbb\install\helper\file_updater\file_updater arguments: - - @filesystem - - %core.root_path% + - '@filesystem' + - '%core.root_path%' tags: - { name: file_updater } diff --git a/phpBB/config/installer/container/services_install_console.yml b/phpBB/config/installer/container/services_install_console.yml index 1c1b819e82..73c804d9ff 100644 --- a/phpBB/config/installer/container/services_install_console.yml +++ b/phpBB/config/installer/container/services_install_console.yml @@ -2,26 +2,26 @@ services: console.installer.command_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: console.installer.command } console.installer.command.install: class: phpbb\install\console\command\install\install arguments: - - @language - - @installer.helper.iohandler_factory - - @installer.installer.install - - @installer.helper.install_helper + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' + - '@installer.helper.install_helper' tags: - { name: console.installer.command } console.installer.command.config.show: class: phpbb\install\console\command\install\config\show arguments: - - @language - - @installer.helper.iohandler_factory - - @installer.installer.install + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' tags: - { name: console.installer.command } @@ -29,8 +29,8 @@ services: console.installer.command.config.validate: class: phpbb\install\console\command\install\config\validate arguments: - - @language - - @installer.helper.iohandler_factory - - @installer.installer.install + - '@language' + - '@installer.helper.iohandler_factory' + - '@installer.installer.install' tags: - { name: console.installer.command } diff --git a/phpBB/config/installer/container/services_install_controller.yml b/phpBB/config/installer/container/services_install_controller.yml index 221a73f2c3..5be28c5746 100644 --- a/phpBB/config/installer/container/services_install_controller.yml +++ b/phpBB/config/installer/container/services_install_controller.yml @@ -2,50 +2,50 @@ services: phpbb.installer.controller.welcome: class: phpbb\install\controller\installer_index arguments: - - @phpbb.installer.controller.helper - - @language - - @template - - %core.root_path% + - '@phpbb.installer.controller.helper' + - '@language' + - '@template' + - '%core.root_path%' phpbb.installer.controller.helper: class: phpbb\install\controller\helper arguments: - - @installer.helper.config - - @language - - @language.helper.language_file - - @installer.navigation.provider - - @template - - @path_helper - - @request - - @symfony_request - - @router - - %core.root_path% + - '@installer.helper.config' + - '@language' + - '@language.helper.language_file' + - '@installer.navigation.provider' + - '@template' + - '@path_helper' + - '@request' + - '@symfony_request' + - '@router' + - '%core.root_path%' phpbb.installer.controller.install: class: phpbb\install\controller\install arguments: - - @phpbb.installer.controller.helper - - @installer.helper.iohandler_factory - - @installer.navigation.provider - - @language - - @template - - @request - - @installer.installer.install - - @installer.helper.install_helper + - '@phpbb.installer.controller.helper' + - '@installer.helper.iohandler_factory' + - '@installer.navigation.provider' + - '@language' + - '@template' + - '@request' + - '@installer.installer.install' + - '@installer.helper.install_helper' phpbb.installer.controller.update: class: phpbb\install\controller\update arguments: - - @phpbb.installer.controller.helper - - @installer.installer.update - - @installer.helper.install_helper - - @installer.helper.iohandler_factory - - @language - - @installer.navigation.provider - - @request - - @template + - '@phpbb.installer.controller.helper' + - '@installer.installer.update' + - '@installer.helper.install_helper' + - '@installer.helper.iohandler_factory' + - '@language' + - '@installer.navigation.provider' + - '@request' + - '@template' phpbb.installer.controller.file_downloader: class: phpbb\install\controller\archive_download arguments: - - @installer.helper.config + - '@installer.helper.config' diff --git a/phpBB/config/installer/container/services_install_data.yml b/phpBB/config/installer/container/services_install_data.yml index ea5b5a2c52..d119ba6ebb 100644 --- a/phpBB/config/installer/container/services_install_data.yml +++ b/phpBB/config/installer/container/services_install_data.yml @@ -2,36 +2,36 @@ services: installer.install_data.add_bots: class: phpbb\install\module\install_data\task\add_bots arguments: - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.container_factory - - @language - - %core.root_path% - - %core.php_ext% + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: install_data_install, order: 20 } installer.install_data.add_languages: class: phpbb\install\module\install_data\task\add_languages arguments: - - @installer.helper.iohandler - - @installer.helper.container_factory - - @language.helper.language_file + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language.helper.language_file' tags: - { name: install_data_install, order: 10 } installer.install_data.add_modules: class: phpbb\install\module\install_data\task\add_modules arguments: - - @installer.helper.iohandler - - @installer.helper.container_factory + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' tags: - { name: install_data_install, order: 30 } installer.module.data_install_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: install_data_install, class_name_aware: true } @@ -39,6 +39,6 @@ services: class: phpbb\install\module\install_data\module parent: installer.module_base arguments: - - @installer.module.data_install_collection + - '@installer.module.data_install_collection' tags: - { name: installer_install_module, order: 50 } diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml index 743d62bae5..8324cd6086 100644 --- a/phpBB/config/installer/container/services_install_database.yml +++ b/phpBB/config/installer/container/services_install_database.yml @@ -2,43 +2,43 @@ services: installer.install_database.create_schema: class: phpbb\install\module\install_database\task\create_schema arguments: - - @installer.helper.config - - @installer.helper.database - - @filesystem - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% + - '@installer.helper.config' + - '@installer.helper.database' + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: install_database_install, order: 10 } installer.install_database.add_default_data: class: phpbb\install\module\install_database\task\add_default_data arguments: - - @installer.helper.database - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.container_factory - - @language - - %core.root_path% + - '@installer.helper.database' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' tags: - { name: install_database_install, order: 20 } installer.install_database.add_config_settings: class: phpbb\install\module\install_database\task\add_config_settings arguments: - - @filesystem - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.container_factory - - @language - - %core.root_path% + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language' + - '%core.root_path%' tags: - { name: install_database_install, order: 30 } installer.module.install_database_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: install_database_install, class_name_aware: true } @@ -46,6 +46,6 @@ services: class: phpbb\install\module\install_database\module parent: installer.module_base arguments: - - @installer.module.install_database_collection + - '@installer.module.install_database_collection' tags: - { name: installer_install_module, order: 40 } diff --git a/phpBB/config/installer/container/services_install_filesystem.yml b/phpBB/config/installer/container/services_install_filesystem.yml index 0d52f07b5c..65b2a6eddd 100644 --- a/phpBB/config/installer/container/services_install_filesystem.yml +++ b/phpBB/config/installer/container/services_install_filesystem.yml @@ -2,20 +2,20 @@ services: installer.install_filesystem.create_config_file: class: phpbb\install\module\install_filesystem\task\create_config_file arguments: - - @filesystem - - @installer.helper.config - - @installer.helper.database - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% - - %installer.create_config_file.options% + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.database' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' + - '%installer.create_config_file.options%' tags: - { name: install_filesystem_install, order: 10 } installer.module.install_filesystem_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: install_filesystem_install, class_name_aware: true } @@ -23,6 +23,6 @@ services: class: phpbb\install\module\install_filesystem\module parent: installer.module_base arguments: - - @installer.module.install_filesystem_collection + - '@installer.module.install_filesystem_collection' tags: - { name: installer_install_module, order: 30 } diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index 1dd280306a..854b129b69 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -2,25 +2,25 @@ services: installer.install_finish.populate_migrations: class: phpbb\install\module\install_finish\task\populate_migrations arguments: - - @installer.helper.container_factory + - '@installer.helper.container_factory' tags: - { name: install_finish, order: 10 } installer.install_finish.notify_user: class: phpbb\install\module\install_finish\task\notify_user arguments: - - @installer.helper.container_factory - - @installer.helper.config - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: install_finish, order: 20 } installer.module.install_finish_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: install_finish, class_name_aware: true } @@ -28,6 +28,6 @@ services: class: phpbb\install\module\install_filesystem\module parent: installer.module_base arguments: - - @installer.module.install_finish_collection + - '@installer.module.install_finish_collection' tags: - { name: installer_install_module, order: 60 } diff --git a/phpBB/config/installer/container/services_install_navigation.yml b/phpBB/config/installer/container/services_install_navigation.yml index 4e39e07043..301d6f3434 100644 --- a/phpBB/config/installer/container/services_install_navigation.yml +++ b/phpBB/config/installer/container/services_install_navigation.yml @@ -2,12 +2,12 @@ services: installer.navigation.provider: class: phpbb\install\helper\navigation\navigation_provider arguments: - - @installer.navigation.service_collection + - '@installer.navigation.service_collection' installer.navigation.service_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: installer.navigation } @@ -20,7 +20,7 @@ services: installer.navigation.install_navigation: class: phpbb\install\helper\navigation\install_navigation arguments: - - @installer.helper.install_helper + - '@installer.helper.install_helper' scope: prototype tags: - { name: installer.navigation } @@ -28,7 +28,7 @@ services: installer.navigation.update_navigation: class: phpbb\install\helper\navigation\update_navigation arguments: - - @installer.helper.install_helper + - '@installer.helper.install_helper' scope: prototype tags: - { name: installer.navigation } diff --git a/phpBB/config/installer/container/services_install_obtain_data.yml b/phpBB/config/installer/container/services_install_obtain_data.yml index dce261b8c7..cd8d0c8072 100644 --- a/phpBB/config/installer/container/services_install_obtain_data.yml +++ b/phpBB/config/installer/container/services_install_obtain_data.yml @@ -2,56 +2,56 @@ services: installer.obtain_data.obtain_admin_data: class: phpbb\install\module\obtain_data\task\obtain_admin_data arguments: - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: install_obtain_data, order: 10 } installer.obtain_data.obtain_board_data: class: phpbb\install\module\obtain_data\task\obtain_board_data arguments: - - @installer.helper.config - - @installer.helper.iohandler - - @language.helper.language_file + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@language.helper.language_file' tags: - { name: install_obtain_data, order: 50 } installer.obtain_data.obtain_database_data: class: phpbb\install\module\obtain_data\task\obtain_database_data arguments: - - @installer.helper.database - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.database' + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: install_obtain_data, order: 20 } installer.obtain_data.obtain_email_data: class: phpbb\install\module\obtain_data\task\obtain_email_data arguments: - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: install_obtain_data, order: 40 } installer.obtain_data.obtain_imagick_path: class: phpbb\install\module\obtain_data\task\obtain_imagick_path arguments: - - @installer.helper.config + - '@installer.helper.config' tags: - { name: install_obtain_data, order: 60 } installer.obtain_data.obtain_server_data: class: phpbb\install\module\obtain_data\task\obtain_server_data arguments: - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: install_obtain_data, order: 30 } installer.module.install_obtain_data_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: install_obtain_data, class_name_aware: true } @@ -59,7 +59,7 @@ services: class: phpbb\install\module\obtain_data\install_module parent: installer.module_base arguments: - - @installer.module.install_obtain_data_collection + - '@installer.module.install_obtain_data_collection' - true - false tags: diff --git a/phpBB/config/installer/container/services_install_requirements.yml b/phpBB/config/installer/container/services_install_requirements.yml index 47910e7200..c03eb1fb93 100644 --- a/phpBB/config/installer/container/services_install_requirements.yml +++ b/phpBB/config/installer/container/services_install_requirements.yml @@ -2,18 +2,18 @@ services: installer.requirements.check_filesystem: class: phpbb\install\module\requirements\task\check_filesystem arguments: - - @filesystem - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: installer_requirements, order: 10 } installer.requirements.check_server_environment: class: phpbb\install\module\requirements\task\check_server_environment arguments: - - @installer.helper.database - - @installer.helper.iohandler + - '@installer.helper.database' + - '@installer.helper.iohandler' tags: - { name: installer_requirements, order: 20 } - { name: update_requirements, order: 20 } @@ -21,7 +21,7 @@ services: installer.module.install_requirements_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: installer_requirements, class_name_aware: true } @@ -30,7 +30,7 @@ services: class: phpbb\install\module\requirements\install_module parent: installer.module_base arguments: - - @installer.module.install_requirements_collection + - '@installer.module.install_requirements_collection' - true - false tags: diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml index c2c730e62c..bf9d28ec65 100644 --- a/phpBB/config/installer/container/services_installer.yml +++ b/phpBB/config/installer/container/services_installer.yml @@ -19,34 +19,34 @@ services: installer.helper.config: class: phpbb\install\helper\config arguments: - - @filesystem - - @php_ini - - %core.root_path% + - '@filesystem' + - '@php_ini' + - '%core.root_path%' installer.helper.database: class: phpbb\install\helper\database arguments: - - @filesystem - - %core.root_path% + - '@filesystem' + - '%core.root_path%' installer.helper.iohandler_factory: class: phpbb\install\helper\iohandler\factory arguments: - - @service_container + - '@service_container' installer.helper.iohandler_abstract: abstract: true calls: - - [set_language, ["@language"]] + - [set_language, ['@language']] installer.helper.iohandler_ajax: class: phpbb\install\helper\iohandler\ajax_iohandler parent: installer.helper.iohandler_abstract arguments: - - @path_helper - - @request - - @template - - @router + - '@path_helper' + - '@request' + - '@template' + - '@router' installer.helper.iohandler_cli: class: phpbb\install\helper\iohandler\cli_iohandler @@ -54,62 +54,62 @@ services: installer.helper.iohandler: class: phpbb\install\helper\iohandler\iohandler_interface - factory: ["@installer.helper.iohandler_factory", get] + factory: ['@installer.helper.iohandler_factory', get] installer.helper.container_factory: class: phpbb\install\helper\container_factory arguments: - - @language - - @request - - @installer.helper.update_helper - - %core.root_path% - - %core.php_ext% + - '@language' + - '@request' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' installer.helper.install_helper: class: phpbb\install\helper\install_helper arguments: - - %core.root_path% - - %core.php_ext% + - '%core.root_path%' + - '%core.php_ext%' installer.helper.update_helper: class: phpbb\install\helper\update_helper arguments: - - %core.root_path% + - '%core.root_path%' # -------- Installer -------------------------------- installer.module_base: abstract: true calls: - - [setup, [@installer.helper.config, @installer.helper.iohandler]] + - [setup, ['@installer.helper.config', '@installer.helper.iohandler']] installer.installer.abstract: class: phpbb\install\installer abstract: true arguments: - - @cache.driver - - @installer.helper.config - - @path_helper + - '@cache.driver' + - '@installer.helper.config' + - '@path_helper' installer.install.module_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: installer_install_module } installer.update.module_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: installer_update_module } installer.installer.install: parent: installer.installer.abstract calls: - - [set_modules, [@installer.install.module_collection]] + - [set_modules, ['@installer.install.module_collection']] installer.installer.update: parent: installer.installer.abstract calls: - - [set_modules, [@installer.update.module_collection]] + - [set_modules, ['@installer.update.module_collection']] diff --git a/phpBB/config/installer/container/services_update_database.yml b/phpBB/config/installer/container/services_update_database.yml index 85f943f928..9cb9cb9abf 100644 --- a/phpBB/config/installer/container/services_update_database.yml +++ b/phpBB/config/installer/container/services_update_database.yml @@ -2,19 +2,19 @@ services: installer.update_database.update_task: class: phpbb\install\module\update_database\task\update arguments: - - @installer.helper.container_factory - - @filesystem - - @installer.helper.config - - @installer.helper.iohandler - - @language - - %core.root_path% + - '@installer.helper.container_factory' + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@language' + - '%core.root_path%' tags: - { name: update_database_task, order: 10 } installer.module.update_database_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: update_database_task, class_name_aware: true } @@ -22,7 +22,7 @@ services: class: phpbb\install\module\update_database\module parent: installer.module_base arguments: - - @installer.module.update_database_collection + - '@installer.module.update_database_collection' - true - false tags: diff --git a/phpBB/config/installer/container/services_update_filesystem.yml b/phpBB/config/installer/container/services_update_filesystem.yml index 2882df4294..c0a04676f6 100644 --- a/phpBB/config/installer/container/services_update_filesystem.yml +++ b/phpBB/config/installer/container/services_update_filesystem.yml @@ -2,62 +2,62 @@ services: installer.update_filesystem.check_task: class: phpbb\install\module\update_filesystem\task\file_check arguments: - - @filesystem - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.update_helper - - %core.root_path% + - '@filesystem' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' tags: - { name: update_filesystem, order: 10 } installer.update_filesystem.diff_files: class: phpbb\install\module\update_filesystem\task\diff_files arguments: - - @installer.helper.container_factory - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.update_helper - - %core.root_path% - - %core.php_ext% + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: update_filesystem, order: 20 } installer.update_filesystem.show_file_status: class: phpbb\install\module\update_filesystem\task\show_file_status arguments: - - @installer.helper.container_factory - - @installer.helper.config - - @installer.helper.iohandler - - @filesystem - - @installer.file_updater.factory + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@filesystem' + - '@installer.file_updater.factory' tags: - { name: update_filesystem, order: 30 } installer.update_filesystem.update_files: class: phpbb\install\module\update_filesystem\task\update_files arguments: - - @installer.helper.container_factory - - @installer.helper.config - - @installer.helper.iohandler - - @installer.file_updater.factory - - @installer.helper.update_helper - - %core.root_path% + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.file_updater.factory' + - '@installer.helper.update_helper' + - '%core.root_path%' tags: - { name: update_filesystem, order: 40 } installer.update_filesystem.download_updated_files: class: phpbb\install\module\update_filesystem\task\download_updated_files arguments: - - @installer.helper.config - - @installer.helper.iohandler - - @filesystem + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@filesystem' tags: - { name: update_filesystem, order: 50 } installer.module.update_filesystem_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: update_filesystem, class_name_aware: true } @@ -65,7 +65,7 @@ services: class: phpbb\install\module\update_filesystem\module parent: installer.module_base arguments: - - @installer.module.update_filesystem_collection + - '@installer.module.update_filesystem_collection' - true - false tags: diff --git a/phpBB/config/installer/container/services_update_obtain_data.yml b/phpBB/config/installer/container/services_update_obtain_data.yml index fe0d3bc43f..999976aed0 100644 --- a/phpBB/config/installer/container/services_update_obtain_data.yml +++ b/phpBB/config/installer/container/services_update_obtain_data.yml @@ -2,43 +2,43 @@ services: installer.obtain_data.update_options: class: phpbb\install\module\obtain_data\task\obtain_update_settings arguments: - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: update_obtain_data, order: 10 } installer.obtain_data.file_updater_method: class: phpbb\install\module\obtain_data\task\obtain_file_updater_method arguments: - - @installer.helper.config - - @installer.helper.iohandler + - '@installer.helper.config' + - '@installer.helper.iohandler' tags: - { name: update_obtain_data, order: 20 } installer.obtain_data.update_files: class: phpbb\install\module\obtain_data\task\obtain_update_files arguments: - - @installer.helper.config - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: update_obtain_data, order: 30 } installer.obtain_data.update_ftp_settings: class: phpbb\install\module\obtain_data\task\obtain_update_ftp_data arguments: - - @installer.helper.config - - @installer.helper.iohandler - - @installer.helper.update_helper - - %core.php_ext% + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.php_ext%' tags: - { name: update_obtain_data, order: 40 } installer.module.update_obtain_data_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: update_obtain_data, class_name_aware: true } @@ -46,7 +46,7 @@ services: class: phpbb\install\module\obtain_data\update_module parent: installer.module_base arguments: - - @installer.module.update_obtain_data_collection + - '@installer.module.update_obtain_data_collection' - true - false tags: diff --git a/phpBB/config/installer/container/services_update_requirements.yml b/phpBB/config/installer/container/services_update_requirements.yml index ebb1bea409..c5272ef549 100644 --- a/phpBB/config/installer/container/services_update_requirements.yml +++ b/phpBB/config/installer/container/services_update_requirements.yml @@ -2,10 +2,10 @@ services: installer.requirements.check_filesystem_update: class: phpbb\install\module\requirements\task\check_filesystem arguments: - - @filesystem - - @installer.helper.iohandler - - %core.root_path% - - %core.php_ext% + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + - '%core.php_ext%' - false tags: - { name: update_requirements, order: 10 } @@ -13,19 +13,19 @@ services: installer.requirements.update_requirements: class: phpbb\install\module\requirements\task\check_update arguments: - - @installer.helper.container_factory - - @filesystem - - @installer.helper.iohandler - - @installer.helper.update_helper - - %core.root_path% - - %core.php_ext% + - '@installer.helper.container_factory' + - '@filesystem' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: update_requirements, order: 30 } installer.module.update_requirements_collection: class: phpbb\di\ordered_service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: update_requirements, class_name_aware: true } @@ -33,7 +33,7 @@ services: class: phpbb\install\module\requirements\update_module parent: installer.module_base arguments: - - @installer.module.update_requirements_collection + - '@installer.module.update_requirements_collection' - true - false tags: diff --git a/phpBB/config/installer/routing/environment.yml b/phpBB/config/installer/routing/environment.yml index 60324c975b..7a1f588fa1 100644 --- a/phpBB/config/installer/routing/environment.yml +++ b/phpBB/config/installer/routing/environment.yml @@ -1,2 +1,2 @@ core.default: - resource: "installer.yml" + resource: installer.yml diff --git a/phpBB/config/installer/routing/installer.yml b/phpBB/config/installer/routing/installer.yml index 49e103dd7d..6190799737 100644 --- a/phpBB/config/installer/routing/installer.yml +++ b/phpBB/config/installer/routing/installer.yml @@ -2,19 +2,19 @@ phpbb_installer_index: path: / defaults: _controller: phpbb.installer.controller.welcome:handle - mode: "intro" + mode: 'intro' phpbb_installer_license: path: /license defaults: _controller: phpbb.installer.controller.welcome:handle - mode: "license" + mode: 'license' phpbb_installer_support: path: /support defaults: _controller: phpbb.installer.controller.welcome:handle - mode: "support" + mode: 'support' phpbb_installer_install: path: /install diff --git a/phpBB/config/production/routing/environment.yml b/phpBB/config/production/routing/environment.yml index 0cddfb7521..301183bbae 100644 --- a/phpBB/config/production/routing/environment.yml +++ b/phpBB/config/production/routing/environment.yml @@ -1,2 +1,2 @@ core.default: - resource: "../../default/routing/routing.yml" + resource: ../../default/routing/routing.yml diff --git a/phpBB/config/test/routing/environment.yml b/phpBB/config/test/routing/environment.yml index 0cddfb7521..301183bbae 100644 --- a/phpBB/config/test/routing/environment.yml +++ b/phpBB/config/test/routing/environment.yml @@ -1,2 +1,2 @@ core.default: - resource: "../../default/routing/routing.yml" + resource: ../../default/routing/routing.yml diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index f6bfd6a52f..09bc4c4085 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -38,6 +38,7 @@ define('IN_PHPBB', true); $phpbb_root_path = dirname(__FILE__) . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); +include($phpbb_root_path . 'vendor/autoload.php'); include($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx); diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 85828d91f8..4311ebfe63 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,7 +49,9 @@ <ol> <li><a href="#changelog">Changelog</a> <ul> + <li><a href="#v320a1">Changes since 3.2.0-a1</a></li> <li><a href="#v31x">Changes since 3.1.x</a></li> + <li><a href="#v316">Changes since 3.1.6</a></li> <li><a href="#v315">Changes since 3.1.5</a></li> <li><a href="#v314">Changes since 3.1.4</a></li> <li><a href="#v313">Changes since 3.1.3</a></li> @@ -114,6 +116,41 @@ <div class="content"> + <a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3><h4>Bug</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9791">PHPBB3-9791</a>] - invalid [] - chars on search URI</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13451">PHPBB3-13451</a>] - A very long string inside message crashes PHP</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14273">PHPBB3-14273</a>] - Unnecessary core.root_path dependency in files.upload service</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14293">PHPBB3-14293</a>] - Responsive .postbody width not expanding</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14295">PHPBB3-14295</a>] - Icon on left side of "Post awaiting approval" inside messages is missing</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14311">PHPBB3-14311</a>] - Installer error messages not being reported back to client properly</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14317">PHPBB3-14317</a>] - Run lang_migrate_help_lang script on master</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14320">PHPBB3-14320</a>] - Language selector is broken in the installer</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14325">PHPBB3-14325</a>] - Renamed Event Variables Backwards Incompatible</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14326">PHPBB3-14326</a>] - Diffed files are not decoded at update</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14339">PHPBB3-14339</a>] - State support for PHP 7.0 in docs</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14344">PHPBB3-14344</a>] - Improve formatting of errors during install</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14345">PHPBB3-14345</a>] - Check if message description exists in install cli iohandler</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14349">PHPBB3-14349</a>] - Improve error messages and remove output of suppressed messages</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14350">PHPBB3-14350</a>] - Remove duplicate semi-colon from functions_user</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14358">PHPBB3-14358</a>] - Fatal error when running create_schema_files.php (missing composer autoloader)</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14359">PHPBB3-14359</a>] - Wrong service definition for console.command.reparser.reparse</li> + </ul> + <h4>Improvement</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12649">PHPBB3-12649</a>] - Change sort & display options in footers to dropdown menu</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14257">PHPBB3-14257</a>] - Reparse after update</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14269">PHPBB3-14269</a>] - Use http_exceptions instead of die() in installer controllers</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14310">PHPBB3-14310</a>] - Progress bar in new installer not very clear</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14340">PHPBB3-14340</a>] - Revert the workaround fix for segmentation fault error on phpBB 3.2 PHP 7 tests</li> + </ul> + <h4>Task</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14247">PHPBB3-14247</a>] - Usage of @ at begining of an unquoted string in a yaml file is deprecated</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14341">PHPBB3-14341</a>] - Update to Symfony 2.8</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14348">PHPBB3-14348</a>] - Add an index.html to the install folder</li> + </ul> + <a name="v31x"></a><h3>Changes since 3.1.x</h3> <h4>Bug</h4> <ul> @@ -351,6 +388,112 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li> </ul> + <a name="v316"></a><h3>Changes since 3.1.6</h3> + + <h4>Bug</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8839">PHPBB3-8839</a>] - Wrong new status of subforumlink on index</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8920">PHPBB3-8920</a>] - PM-Report for every moderator</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9153">PHPBB3-9153</a>] - New member can delete pm just in one way</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9252">PHPBB3-9252</a>] - Conflict when (dis)approving a post by two moderators at the same time</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11468">PHPBB3-11468</a>] - Controllers can not set additional parameters of page_header()</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11971">PHPBB3-11971</a>] - Validating not correctly in Spambot countermeasures</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12616">PHPBB3-12616</a>] - Report notification is not removed when post is disapproved or deleted</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13202">PHPBB3-13202</a>] - dead code in sessions.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13423">PHPBB3-13423</a>] - Driver sqlite3 failed periodically</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13636">PHPBB3-13636</a>] - Unexpect return to previous page behaviour</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13656">PHPBB3-13656</a>] - database_upgrade.php fails when database password contains a % character</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13748">PHPBB3-13748</a>] - Wrong tooltip after poll vote change</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13759">PHPBB3-13759</a>] - submit_post doesn't take $data['post_time'] - into account</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13799">PHPBB3-13799</a>] - Avatar gallery subfolders paths are handled incorrectly</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13831">PHPBB3-13831</a>] - Post deletion reason is not appearing on moderation logs</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13835">PHPBB3-13835</a>] - File upload of large files where filename contains umlauts fails</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13846">PHPBB3-13846</a>] - Permissions around soft deleting are inconsistently handled</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13851">PHPBB3-13851</a>] - "Can ignore flood limit" permission not taking effect</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13892">PHPBB3-13892</a>] - "Someone reports a post" notification setting has no effect</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13945">PHPBB3-13945</a>] - Account re-activation does not create a notification</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13950">PHPBB3-13950</a>] - If disabled extension - no hidden permission set</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13960">PHPBB3-13960</a>] - Profile field validation may break</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13976">PHPBB3-13976</a>] - Fix comment typo in salted_md5 driver</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13988">PHPBB3-13988</a>] - Atom feeds use relative links for image attachments</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13992">PHPBB3-13992</a>] - Fix html5 error from output on w3.org its new validator</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14058">PHPBB3-14058</a>] - subsilver2 Contact us form doesn't have an email subject field</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14070">PHPBB3-14070</a>] - Disabled avatar types is still displayed on the forum</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14106">PHPBB3-14106</a>] - Sorting is unworkable while moderating forum (merge topics)</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14114">PHPBB3-14114</a>] - Inconsistency in install.html in 3.1.x Automatic uopdate package</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14127">PHPBB3-14127</a>] - Error in the BBCode FAQ in 'Linking to another site'</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14142">PHPBB3-14142</a>] - Remove unused ignore_configs from avatar drivers</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14143">PHPBB3-14143</a>] - Flush the in-memory mail queue when writing it to the disk</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14153">PHPBB3-14153</a>] - Notifications dropdown header doesn't clear floats</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14159">PHPBB3-14159</a>] - Not accessible link on main ACP page</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14161">PHPBB3-14161</a>] - The core.download_file_send_to_browser_before - $vars - 'extension' it does not exist</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14163">PHPBB3-14163</a>] - Select All in code bug in Edge</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14181">PHPBB3-14181</a>] - Custom report/denial reason not shown in user notifications</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14186">PHPBB3-14186</a>] - Incorrect string concatenation in phpbb_mcp_sorting()</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14200">PHPBB3-14200</a>] - Allow hidden users to see theself on viewonline</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14215">PHPBB3-14215</a>] - [ticket/14212] - Adding event after users have been removed to a group</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14217">PHPBB3-14217</a>] - [ticket/13591] - Change SQL query into array to allow</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14224">PHPBB3-14224</a>] - Fix trailing whitespaces</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14228">PHPBB3-14228</a>] - Vertical align of numbers in polls</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14236">PHPBB3-14236</a>] - Race condition in the functional tests</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14242">PHPBB3-14242</a>] - Fix on memberlist the sort method.</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14249">PHPBB3-14249</a>] - Online list isn't sorted anymore</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14258">PHPBB3-14258</a>] - Add event in auth::Login</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14271">PHPBB3-14271</a>] - Update nginx sample config</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14276">PHPBB3-14276</a>] - Function get_folder_status not setup for use of plurals</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14287">PHPBB3-14287</a>] - Loading indicator not removed after confirming action that does not produce a message</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14297">PHPBB3-14297</a>] - Uppercase and lowercase when sorting topics</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14334">PHPBB3-14334</a>] - Do not use deprecated function get_user_avatar() in user_loader</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14339">PHPBB3-14339</a>] - State support for PHP 7.0 in docs</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14346">PHPBB3-14346</a>] - Improve version check output when phpbb.com is unreachable</li> + </ul> + <h4>Improvement</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7362">PHPBB3-7362</a>] - Title/Post Icons Need Attribute Text</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8800">PHPBB3-8800</a>] - Add "mark topics read" link to "View unread posts"</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10343">PHPBB3-10343</a>] - ACP: searching for users does not show inactive accounts</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13684">PHPBB3-13684</a>] - Only resize attached file comments vertically</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13934">PHPBB3-13934</a>] - Enctype clause for forms may be needed for profile fields</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14066">PHPBB3-14066</a>] - Add template events to search_body.html</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14073">PHPBB3-14073</a>] - Add core events to the several places in includes/functions_admin.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14075">PHPBB3-14075</a>] - Event in posting preview</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14080">PHPBB3-14080</a>] - Add template events to viewforum_body.html before/after/append/prepend the topic row</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14088">PHPBB3-14088</a>] - Add core events to the search.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14089">PHPBB3-14089</a>] - [Template] - posting_topic_title_after</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14098">PHPBB3-14098</a>] - Add core events to the search backends (fulltext_*.php)</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14102">PHPBB3-14102</a>] - Add core event to the mcp_topic.php</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14113">PHPBB3-14113</a>] - Add core events to the memberlist.php for customizing members search</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14117">PHPBB3-14117</a>] - Add core events to index.php to allow modifying birthdays list</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14123">PHPBB3-14123</a>] - Add more descriptive help to the CLI commands</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14126">PHPBB3-14126</a>] - Add viewtopic_topic_title_after template event</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14133">PHPBB3-14133</a>] - Comment fix for phpbb_get_user_rank()</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14154">PHPBB3-14154</a>] - Include "Clean Name" for disabled Extensions</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14155">PHPBB3-14155</a>] - Add row highlighting to extensions and style management</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14156">PHPBB3-14156</a>] - Add the Symfony ResponseListener</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14164">PHPBB3-14164</a>] - Helpful instructions for database updates</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14170">PHPBB3-14170</a>] - Fix mcp_change_poster_after event</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14201">PHPBB3-14201</a>] - Add ACP template events</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14213">PHPBB3-14213</a>] - [PHP] - core.group_add_user_after</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14219">PHPBB3-14219</a>] - Add email address into inactive user display in ACP</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14261">PHPBB3-14261</a>] - Pages served from app.php can't disable the update of session_page</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14283">PHPBB3-14283</a>] - Add a "Manage Group" link on a group page</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14313">PHPBB3-14313</a>] - Don't display quote button on unapproved posts</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Add event when locking/unlocking posts/topics</li> + </ul> + <h4>New Feature</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14144">PHPBB3-14144</a>] - [Template] - quickreply_editor_subject_before</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14146">PHPBB3-14146</a>] - [Template] - viewtopic_body_post_subject_before</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14187">PHPBB3-14187</a>] - [ACP Template] - acp_styles_before_table</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14188">PHPBB3-14188</a>] - [PHP] - core.acp_styles_action_before</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14191">PHPBB3-14191</a>] - [PHP] - core.get_gravatar_url_after</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14192">PHPBB3-14192</a>] - [PHP] - core.memberlist_memberrow_before</li> + </ul> + <h4>Task</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14140">PHPBB3-14140</a>] - Update Symfony to benefit from improvement to the console component</li> + </ul> + <a name="v315"></a><h3>Changes since 3.1.5</h3> <h4>Bug</h4> diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index c82f5c8e49..2ead3552fd 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -64,6 +64,11 @@ http { location / { # phpbb uses index.htm index index.php index.html index.htm; + try_files $uri $uri/ @rewriteapp; + } + + location @rewriteapp { + rewrite ^(.*)$ /app.php/$1 last; } # Deny access to internal phpbb files. @@ -75,12 +80,16 @@ http { } # Pass the php scripts to fastcgi server specified in upstream declaration. - location ~ \.php$ { - fastcgi_pass php; - # Necessary for php. - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + location ~ \.php(/|$) { # Unmodified fastcgi_params from nginx distribution. include fastcgi_params; + # Necessary for php. + fastcgi_split_path_info ^(.+\.php)(/.*)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; + fastcgi_param DOCUMENT_ROOT $realpath_root; + try_files $uri $uri/ /app.php$is_args$args; + fastcgi_pass php; } # Deny access to version control system directories. diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 680d5a2b4e..8056abef00 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.2.0-a2-dev'); +@define('PHPBB_VERSION', '3.2.0-a3-dev'); // QA-related // define('PHPBB_QA', 1); @@ -235,7 +235,7 @@ define('BANLIST_TABLE', $table_prefix . 'banlist'); define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOTS_TABLE', $table_prefix . 'bots'); -define('CONFIG_TABLE', $table_prefix . 'config'); +@define('CONFIG_TABLE', $table_prefix . 'config'); define('CONFIG_TEXT_TABLE', $table_prefix . 'config_text'); define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('DISALLOW_TABLE', $table_prefix . 'disallow'); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 7620cf1ff7..2edc493500 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2635,7 +2635,7 @@ function group_delete($group_id, $group_name = false) */ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0, $pending = 0, $group_attributes = false) { - global $db, $auth, $user, $phpbb_container, $phpbb_log; + global $db, $auth, $user, $phpbb_container, $phpbb_log, $phpbb_dispatcher; // We need both username and user_id info $result = user_get_id_name($user_id_ary, $username_ary); @@ -2712,6 +2712,26 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, // Clear permissions cache of relevant users $auth->acl_clear_prefetch($user_id_ary); + /** + * Event after users are added to a group + * + * @event core.group_add_user_after + * @var int group_id ID of the group to which users are added + * @var string group_name Name of the group + * @var array user_id_ary IDs of the users which are added + * @var array username_ary names of the users which are added + * @var int pending Pending setting, 1 if user(s) added are pending + * @since 3.1.7-RC1 + */ + $vars = array( + 'group_id', + 'group_name', + 'user_id_ary', + 'username_ary', + 'pending', + ); + extract($phpbb_dispatcher->trigger_event('core.group_add_user_after', compact($vars))); + if (!$group_name) { $group_name = get_group_name($group_id); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 9949c972d9..282b3d238a 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.2.0-a1', + 'phpbb_version' => '3.2.0-a2', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/index.html b/phpBB/install/index.html new file mode 100644 index 0000000000..8f8bfb4fb2 --- /dev/null +++ b/phpBB/install/index.html @@ -0,0 +1,11 @@ +<html> +<head> +<title></title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="refresh" content="0; url=./app.php" /> +</head> + +<body bgcolor="#FFFFFF" text="#000000"> + +</body> +</html> diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index e36922f1a5..649d0c4283 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,6 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); +define('PHPBB_VERSION', '3.2.0-a2-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5cf5af6ddc..6e5cefc624 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -275,7 +275,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a3-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php index 0d3e01efaa..927f529b73 100644 --- a/phpBB/install/startup.php +++ b/phpBB/install/startup.php @@ -51,6 +51,11 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline) { global $phpbb_installer_container; + if (error_reporting() == 0) + { + return true; + } + switch ($errno) { case E_NOTICE: diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index c674d5cf3d..800ce3dfb7 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -73,11 +73,11 @@ $help = array( ), array( 0 => 'Creating an Unordered list', - 1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>' + 1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul><br />Alternatively you can specify the list’s bullet style using <strong>[list=disc][/list]</strong>, <strong>[list=circle][/list]</strong>, or <strong>[list=square][/list]</strong>.' ), array( 0 => 'Creating an Ordered list', - 1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>' + 1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=A]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: upper-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=i]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-roman"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=I]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: upper-roman"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>' ), // This block will switch the FAQ-Questions to the second template column array( diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 85592bbc0d..0c539a7309 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -316,6 +316,7 @@ $lang = array_merge($lang, array( 'CLI_INSTALL_VALIDATE_CONFIG' => 'Validate a configuration file', 'CLI_CONFIG_FILE' => 'Config file to use', 'MISSING_FILE' => 'Unable to access file %1$s', + 'MISSING_DATA' => 'Config file is missing data or might contain invalid settings.', 'INVALID_YAML_FILE' => 'Could not parse YAML file %1$s', )); @@ -323,6 +324,30 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'UPDATE_INSTALLATION' => 'Update phpBB installation', 'UPDATE_INSTALLATION_EXPLAIN' => 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />', + 'UPDATE_INSTRUCTIONS' => ' + + <h1>Release announcement</h1> + + <p>Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p> + + <br /> + + <h1>How to update your installation with the Automatic Update Package</h1> + + <p>The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:</p> + + <ul style="margin-left: 20px; font-size: 1.1em;"> + <li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li> + <li>Unpack the archive.<br /><br /></li> + <li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li> + </ul> + + <p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br /> + <strong><a href="%1$s" title="%1$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br /> + <br /> + You will then be guided through the update process. You will be notified once the update is complete. + </p> + ', )); // Updater forms diff --git a/phpBB/phpbb/db/migration/data/v31x/v317.php b/phpBB/phpbb/db/migration/data/v31x/v317.php new file mode 100644 index 0000000000..15ba2a1feb --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v317.php @@ -0,0 +1,31 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @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\db\migration\data\v31x; + +class v317 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v317rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.7')), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v31x/v317rc1.php b/phpBB/phpbb/db/migration/data/v31x/v317rc1.php new file mode 100644 index 0000000000..fa24819094 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v317rc1.php @@ -0,0 +1,32 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @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\db\migration\data\v31x; + +class v317rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\m_pm_report', + '\phpbb\db\migration\data\v31x\v316', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.7-RC1')), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v320/v320a2.php b/phpBB/phpbb/db/migration/data/v320/v320a2.php new file mode 100644 index 0000000000..ae53a73210 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320a2.php @@ -0,0 +1,38 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @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\db\migration\data\v320; + +class v320a2 extends \phpbb\db\migration\container_aware_migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-a2', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v317rc1', + '\phpbb\db\migration\data\v320\text_reparser', + '\phpbb\db\migration\data\v320\v320a1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-a2')), + ); + } +} diff --git a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php index 4d0341ef12..89f3594378 100644 --- a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php @@ -125,6 +125,10 @@ class cli_iohandler extends iohandler_base { $this->io->newLine(); + if (strpos($error_title, '<br />') !== false) + { + $error_title = strip_tags(str_replace('<br />', "\n", $error_title)); + } $message = $this->translate_message($error_title, $error_description); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); $this->io->error($message_string); diff --git a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php index 530cb4766b..8dee5390a9 100644 --- a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php +++ b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php @@ -101,6 +101,10 @@ abstract class iohandler_base implements iohandler_interface */ public function add_error_message($error_title, $error_description = false) { + if (strpos($error_title, '<br />') !== false) + { + $error_title = strip_tags(htmlspecialchars_decode($error_title)); + } $this->errors[] = $this->translate_message($error_title, $error_description); } diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 33547c3ce5..21951b7b0d 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.2.0-a1 -phpbb_version = 3.2.0-a1 +style_version = 3.2.0-a2 +phpbb_version = 3.2.0-a2 # Defining a different template bitfield # template_bitfield = lNg= |