[ticket/16345] Small improvements

PHPBB3-16346

tests/profilefields/manager_test.php

@@ -39,7 +39,7 @@ class manager_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/manager.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -55,9 +55,6 @@ class manager_test extends phpbb_database_test_case
 		$container	= new phpbb_mock_container_builder();
 		$dispatcher	= new phpbb_mock_event_dispatcher();
 
-		$request	= $this->getMockBuilder('\phpbb\request\request')
-			->disableOriginalConstructor()
-			->getMock();
 		$template	= $this->getMockBuilder('\phpbb\template\template')
 			->disableOriginalConstructor()
 			->getMock();
@@ -77,7 +74,6 @@ class manager_test extends phpbb_database_test_case
 			$dispatcher,
 			$language,
 			$this->log,
-			$request,
 			$template,
 			$collection,
 			$user,

tests/profilefields/type_bool_test.php

@@ -23,10 +23,8 @@ class phpbb_profilefield_type_bool_test extends phpbb_test_case
 	* @access public
 	* @return void
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
-		global $phpbb_root_path, $phpEx;
-
 		$db = $this->createMock('phpbb\\db\\driver\\driver');
 
 		$user = $this->createMock('\phpbb\user');

tests/profilefields/type_date_test.php

@@ -20,10 +20,9 @@ class phpbb_profilefield_type_date_test extends phpbb_test_case
 	/**
 	* Sets up basic test objects
 	*
-	* @access public
-	* @return null
+	* @access protected
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_dropdown_test.php

@@ -20,13 +20,10 @@ class phpbb_profilefield_type_dropdown_test extends phpbb_test_case
 	/**
 	* Sets up basic test objects
 	*
-	* @access public
-	* @return null
+	* @access protected
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
-		global $phpbb_root_path, $phpEx;
-
 		$db = $this->createMock('phpbb\\db\\driver\\driver');
 
 		$user = $this->createMock('\phpbb\user');

tests/profilefields/type_int_test.php

@@ -19,10 +19,9 @@ class phpbb_profilefield_type_int_test extends phpbb_test_case
 	/**
 	* Sets up basic test objects
 	*
-	* @access public
-	* @return null
+	* @access protected
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_string_test.php

@@ -19,10 +19,9 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
 	/**
 	* Sets up basic test objects
 	*
-	* @access public
-	* @return null
+	* @access protected	
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;
 

tests/profilefields/type_url_test.php

@@ -23,10 +23,9 @@ class phpbb_profilefield_type_url_test extends phpbb_test_case
 	/**
 	* Sets up basic test objects
 	*
-	* @access public
-	* @return null
+	* @access protected
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;