2 files changed, 58 insertions, 227 deletions
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index f39218ed9c..49d0626b4f 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -154,5 +154,6 @@ services:
         arguments:
             - @user
             - @text_reparser_collection
+            - @config_text
         tags:
             - { name: console.command }
diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml
index c3bbcddfa6..c842656575 100644
--- a/phpBB/config/default/container/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -6,15 +6,11 @@ services:
             - @notification.method_collection
             - @service_container
             - @user_loader
-            - @config
             - @dispatcher
             - @dbal.conn
             - @cache
             - @user
-            - %core.root_path%
-            - %core.php_ext%
             - %tables.notification_types%
-            - %tables.notifications%
             - %tables.user_notifications%
 
 # ----- Notification's types -----
@@ -26,201 +22,108 @@ services:
         tags:
             - { name: service_collection, tag: notification.type }
 
-    notification.type.approve_post:
-        class: phpbb\notification\type\approve_post
-        scope: prototype
+    notification.type.base:
+        abstract: true
         arguments:
-            - @user_loader
             - @dbal.conn
-            - @cache.driver
             - @user
             - @auth
-            - @config
             - %core.root_path%
             - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
             - %tables.user_notifications%
+
+    notification.type.admin_activate_user:
+        class: phpbb\notification\type\admin_activate_user
+        scope: prototype
+        parent: notification.type.base
+        calls:
+            - [set_user_loader, [@user_loader]]
+            - [set_config, [@config]]
+        tags:
+            - { name: notification.type }
+
+    notification.type.approve_post:
+        class: phpbb\notification\type\approve_post
+        scope: prototype
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.approve_topic:
         class: phpbb\notification\type\approve_topic
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.topic
         tags:
             - { name: notification.type }
 
     notification.type.bookmark:
         class: phpbb\notification\type\bookmark
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.disapprove_post:
         class: phpbb\notification\type\disapprove_post
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.disapprove_topic:
         class: phpbb\notification\type\disapprove_topic
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.topic
         tags:
             - { name: notification.type }
 
     notification.type.group_request:
         class: phpbb\notification\type\group_request
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.base
+        calls:
+            - [set_user_loader, [@user_loader]]
         tags:
             - { name: notification.type }
 
     notification.type.group_request_approved:
         class: phpbb\notification\type\group_request_approved
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.base
         tags:
             - { name: notification.type }
 
     notification.type.pm:
         class: phpbb\notification\type\pm
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.base
+        calls:
+            - [set_user_loader, [@user_loader]]
+            - [set_config, [@config]]
         tags:
             - { name: notification.type }
 
     notification.type.post:
         class: phpbb\notification\type\post
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.base
+        calls:
+            - [set_user_loader, [@user_loader]]
+            - [set_config, [@config]]
         tags:
             - { name: notification.type }
 
     notification.type.post_in_queue:
         class: phpbb\notification\type\post_in_queue
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.quote:
         class: phpbb\notification\type\quote
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         calls:
             - [set_utils, [@text_formatter.utils]]
         tags:
@@ -229,147 +132,77 @@ services:
     notification.type.report_pm:
         class: phpbb\notification\type\report_pm
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_pm_closed:
         class: phpbb\notification\type\report_pm_closed
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_post:
         class: phpbb\notification\type\report_post
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.report_post_closed:
         class: phpbb\notification\type\report_post_closed
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.topic:
         class: phpbb\notification\type\topic
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.base
+        calls:
+            - [set_user_loader, [@user_loader]]
+            - [set_config, [@config]]
         tags:
             - { name: notification.type }
 
     notification.type.topic_in_queue:
         class: phpbb\notification\type\topic_in_queue
         scope: prototype
-        arguments:
-            - @user_loader
-            - @dbal.conn
-            - @cache.driver
-            - @user
-            - @auth
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
+        parent: notification.type.topic
         tags:
             - { name: notification.type }
 
-    notification.type.admin_activate_user:
-        class: phpbb\notification\type\admin_activate_user
-        scope: prototype
+# ----- Notification's methods -----
+# Scope MUST be prototype for all the plugins to work.
+    notification.method_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: notification.method }
+
+    notification.method.board:
+        class: phpbb\notification\method\board
+        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's methods -----
-# Scope MUST be prototype for all the plugins to work.
-    notification.method_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: notification.method }
+            - { name: notification.method }
 
     notification.method.email:
         class: phpbb\notification\method\email
         scope: prototype
         arguments:
             - @user_loader
-            - @dbal.conn
-            - @cache.driver
             - @user
-            - @auth
             - @config
             - %core.root_path%
             - %core.php_ext%
@@ -381,10 +214,7 @@ services:
         scope: prototype
         arguments:
             - @user_loader
-            - @dbal.conn
-            - @cache.driver
             - @user
-            - @auth
             - @config
             - %core.root_path%
             - %core.php_ext%