Skip to content

Fix the LoggerTests for phpunit #18687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jan 6, 2020
Merged

Fix the LoggerTests for phpunit #18687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix the LoggerTests for phpunit 
Less deprecation warnings. YAY.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Jan 6, 2020
commit a673c597ed93a4f7b7795139daa183d0d8a793fe
42 changes: 21 additions & 21 deletions tests/lib/LoggerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function write(string $app, $message, int $level) {
$this->logs[]= "$level $message";
}

public function userAndPasswordData() {
public function userAndPasswordData(): array {
return [
['mySpecialUsername', 'MySuperSecretPassword'],
['my-user', '324324()#ä234'],
Expand All @@ -87,7 +87,7 @@ public function userAndPasswordData() {
/**
* @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')
Expand All @@ -100,16 +100,16 @@ public function testDetectlogin($user, $password) {
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')
Expand All @@ -122,16 +122,16 @@ public function testDetectcheckPassword($user, $password) {
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')
Expand All @@ -144,16 +144,16 @@ public function testDetectvalidateUserPass($user, $password) {
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')
Expand All @@ -166,16 +166,16 @@ public function testDetecttryLogin($user, $password) {
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');
};
Expand All @@ -197,9 +197,9 @@ public function testDetectclosure($user, $password) {
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);
}
}
}