Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster

4 files changed, 6 insertions, 6 deletions

diff --git a/tests/request/deactivated_super_global_test.php b/tests/request/deactivated_super_global_test.php
index d45f9ca666..eabc79ed96 100644
--- a/tests/request/deactivated_super_global_test.php
+++ b/tests/request/deactivated_super_global_test.php
@@ -19,7 +19,7 @@ class phpbb_deactivated_super_global_test extends phpbb_test_case
 	public function test_write_triggers_error()
 	{
 		$this->setExpectedTriggerError(E_USER_ERROR);
-		$obj = new \phpbb\request\deactivated_super_global($this->getMock('\phpbb\request\request_interface'), 'obj', \phpbb\request\request_interface::POST);
+		$obj = new \phpbb\request\deactivated_super_global($this->createMock('\phpbb\request\request_interface'), 'obj', \phpbb\request\request_interface::POST);
 		$obj->offsetSet(0, 0);
 	}
 }
diff --git a/tests/request/request_test.php b/tests/request/request_test.php
index ebaea1f9ef..d03253ceb9 100644
--- a/tests/request/request_test.php
+++ b/tests/request/request_test.php
@@ -19,7 +19,7 @@ class phpbb_request_test extends phpbb_test_case
 	/** @var \phpbb\request\request */
 	private $request;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		// populate super globals
 		$_POST['test'] = 1;
@@ -39,7 +39,7 @@ class phpbb_request_test extends phpbb_test_case
 		$_SERVER['HTTP_ACCEPT'] = 'application/json';
 		$_SERVER['HTTP_SOMEVAR'] = '<value>';
 
-		$this->type_cast_helper = $this->getMock('\phpbb\request\type_cast_helper_interface');
+		$this->type_cast_helper = $this->createMock('\phpbb\request\type_cast_helper_interface');
 		$this->request = new \phpbb\request\request($this->type_cast_helper);
 	}
 
@@ -264,7 +264,7 @@ class phpbb_request_test extends phpbb_test_case
 	/**
 	* Makes sure super globals work properly after these tests
 	*/
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		$this->request->enable_super_globals();
 	}
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index 84c81c4e84..8dc8e4c7c7 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -16,7 +16,7 @@ class phpbb_request_var_test extends phpbb_test_case
 	/**
 	* Makes sure request_var has its standard behaviour.
 	*/
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 		request_var(false, false, false, false, false);
diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php
index 6407dca894..5810c67b78 100644
--- a/tests/request/type_cast_helper_test.php
+++ b/tests/request/type_cast_helper_test.php
@@ -15,7 +15,7 @@ class phpbb_type_cast_helper_test extends phpbb_test_case
 {
 	private $type_cast_helper;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		$this->type_cast_helper = new \phpbb\request\type_cast_helper();
 	}