From ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 11:36:08 +0100
Subject: [ticket/14948] Adjust calls for twig and phpunit updates

PHPBB3-14948
---
 tests/session/check_ban_test.php          | 7 ++++---
 tests/session/garbage_collection_test.php | 2 +-
 tests/session/testable_factory.php        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'tests/session')

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 16a65b0ade..0ee655f4ac 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -17,6 +17,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 {
 	protected $user_id = 4;
 	protected $key_id = 4;
+	/** @var \phpbb\session */
 	protected $session;
 	protected $backup_cache;
 
@@ -37,7 +38,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		);
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		// Get session here so that config is mocked correctly
@@ -59,7 +60,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		);
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		parent::tearDown();
 		// Set cache back to what it was before the test changed it
@@ -75,7 +76,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 			$ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
 			$is_banned = !empty($ban);
 		}
-		catch (PHPUnit_Framework_Error_Notice $e)
+		catch (PHPUnit\Framework\Error\Notice $e)
 		{
 			// User error was triggered, user must have been banned
 			$is_banned = true;
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
index 3dc591a328..d361e022da 100644
--- a/tests/session/garbage_collection_test.php
+++ b/tests/session/garbage_collection_test.php
@@ -22,7 +22,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_garbage.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		$this->session = $this->session_factory->get_session($this->db);
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 6f8b49122b..d381b4cbbd 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -120,10 +120,10 @@ class phpbb_session_testable_factory
 	/**
 	* Check if the cache used for the generated session contains correct data.
 	*
-	* @param PHPUnit_Framework_Assert $test The test case to call assert methods
+	* @param PHPUnit\Framework\Assert $test The test case to call assert methods
 	*                                       on
 	*/
-	public function check(PHPUnit_Framework_Assert $test)
+	public function check(PHPUnit\Framework\Assert $test)
 	{
 		$this->cache->check($test, $this->get_cache_data());
 	}
-- 
cgit v1.2.1