Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit eaf664483688 · 2019-08-01T13:51:38.000+02:00
* 4.3:
  Fix assertInternalType deprecation in phpunit 9
  Ensure signatures for setUp|tearDown|setUpAfterClass|tearDownAfterClass methods in tests are compatible with phpunit 8.2
diff --git a/Tests/Encoder/SodiumPasswordEncoderTest.php b/Tests/Encoder/SodiumPasswordEncoderTest.php
@@ -16,7 +16,7 @@
 
 class SodiumPasswordEncoderTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!SodiumPasswordEncoder::isSupported()) {
             $this->markTestSkipped('Libsodium is not available.');

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`class SodiumPasswordEncoderTest extends TestCase`
`18`	`18`	`{`
`19`		`- protected function setUp()`
	`19`	`+ protected function setUp(): void`
`20`	`20`	`{`
`21`	`21`	`if (!SodiumPasswordEncoder::isSupported()) {`
`22`	`22`	`$this->markTestSkipped('Libsodium is not available.');`