Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit 7e64ee9df4f7 · 2020-07-23T10:36:24.000+02:00
* 5.0:
  fix merge
  Require PHPUnit 9.3 on PHP 8
  [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)
  [Serializer] Support multiple levels of discriminator mapping
  Use hexadecimal numerals instead of hexadecimals in strings to represent error codes.
  [SCA] Minor fixes on tests
  [WebProfilerBundle] modified url generation to use absolute urls
  [Mailer] Fix reply-to functionality in the SendgridApiTransport
  [Mime] Fix compat with HTTP requests
  ticket_36879 - Fix mandrill raw http request setting from email/name
diff --git a/Tests/Functional/UserPasswordEncoderCommandTest.php b/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testEncodeNoPasswordNoInteraction()`
`50`	`50`	`], ['interactive' => false]);`
`51`	`51`
`52`	`52`	`$this->assertStringContainsString('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());`
`53`		`- $this->assertEquals($statusCode, 1);`
	`53`	`+ $this->assertEquals(1, $statusCode);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function testEncodePasswordBcrypt()`