From e889b8f9318ab8e6324f6d5ca4fedc08ce418c8f Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 10 Aug 2014 13:15:07 +0200 Subject: [ticket/11854] Remove constants and use DI for QA tables PHPBB3-11854 --- phpBB/config/captcha.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/captcha.yml b/phpBB/config/captcha.yml index 0774319f93..15d6a4ce3d 100644 --- a/phpBB/config/captcha.yml +++ b/phpBB/config/captcha.yml @@ -1,3 +1,8 @@ +parameters: + 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 + services: captcha.factory: class: phpbb\captcha\factory @@ -10,34 +15,38 @@ services: arguments: - @service_container tags: - - { name: service_collection, tag: captchas.plugins } + - { name: service_collection, tag: captcha.plugins } core.captcha.plugins.gd: class: phpbb\captcha\plugins\gd scope: prototype # scope MUST be prototype for this to work! tags: - - { name: captchas.plugins } + - { name: captcha.plugins } core.captcha.plugins.gd_wave: class: phpbb\captcha\plugins\gd_wave scope: prototype # scope MUST be prototype for this to work! tags: - - { name: captchas.plugins } + - { name: captcha.plugins } core.captcha.plugins.nogd: class: phpbb\captcha\plugins\nogd scope: prototype # scope MUST be prototype for this to work! tags: - - { name: captchas.plugins } + - { name: captcha.plugins } core.captcha.plugins.qa: class: phpbb\captcha\plugins\qa scope: prototype # scope MUST be prototype for this to work! + arguments: + - %tables.captcha_qa_questions% + - %tables.captcha_qa_answers% + - %tables.captcha_qa_confirm% tags: - - { name: captchas.plugins } + - { name: captcha.plugins } core.captcha.plugins.recaptcha: class: phpbb\captcha\plugins\recaptcha scope: prototype # scope MUST be prototype for this to work! tags: - - { name: captchas.plugins } + - { name: captcha.plugins } -- cgit v1.2.1