diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2018-12-30 11:36:08 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:40:06 +0200 |
| commit | ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 (patch) | |
| tree | a6f45f42c8861ba60216517687bfe72084ba7dcb /tests/auth | |
| parent | [ticket/14948] Require PHP 7.1 and update dependencies (diff) | |
| download | phpbb-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.gz phpbb-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.bz2 phpbb-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.zip | |
[ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
Diffstat (limited to 'tests/auth')
| -rw-r--r-- | tests/auth/provider_apache_test.php | 2 | ||||
| -rw-r--r-- | tests/auth/provider_oauth_token_storage_test.php | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index f30d19ef9d..0c26a0a186 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -17,7 +17,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case protected $user; protected $request; - protected function setup() + protected function setup(): void { parent::setUp(); diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php index ae5de6aa7e..0c0e55dec6 100644 --- a/tests/auth/provider_oauth_token_storage_test.php +++ b/tests/auth/provider_oauth_token_storage_test.php @@ -25,7 +25,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c protected $state_table; protected $user; - protected function setup() + protected function setup(): void { parent::setUp(); @@ -73,7 +73,10 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c $token = $cache_token; } - $this->setExpectedException($exception); + if (!empty($exception)) + { + $this->expectException($exception); + } $stored_token = $this->token_storage->retrieveAccessToken($this->service_name); $this->assertEquals($token, $stored_token); @@ -120,7 +123,10 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c $token = $cache_token; } - $this->setExpectedException($exception); + if (!empty($exception)) + { + $this->expectException($exception); + } $stored_token = $this->token_storage->retrieve_access_token_by_session($this->service_name); $this->assertEquals($token, $stored_token); |