[ticket/13713] Create properly named base services for sources

PHPBB3-13713

phpBB/config/default/container/services_mention.yml

@@ -16,33 +16,17 @@ services:
         tags:
             - { name: service_collection, tag: mention.source }
 
-    phpbb.mention.source.friend:
-        class: phpbb\mention\source\friend
-        parent: phpbb.mention.source.user
-        calls:
-            - [set_user, ['@user']]
-        tags:
-            - { name: mention.source }
+    phpbb.mention.source.base_group:
+        abstract: true
+        arguments:
+            - '@dbal.conn'
+            - '@group_helper'
+            - '@user'
+            - '@auth'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
-    phpbb.mention.source.member:
-        class: phpbb\mention\source\member
-        parent: phpbb.mention.source.user
-        tags:
-            - { name: mention.source }
-
-    phpbb.mention.source.team:
-        class: phpbb\mention\source\team
-        parent: phpbb.mention.source.user
-        tags:
-            - { name: mention.source }
-
-    phpbb.mention.source.topic:
-        class: phpbb\mention\source\topic
-        parent: phpbb.mention.source.user
-        tags:
-            - { name: mention.source }
-
-    phpbb.mention.source.user:
+    phpbb.mention.source.base_user:
         abstract: true
         arguments:
             - '@dbal.conn'
@@ -50,13 +34,40 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
 
-    phpbb.mention.source.usergroup:
-        class: phpbb\mention\source\usergroup
-        arguments:
-            - '@dbal.conn'
-            - '@group_helper'
-            - '@user'
-            - '%core.root_path%'
-            - '%core.php_ext%'
+    phpbb.mention.source.friend:
+        class: phpbb\mention\source\friend
+        parent: phpbb.mention.source.base_user
+        calls:
+            - [set_user, ['@user']]
+        tags:
+            - { name: mention.source }
+
+    phpbb.mention.source.group:
+        class: phpbb\mention\source\group
+        parent: phpbb.mention.source.base_group
+        tags:
+            - { name: mention.source }
+
+    phpbb.mention.source.team:
+        class: phpbb\mention\source\team
+        parent: phpbb.mention.source.base_user
+        tags:
+            - { name: mention.source }
+
+    phpbb.mention.source.topic:
+        class: phpbb\mention\source\topic
+        parent: phpbb.mention.source.base_user
+        tags:
+            - { name: mention.source }
+
+    phpbb.mention.source.user:
+        class: phpbb\mention\source\user
+        parent: phpbb.mention.source.base_user
+        tags:
+            - { name: mention.source }
+
+    phpbb.mention.source.usergroup:
+        class: phpbb\mention\source\usergroup
+        parent: phpbb.mention.source.base_group
         tags:
             - { name: mention.source }