Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/config/services.yml

phpBB/config/auth_providers.yml

@@ -14,6 +14,7 @@ services:
             - @passwords.manager
             - @request
             - @user
+            - @service_container
             - %core.root_path%
             - %core.php_ext%
         tags:

phpBB/config/captcha.yml

@@ -0,0 +1,62 @@
+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
+        arguments:
+            - @service_container
+            - @captcha.plugins.service_collection
+
+    captcha.plugins.service_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: captcha.plugins }
+
+    core.captcha.plugins.gd:
+        class: phpbb\captcha\plugins\gd
+        scope: prototype # scope MUST be prototype for this to work!
+        calls:
+            - [set_name, [core.captcha.plugins.gd]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.gd_wave:
+        class: phpbb\captcha\plugins\gd_wave
+        scope: prototype # scope MUST be prototype for this to work!
+        calls:
+            - [set_name, [core.captcha.plugins.gd_wave]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.nogd:
+        class: phpbb\captcha\plugins\nogd
+        scope: prototype # scope MUST be prototype for this to work!
+        calls:
+            - [set_name, [core.captcha.plugins.nogd]]
+        tags:
+            - { 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%
+        calls:
+            - [set_name, [core.captcha.plugins.qa]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.recaptcha:
+        class: phpbb\captcha\plugins\recaptcha
+        scope: prototype # scope MUST be prototype for this to work!
+        calls:
+            - [set_name, [core.captcha.plugins.recaptcha]]
+        tags:
+            - { name: captcha.plugins }

phpBB/config/services.yml

@@ -11,6 +11,7 @@ imports:
     - { resource: passwords.yml }
     - { resource: profilefields.yml }
     - { resource: twig.yml }
+    - { resource: captcha.yml }
     - { resource: parameters.yml }
 
 services: