Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 3.4:
  [Cache] fix catching auth errors
  Fix CS
  [FrameworkBundle] set default session.handler alias if handler_id is not provided
  Fix CS
  Readability update
  Fix checks for phpunit releases on Composer 2 (resolves #37601)
  [SCA] Minor fixes on tests
  • Loading branch information
nicolas-grekas committed Jul 23, 2020
2 parents aa17aeb + b753a4c commit ee61f2e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tests/Functional/UserPasswordEncoderCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function testEncodeNoPasswordNoInteraction()
], ['interactive' => false]);

$this->assertStringContainsString('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());
$this->assertEquals($statusCode, 1);
$this->assertEquals(1, $statusCode);
}

public function testEncodePasswordBcrypt()
Expand Down

0 comments on commit ee61f2e

Please sign in to comment.