Update to PHPUnit 8.5 (#15581)

* use latest phpunit/phpunit ~8.5

* submodule updates

* fixes

7 files changed, 26 insertions, 32 deletions

diff --git a/plugins/Login/tests/Integration/APITest.php b/plugins/Login/tests/Integration/APITest.php
index 9c09ccfa92..c250abfa46 100644
--- a/plugins/Login/tests/Integration/APITest.php
+++ b/plugins/Login/tests/Integration/APITest.php
@@ -24,19 +24,18 @@ class APITest extends IntegrationTestCase
      */
     private $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->api = API::getInstance();
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage checkUserHasSuperUserAccess
-     */
     public function test_unblockBruteForceIPs_requiresSuperUser()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('checkUserHasSuperUserAccess');
+
         FakeAccess::clearAccess(false, array(1,2,3));
         $this->api->unblockBruteForceIPs();
     }
diff --git a/plugins/Login/tests/Integration/LoginTest.php b/plugins/Login/tests/Integration/LoginTest.php
index ee76537ed3..a0351b5ea1 100644
--- a/plugins/Login/tests/Integration/LoginTest.php
+++ b/plugins/Login/tests/Integration/LoginTest.php
@@ -30,7 +30,7 @@ class LoginTest extends IntegrationTestCase
      */
     private $auth;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/plugins/Login/tests/Integration/PasswordResetterTest.php b/plugins/Login/tests/Integration/PasswordResetterTest.php
index f3603c7aca..89abe3ee8d 100644
--- a/plugins/Login/tests/Integration/PasswordResetterTest.php
+++ b/plugins/Login/tests/Integration/PasswordResetterTest.php
@@ -39,7 +39,7 @@ class PasswordResetterTest extends IntegrationTestCase
      */
     private $passwordResetter;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->passwordResetter = new PasswordResetter();
@@ -83,12 +83,11 @@ class PasswordResetterTest extends IntegrationTestCase
         $this->assertNotEquals($token, $this->capturedToken);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage You have requested too many password resets recently. A new request can be made in one hour. If you have problems resetting your password, please contact your administrator for help.
-     */
     public function test_passwordReset_notAllowedMoreThanThreeTimesInAnHour()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('You have requested too many password resets recently. A new request can be made in one hour. If you have problems resetting your password, please contact your administrator for help.');
+
         $this->passwordResetter->initiatePasswordResetProcess('superUserLogin', self::NEWPASSWORD);
 
         $this->assertNotEmpty($this->capturedToken);
@@ -124,12 +123,11 @@ class PasswordResetterTest extends IntegrationTestCase
         $this->assertEquals(1, $data['requests']);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Token is invalid or has expired
-     */
     public function test_passwordReset_shouldNotAllowTokenToBeUsedMoreThanOnce()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Token is invalid or has expired');
+
         $this->passwordResetter->initiatePasswordResetProcess('superUserLogin', self::NEWPASSWORD);
         $this->assertNotEmpty($this->capturedToken);
 
@@ -157,12 +155,11 @@ class PasswordResetterTest extends IntegrationTestCase
         $this->assertNotEquals($oldCapturedToken, $this->capturedToken);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Token is invalid or has expired
-     */
     public function test_passwordReset_shouldNotAllowOldTokenToBeUsedAfterAnotherResetRequest()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Token is invalid or has expired');
+
         $this->passwordResetter->initiatePasswordResetProcess('superUserLogin', self::NEWPASSWORD);
         $this->assertNotEmpty($this->capturedToken);
 
diff --git a/plugins/Login/tests/Integration/PasswordVerifierTest.php b/plugins/Login/tests/Integration/PasswordVerifierTest.php
index a169e5e723..7a84f44e7e 100644
--- a/plugins/Login/tests/Integration/PasswordVerifierTest.php
+++ b/plugins/Login/tests/Integration/PasswordVerifierTest.php
@@ -27,7 +27,7 @@ class PasswordVerifierTest extends IntegrationTestCase
      */
     private $verifier;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/plugins/Login/tests/Integration/Security/BruteForceDetectionTest.php b/plugins/Login/tests/Integration/Security/BruteForceDetectionTest.php
index d258d9d3d4..187a747fd9 100644
--- a/plugins/Login/tests/Integration/Security/BruteForceDetectionTest.php
+++ b/plugins/Login/tests/Integration/Security/BruteForceDetectionTest.php
@@ -50,7 +50,7 @@ class BruteForceDetectionTest extends IntegrationTestCase
      */
     private $settings;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/plugins/Login/tests/Integration/SessionInitializerTest.php b/plugins/Login/tests/Integration/SessionInitializerTest.php
index c10c4d920d..c2215de7a9 100644
--- a/plugins/Login/tests/Integration/SessionInitializerTest.php
+++ b/plugins/Login/tests/Integration/SessionInitializerTest.php
@@ -22,7 +22,7 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
  */
 class SessionInitializerTest extends IntegrationTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -69,7 +69,7 @@ class SessionInitializerTest extends IntegrationTestCase
 
     private function assertAuthCookieIsCreated(Cookie $cookie)
     {
-        $this->assertContains('login=czo5OiJ0ZXN0bG9naW4iOw==:token_auth=czozMjoiOWU5MDYxZjk2MDI0YTY3NWFmOGFkNWZmNmNiZGY2ZGMiOw==',
+        self::assertStringContainsString('login=czo5OiJ0ZXN0bG9naW4iOw==:token_auth=czozMjoiOWU5MDYxZjk2MDI0YTY3NWFmOGFkNWZmNmNiZGY2ZGMiOw==',
             $cookie->generateContentString());
     }
 
diff --git a/plugins/Login/tests/Integration/SystemSettingsTest.php b/plugins/Login/tests/Integration/SystemSettingsTest.php
index 8bf1a83afe..f1aa859b8c 100644
--- a/plugins/Login/tests/Integration/SystemSettingsTest.php
+++ b/plugins/Login/tests/Integration/SystemSettingsTest.php
@@ -30,7 +30,7 @@ class SystemSettingsTest extends IntegrationTestCase
         '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
     );
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -63,12 +63,11 @@ class SystemSettingsTest extends IntegrationTestCase
         $this->assertSame($this->exampleIps, $this->settings->whitelisteBruteForceIps->getValue());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage SitesManager_ExceptionInvalidIPFormat
-     */
     public function test_whitelisteBruteForceIps_failsWhenContainsInvalidValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('SitesManager_ExceptionInvalidIPFormat');
+
         $this->settings->whitelisteBruteForceIps->setValue(array(
             '127.0.0.1', 'foobar'
         ));
@@ -100,12 +99,11 @@ class SystemSettingsTest extends IntegrationTestCase
         $this->assertSame($this->exampleIps, $this->settings->blacklistedBruteForceIps->getValue());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage SitesManager_ExceptionInvalidIPFormat
-     */
     public function test_blacklistedBruteForceIps_failsWhenContainsInvalidValue()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('SitesManager_ExceptionInvalidIPFormat');
+
         $this->settings->blacklistedBruteForceIps->setValue(array(
             '127.0.0.1', 'foobar'
         ));