[ticket/15886] Clean up services

PHPBB3-15886

2 files changed, 124 insertions, 126 deletions

diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php
index 1318cf9040..cfbcd5890c 100644
--- a/tests/group/helper_test_case.php
+++ b/tests/group/helper_test_case.php
@@ -1,123 +1,123 @@
-<?php

-/**

- *

- * This file is part of the phpBB Forum Software package.

- *

- * @copyright (c) phpBB Limited <https://www.phpbb.com>

- * @license GNU General Public License, version 2 (GPL-2.0)

- *

- * For full copyright and license information, please see

- * the docs/CREDITS.txt file.

- *

- */

-

-class phpbb_group_helper_test_case extends phpbb_test_case

-{

-	/** @var  \phpbb\group\helper */

-	protected $group_helper;

-

-	protected function config_defaults()

-	{

-		$defaults = array(

-			'ranks_path' => 'images/ranks'

-		);

-		return $defaults;

-	}

-

-	protected function get_test_language_data_set()

-	{

-		return array(

-			'G_BOTS'					=> 'Bots',

-			'G_NEW_GROUP'				=> 'Some new group',

-			'G_not_uppercase'			=> 'The key does not contain uppercase letters',

-			'G_GROUP_WITH_ÜMLAUTS'		=> 'Should work',

-		);

-	}

-

-	protected function get_test_rank_data_set()

-	{

-		return array(

-			'special' => array(

-				1 => array(

-					'rank_id'		=> 1,

-					'rank_title'	=> 'Site admin',

-					'rank_special'	=> 1,

-					'rank_image'	=> 'siteadmin.png',

-				),

-				2 => array(

-					'rank_id'		=> 2,

-					'rank_title'	=> 'Test member',

-					'rank_special'	=> 1,

-					'rank_image'	=> '',

-				)

-			)

-		);

-	}

-

-	protected function setup_engine(array $new_config = array())

-	{

-		global $cache, $phpbb_dispatcher, $phpbb_root_path, $phpEx;

-

-		// Set up authentication data for testing

-		$auth = $this->getMock('\phpbb\auth\auth');

-		$auth->expects($this->any())

-			->method('acl_get')

-			->with($this->stringContains('_'), $this->anything())

-			->will($this->returnValueMap(array(

-				array('u_viewprofile', true),

-			)));

-

-		// Set up cache service

-		$cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock();

-		$cache_service->expects($this->any())

-			->method('obtain_ranks')

-			->will($this->returnValue($this->get_test_rank_data_set()));

-

-		// Set up configuration

-		$defaults = $this->config_defaults();

-		$config = new \phpbb\config\config(array_merge($defaults, $new_config));

-

-		// Set up language service

-		$lang = new \phpbb\language\language(

-			new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)

-		);

-

-		// Set up language data for testing

-		$reflection_class = new ReflectionClass('\phpbb\language\language');

-

-		// Set default language files loaded flag to true

-		$loaded_flag = $reflection_class->getProperty('common_language_files_loaded');

-		$loaded_flag->setAccessible(true);

-		$loaded_flag->setValue($lang, true);

-

-		// Set up test language data

-		$lang_array = $reflection_class->getProperty('lang');

-		$lang_array->setAccessible(true);

-		$lang_array->setValue($lang, $this->get_test_language_data_set());

-

-		// Set up event dispatcher

-		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();

-

-		// Set up path helper

-		$filesystem = new \phpbb\filesystem\filesystem();

-		$path_helper = new \phpbb\path_helper(

-			new \phpbb\symfony_request(

-				new phpbb_mock_request()

-			),

-			$filesystem,

-			$this->getMock('\phpbb\request\request'),

-			$phpbb_root_path,

-			$phpEx

-		);

-

-		$user = new \phpbb\user($lang, '\phpbb\datetime');

-		$user->data['user_id'] = ANONYMOUS;

-

-		$this->group_helper = new \phpbb\group\helper($auth, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user, $phpbb_root_path, $phpEx);

-	}

-

-	public function setUp()

-	{

-		$this->setup_engine();

-	}

-}

+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+class phpbb_group_helper_test_case extends phpbb_test_case
+{
+	/** @var  \phpbb\group\helper */
+	protected $group_helper;
+
+	protected function config_defaults()
+	{
+		$defaults = array(
+			'ranks_path' => 'images/ranks'
+		);
+		return $defaults;
+	}
+
+	protected function get_test_language_data_set()
+	{
+		return array(
+			'G_BOTS'					=> 'Bots',
+			'G_NEW_GROUP'				=> 'Some new group',
+			'G_not_uppercase'			=> 'The key does not contain uppercase letters',
+			'G_GROUP_WITH_ÜMLAUTS'		=> 'Should work',
+		);
+	}
+
+	protected function get_test_rank_data_set()
+	{
+		return array(
+			'special' => array(
+				1 => array(
+					'rank_id'		=> 1,
+					'rank_title'	=> 'Site admin',
+					'rank_special'	=> 1,
+					'rank_image'	=> 'siteadmin.png',
+				),
+				2 => array(
+					'rank_id'		=> 2,
+					'rank_title'	=> 'Test member',
+					'rank_special'	=> 1,
+					'rank_image'	=> '',
+				)
+			)
+		);
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+
+		// Set up authentication data for testing
+		$auth = $this->getMock('\phpbb\auth\auth');
+		$auth->expects($this->any())
+			->method('acl_get')
+			->with($this->stringContains('_'), $this->anything())
+			->will($this->returnValueMap(array(
+				array('u_viewprofile', true),
+			)));
+
+		// Set up cache service
+		$cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock();
+		$cache_service->expects($this->any())
+			->method('obtain_ranks')
+			->will($this->returnValue($this->get_test_rank_data_set()));
+
+		// Set up configuration
+		$defaults = $this->config_defaults();
+		$config = new \phpbb\config\config(array_merge($defaults, $new_config));
+
+		// Set up language service
+		$lang = new \phpbb\language\language(
+			new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)
+		);
+
+		// Set up language data for testing
+		$reflection_class = new ReflectionClass('\phpbb\language\language');
+
+		// Set default language files loaded flag to true
+		$loaded_flag = $reflection_class->getProperty('common_language_files_loaded');
+		$loaded_flag->setAccessible(true);
+		$loaded_flag->setValue($lang, true);
+
+		// Set up test language data
+		$lang_array = $reflection_class->getProperty('lang');
+		$lang_array->setAccessible(true);
+		$lang_array->setValue($lang, $this->get_test_language_data_set());
+
+		// Set up event dispatcher
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
+		// Set up path helper
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$path_helper = new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
+			),
+			$filesystem,
+			$this->getMock('\phpbb\request\request'),
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$user->data['user_id'] = ANONYMOUS;
+
+		$this->group_helper = new \phpbb\group\helper($auth, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user);
+	}
+
+	public function setUp()
+	{
+		$this->setup_engine();
+	}
+}
diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php
index f53fe32f2a..e849c66fa5 100644
--- a/tests/notification/group_request_test.php
+++ b/tests/notification/group_request_test.php
@@ -65,9 +65,7 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas
 				$phpbb_root_path,
 				$phpEx
 			),
-			$this->user,
-			$phpbb_root_path,
-			$phpEx
+			$this->user
 		));
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
 		$phpbb_log = new \phpbb\log\dummy();