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

3 files changed, 6 insertions, 6 deletions

diff --git a/tests/security/base.php b/tests/security/base.php
index d2abdbc362..ad518b5543 100644
--- a/tests/security/base.php
+++ b/tests/security/base.php
@@ -18,7 +18,7 @@ abstract class phpbb_security_test_base extends phpbb_test_case
 	/**
 	* Set up the required user object and server variables for the suites
 	*/
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $user, $phpbb_root_path, $phpEx, $request, $symfony_request, $phpbb_filesystem;
 
@@ -60,7 +60,7 @@ abstract class phpbb_security_test_base extends phpbb_test_case
 		$user->page = \phpbb\session::extract_current_page($phpbb_root_path);
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		global $user;
 		$user = NULL;
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index 84d4fcf479..40d14f24bf 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -13,12 +13,12 @@
 
 class phpbb_security_hash_test extends phpbb_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		global $phpbb_container;
 
 		$config = new \phpbb\config\config(array());
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$phpbb_container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
 		$driver_helper = new \phpbb\passwords\driver\helper($config);
 		$passwords_drivers = array(
 			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper),
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 0177eb4259..313e329e20 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -67,7 +67,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 					new phpbb_mock_request()
 				),
 				new \phpbb\filesystem\filesystem(),
-				$this->getMock('\phpbb\request\request'),
+				$this->createMock('\phpbb\request\request'),
 				$this->phpbb_root_path,
 				'php'
 			);
@@ -75,7 +75,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 		return $this->path_helper;
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $phpbb_dispatcher;