Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml

phpBB/config/services.yml

@@ -45,15 +45,17 @@ services:
             - @cache.driver
             - %tables.config%
 
-    cron.task_provider:
-        class: phpbb_cron_task_provider
+    cron.task_collection:
+        class: phpbb_di_service_collection
         arguments:
-            - @container
+            - @service_container
+        tags:
+            - { name: service_collection, tag: cron.task }
 
     cron.manager:
         class: phpbb_cron_manager
         arguments:
-            - @cron.task_provider
+            - @cron.task_collection
             - %core.root_path%
             - %core.php_ext%
 
@@ -66,6 +68,8 @@ services:
 
     dispatcher:
         class: phpbb_event_dispatcher
+        arguments:
+            - @service_container
 
     dbal.conn:
         class: %dbal.driver.class%
@@ -106,13 +110,6 @@ services:
             - %tables.notifications%
             - %tables.user_notifications%
 
-    processor.ext:
-        class: phpbb_di_processor_ext
-        arguments:
-            - @ext.manager
-        tags:
-            - { name: container.processor }
-
     request:
         class: phpbb_request