[ticket/13713] Tests cleanup

PHPBB3-13713

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(

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 }