Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912

Conflicts:
	phpBB/config/services.yml

phpBB/config/console.yml

@@ -0,0 +1,35 @@
+services:
+    console.command.extension.disable:
+        class: phpbb\console\command\extension\disable
+        arguments:
+            - @ext.manager
+        tags:
+            - { name: console.command }
+
+    console.command.extension.enable:
+        class: phpbb\console\command\extension\enable
+        arguments:
+            - @ext.manager
+        tags:
+            - { name: console.command }
+
+    console.command.extension.purge:
+        class: phpbb\console\command\extension\purge
+        arguments:
+            - @ext.manager
+        tags:
+            - { name: console.command }
+
+    console.command.extension.show:
+        class: phpbb\console\command\extension\show
+        arguments:
+            - @ext.manager
+        tags:
+            - { name: console.command }
+
+    console.command.fixup.recalculate_email_hash:
+        class: phpbb\console\command\fixup\recalculate_email_hash
+        arguments:
+            - @dbal.conn
+        tags:
+            - { name: console.command }

phpBB/config/notifications.yml

@@ -266,7 +266,7 @@ services:
             - { name: notification.type }
 
     notification.type.report_post_closed:
-        class: phpbb\notification\type\report_post
+        class: phpbb\notification\type\report_post_closed
         scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - @user_loader
@@ -319,6 +319,24 @@ services:
         tags:
             - { name: notification.type }
 
+    notification.type.admin_activate_user:
+        class: phpbb\notification\type\admin_activate_user
+        scope: prototype # scope MUST be prototype for this to work!
+        arguments:
+            - @user_loader
+            - @dbal.conn
+            - @cache.driver
+            - @user
+            - @auth
+            - @config
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.notification_types%
+            - %tables.notifications%
+            - %tables.user_notifications%
+        tags:
+            - { name: notification.type }
+
     notification.method.email:
         class: phpbb\notification\method\email
         scope: prototype # scope MUST be prototype for this to work!

phpBB/config/services.yml

@@ -6,6 +6,7 @@ imports:
     - { resource: avatars.yml }
     - { resource: feed.yml }
     - { resource: auth_providers.yml }
+    - { resource: console.yml }
     - { resource: mimetype_guessers.yml }
 
 services:
@@ -23,7 +24,6 @@ services:
         arguments:
             - @config
             - @avatar.driver_collection
-            - @service_container
 
     cache:
         class: phpbb\cache\service
@@ -142,10 +142,17 @@ services:
         class: phpbb\event\extension_subscriber_loader
         arguments:
             - @dispatcher
-            - @ext.manager
+            - @event.listener_collection
         calls:
             - [load, []]
 
+    event.listener_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: event.listener }
+
     ext.manager:
         class: phpbb\extension\manager
         arguments:
@@ -238,6 +245,7 @@ services:
             - @notification.method_collection
             - @service_container
             - @user_loader
+            - @config
             - @dbal.conn
             - @cache
             - @user