diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php
index 57b498c39f..2b1832df64 100644
--- a/tests/mention/controller_test.php
+++ b/tests/mention/controller_test.php
@@ -15,8 +15,6 @@ use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
-
class phpbb_mention_controller_test extends phpbb_database_test_case
{
protected $db, $container, $user, $config, $auth, $cache;
@@ -109,6 +107,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
$phpbb_container->set('auth', $auth);
$phpbb_container->set('cache.driver', $cache_driver);
$phpbb_container->set('cache', $cache);
+ $phpbb_container->set('request', $request);
$phpbb_container->set('group_helper', new \phpbb\group\helper($lang));
$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
$phpbb_container->set(
diff --git a/tests/mention/fixtures/mention.xml b/tests/mention/fixtures/mention.xml
index 7e76f58440..66ba0477f5 100644
--- a/tests/mention/fixtures/mention.xml
+++ b/tests/mention/fixtures/mention.xml
@@ -24,175 +24,175 @@
-
- post_id
- topic_id
- forum_id
- poster_id
- post_time
- post_text
-
- 1
- 1
- 1
- 3
- 1
- Topic's initial post.
-
-
- 2
- 1
- 1
- 4
- 2
- A reply.
-
-
-
-
- topic_id
- forum_id
- topic_poster
-
- 1
- 1
- 3
-
-
-
- user_id
- username
- username_clean
- user_type
- user_lastvisit
- user_permissions
- user_sig
-
- 2
- myself
- myself
- 0
- 0
-
-
-
-
- 3
- poster
- poster
- 0
- 0
-
-
-
-
- 4
- replier
- replier
- 0
- 0
-
-
-
-
- 5
- team_member_normal
- team_member_normal
- 0
- 0
-
-
-
-
- 6
- team_member_hidden
- team_member_hidden
- 0
- 0
-
-
-
-
- 7
- friend
- friend
- 0
- 0
-
-
-
-
- 8
- test
- test
- 0
- 0
-
-
-
-
- 9
- test1
- test1
- 0
- 0
-
-
-
-
- 10
- test2
- test2
- 0
- 0
-
-
-
-
- 11
- test3
- test3
- 0
- 0
-
-
-
-
-
- user_id
- group_id
- user_pending
-
- 2
- 3
- 0
-
-
- 5
- 1
- 0
-
-
- 6
- 2
- 0
-
-
-
- user_id
- zebra_id
- friend
- foe
-
- 2
- 7
- 1
- 0
-
-
+
+ post_id
+ topic_id
+ forum_id
+ poster_id
+ post_time
+ post_text
+
+ 1
+ 1
+ 1
+ 3
+ 1
+ Topic's initial post.
+
+
+ 2
+ 1
+ 1
+ 4
+ 2
+ A reply.
+
+
+
+
+ topic_id
+ forum_id
+ topic_poster
+
+ 1
+ 1
+ 3
+
+
+
+ user_id
+ username
+ username_clean
+ user_type
+ user_lastvisit
+ user_permissions
+ user_sig
+
+ 2
+ myself
+ myself
+ 0
+ 0
+
+
+
+
+ 3
+ poster
+ poster
+ 0
+ 0
+
+
+
+
+ 4
+ replier
+ replier
+ 0
+ 0
+
+
+
+
+ 5
+ team_member_normal
+ team_member_normal
+ 0
+ 0
+
+
+
+
+ 6
+ team_member_hidden
+ team_member_hidden
+ 0
+ 0
+
+
+
+
+ 7
+ friend
+ friend
+ 0
+ 0
+
+
+
+
+ 8
+ test
+ test
+ 0
+ 0
+
+
+
+
+ 9
+ test1
+ test1
+ 0
+ 0
+
+
+
+
+ 10
+ test2
+ test2
+ 0
+ 0
+
+
+
+
+ 11
+ test3
+ test3
+ 0
+ 0
+
+
+
+
+
+ user_id
+ group_id
+ user_pending
+
+ 2
+ 3
+ 0
+
+
+ 5
+ 1
+ 0
+
+
+ 6
+ 2
+ 0
+
+
+
+ user_id
+ zebra_id
+ friend
+ foe
+
+ 2
+ 7
+ 1
+ 0
+
+
diff --git a/tests/mention/fixtures/services_mention.yml b/tests/mention/fixtures/services_mention.yml
index f96d18b7ba..3cf14918a3 100644
--- a/tests/mention/fixtures/services_mention.yml
+++ b/tests/mention/fixtures/services_mention.yml
@@ -1,70 +1,2 @@
imports:
- { resource: ../../../phpBB/config/default/container/services_mention.yml }
-
-services:
- user_loader:
- synthetic: true
-
- user:
- synthetic: true
-
- config:
- synthetic: true
-
- dbal.conn:
- synthetic: true
-
- language:
- synthetic: true
-
- auth:
- synthetic: true
-
- cache.driver:
- synthetic: true
-
- group_helper:
- synthetic: true
-
- path_helper:
- synthetic: true
-
- request:
- synthetic: true
-
- text_formatter.s9e.factory:
- synthetic: true
-
- text_formatter.s9e.quote_helper:
- synthetic: true
-
- text_formatter.s9e.mention_helper:
- synthetic: true
-
- text_formatter.parser:
- synthetic: true
-
- text_formatter.s9e.parser:
- synthetic: true
-
- text_formatter.renderer:
- synthetic: true
-
- text_formatter.s9e.renderer:
- synthetic: true
-
- text_formatter.utils:
- synthetic: true
-
- text_formatter.s9e.utils:
- synthetic: true
-
- text_formatter.data_access:
- synthetic: true
-#
-# test:
-# class: phpbb\notification\type\test
-# shared: false
-# parent: notification.type.base
-# tags:
-# - { name: notification.type }