Update to PHPUnit 8.5 (#15581)

* use latest phpunit/phpunit ~8.5

* submodule updates

* fixes

4 files changed, 18 insertions, 21 deletions

diff --git a/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php b/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
index d2bcb9f302..a2d7db247f 100644
--- a/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
+++ b/plugins/Live/tests/Fixtures/ManyVisitsOfSameVisitor.php
@@ -19,7 +19,7 @@ class ManyVisitsOfSameVisitor extends Fixture
     public $idSite = 1;
     public $idSite2 = 2;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!self::siteCreated($this->idSite)) {
             self::createWebsite($this->dateTime);
@@ -32,7 +32,7 @@ class ManyVisitsOfSameVisitor extends Fixture
         $this->trackVisits();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // empty
     }
diff --git a/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php
index d21bed8221..f61aa3b16f 100644
--- a/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php
+++ b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php
@@ -20,7 +20,7 @@ class VisitsWithAllActionsAndDevices extends Fixture
     public $dateTime = '2010-02-01 11:22:33';
     public $idSite = 1;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!self::siteCreated($idSite = 1)) {
             self::createWebsite($this->dateTime, 1);
@@ -64,7 +64,7 @@ class VisitsWithAllActionsAndDevices extends Fixture
         $this->trackVisitTablet($t, Date::factory($this->dateTime)->addHour(156.9)->getDatetime());
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // empty
     }
diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php
index eeede80c97..ea2b104732 100644
--- a/plugins/Live/tests/Integration/ModelTest.php
+++ b/plugins/Live/tests/Integration/ModelTest.php
@@ -27,7 +27,7 @@ use Piwik\Tests\Integration\SegmentTest;
  */
 class ModelTest extends IntegrationTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -87,13 +87,12 @@ class ModelTest extends IntegrationTestCase
         $this->assertTrue(true);
     }
 
-	/**
-	 * @expectedException \Piwik\Plugins\Live\Exception\MaxExecutionTimeExceededException
-	 * @expectedExceptionMessage Live_QueryMaxExecutionTimeExceeded  Live_QueryMaxExecutionTimeExceededReasonUnknown
-	 */
     public function test_handleMaxExecutionTimeError_whenTimeIsExceeded_noReasonFound()
     {
-    	$db = Db::get();
+        $this->expectException(\Piwik\Plugins\Live\Exception\MaxExecutionTimeExceededException::class);
+        $this->expectExceptionMessage('Live_QueryMaxExecutionTimeExceeded  Live_QueryMaxExecutionTimeExceededReasonUnknown');
+
+        $db = Db::get();
     	$e = new \Exception('[3024] Query execution was interrupted, maximum statement execution time exceeded');
 	    $sql = 'SELECT 1';
 	    $bind = array();
@@ -106,13 +105,12 @@ class ModelTest extends IntegrationTestCase
         $model->handleMaxExecutionTimeError($db, $e, $sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit);
     }
 
-	/**
-	 * @expectedException \Piwik\Plugins\Live\Exception\MaxExecutionTimeExceededException
-	 * @expectedExceptionMessage Live_QueryMaxExecutionTimeExceeded  Live_QueryMaxExecutionTimeExceededReasonDateRange Live_QueryMaxExecutionTimeExceededReasonSegment Live_QueryMaxExecutionTimeExceededLimit
-	 */
     public function test_handleMaxExecutionTimeError_whenTimeIsExceeded_manyReasonsFound()
     {
-    	$db = Db::get();
+        $this->expectException(\Piwik\Plugins\Live\Exception\MaxExecutionTimeExceededException::class);
+        $this->expectExceptionMessage('Live_QueryMaxExecutionTimeExceeded  Live_QueryMaxExecutionTimeExceededReasonDateRange Live_QueryMaxExecutionTimeExceededReasonSegment Live_QueryMaxExecutionTimeExceededLimit');
+
+        $db = Db::get();
     	$e = new \Exception('Query execution was interrupted, maximum statement execution time exceeded');
 	    $sql = 'SELECT 1';
 	    $bind = array();
diff --git a/plugins/Live/tests/System/ApiCounterTest.php b/plugins/Live/tests/System/ApiCounterTest.php
index c71a62a850..58cf83fbb1 100644
--- a/plugins/Live/tests/System/ApiCounterTest.php
+++ b/plugins/Live/tests/System/ApiCounterTest.php
@@ -35,14 +35,14 @@ class ApiCounterTest extends SystemTestCase
     private $api;
     private $idSite = 1;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$testNow = strtotime('2018-02-03 04:45:40');
 
         parent::setUpBeforeClass();
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -51,12 +51,11 @@ class ApiCounterTest extends SystemTestCase
         $this->createSite();
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage checkUserHasViewAccess Fake exception
-     */
     public function test_GetCounters_ShouldFail_IfUserHasNoPermission()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('checkUserHasViewAccess Fake exception');
+
         $this->setAnonymous();
         $this->api->getCounters($this->idSite, 5);
     }