diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-06 10:20:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-06 10:20:01 +0100 |
commit | a7b3ed32add9589c6f32319d61d5ba8dd583ee13 (patch) | |
tree | 78d385ea1a9b4a698bfa6a5c49af24ac5c9c24d4 | |
parent | 0e3392665f20f2c23bbd6bd490fbd91013c357ab (diff) | |
parent | a673c597ed93a4f7b7795139daa183d0d8a793fe (diff) | |
download | nextcloud-server-a7b3ed32add9589c6f32319d61d5ba8dd583ee13.tar.gz nextcloud-server-a7b3ed32add9589c6f32319d61d5ba8dd583ee13.zip |
Merge pull request #18687 from nextcloud/td/phpunit8/loggerTest
Fix the LoggerTests for phpunit
-rw-r--r-- | tests/lib/LoggerTest.php | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php index b8e45d09c63..fa4e481ac48 100644 --- a/tests/lib/LoggerTest.php +++ b/tests/lib/LoggerTest.php @@ -71,7 +71,7 @@ class LoggerTest extends TestCase implements IWriter { $this->logs[]= "$level $message"; } - public function userAndPasswordData() { + public function userAndPasswordData(): array { return [ ['mySpecialUsername', 'MySuperSecretPassword'], ['my-user', '324324()#รค234'], @@ -87,7 +87,7 @@ class LoggerTest extends TestCase implements IWriter { /** * @dataProvider userAndPasswordData */ - public function testDetectlogin($user, $password) { + public function testDetectlogin(string $user, string $password): void { $e = new \Exception('test'); $this->registry->expects($this->once()) ->method('delegateReport') @@ -100,16 +100,16 @@ class LoggerTest extends TestCase implements IWriter { if (is_array($logLine)) { $logLine = json_encode($logLine); } - $this->assertNotContains($user, $logLine); - $this->assertNotContains($password, $logLine); - $this->assertContains('*** sensitive parameters replaced ***', $logLine); + $this->assertStringNotContainsString($user, $logLine); + $this->assertStringNotContainsString($password, $logLine); + $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine); } } /** * @dataProvider userAndPasswordData */ - public function testDetectcheckPassword($user, $password) { + public function testDetectcheckPassword(string $user, string $password): void { $e = new \Exception('test'); $this->registry->expects($this->once()) ->method('delegateReport') @@ -122,16 +122,16 @@ class LoggerTest extends TestCase implements IWriter { if (is_array($logLine)) { $logLine = json_encode($logLine); } - $this->assertNotContains($user, $logLine); - $this->assertNotContains($password, $logLine); - $this->assertContains('*** sensitive parameters replaced ***', $logLine); + $this->assertStringNotContainsString($user, $logLine); + $this->assertStringNotContainsString($password, $logLine); + $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine); } } /** * @dataProvider userAndPasswordData */ - public function testDetectvalidateUserPass($user, $password) { + public function testDetectvalidateUserPass(string $user, string $password): void { $e = new \Exception('test'); $this->registry->expects($this->once()) ->method('delegateReport') @@ -144,16 +144,16 @@ class LoggerTest extends TestCase implements IWriter { if (is_array($logLine)) { $logLine = json_encode($logLine); } - $this->assertNotContains($user, $logLine); - $this->assertNotContains($password, $logLine); - $this->assertContains('*** sensitive parameters replaced ***', $logLine); + $this->assertStringNotContainsString($user, $logLine); + $this->assertStringNotContainsString($password, $logLine); + $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine); } } /** * @dataProvider userAndPasswordData */ - public function testDetecttryLogin($user, $password) { + public function testDetecttryLogin(string $user, string $password): void { $e = new \Exception('test'); $this->registry->expects($this->once()) ->method('delegateReport') @@ -166,16 +166,16 @@ class LoggerTest extends TestCase implements IWriter { if (is_array($logLine)) { $logLine = json_encode($logLine); } - $this->assertNotContains($user, $logLine); - $this->assertNotContains($password, $logLine); - $this->assertContains('*** sensitive parameters replaced ***', $logLine); + $this->assertStringNotContainsString($user, $logLine); + $this->assertStringNotContainsString($password, $logLine); + $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine); } } /** * @dataProvider userAndPasswordData */ - public function testDetectclosure($user, $password) { + public function testDetectclosure(string $user, string $password): void { $a = function($user, $password) { throw new \Exception('test'); }; @@ -197,9 +197,9 @@ class LoggerTest extends TestCase implements IWriter { unset($log[1]); // Remove `testDetectclosure(` because we are not testing this here, but the closure on stack trace 0 $logLine = implode('\n', $log); - $this->assertNotContains($user, $logLine); - $this->assertNotContains($password, $logLine); - $this->assertContains('*** sensitive parameters replaced ***', $logLine); + $this->assertStringNotContainsString($user, $logLine); + $this->assertStringNotContainsString($password, $logLine); + $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine); } } } |