[ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins

PHPBB3-11854

phpBB/config/captcha.yml

@@ -0,0 +1,43 @@
+services:
+    captchas.factory:
+        class: phpbb\captcha\factory
+        arguments:
+            - @service_container
+            - @captchas.plugins.service_collection
+
+    captchas.plugins.service_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: captchas.plugins }
+
+    core.captcha.plugins.gd:
+        class: phpbb\captcha\plugins\gd
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        tags:
+            - { name: captchas.plugins }
+
+    core.captcha.plugins.gd_wave:
+        class: phpbb\captcha\plugins\gd_wave
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        tags:
+            - { name: captchas.plugins }
+
+    core.captcha.plugins.nogd:
+        class: phpbb\captcha\plugins\nogd
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        tags:
+            - { name: captchas.plugins }
+
+    core.captcha.plugins.qa:
+        class: phpbb\captcha\plugins\qa
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        tags:
+            - { name: captchas.plugins }
+
+    core.captcha.plugins.recaptcha:
+        class: phpbb\captcha\plugins\recaptcha
+        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        tags:
+            - { name: captchas.plugins }

phpBB/config/services.yml

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