Update to PHPUnit 8.5 (#15581)

* use latest phpunit/phpunit ~8.5

* submodule updates

* fixes

3 files changed, 10 insertions, 11 deletions

diff --git a/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php b/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php
index 5ab9f88296..cbcef4b43e 100644
--- a/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php
+++ b/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php
@@ -25,7 +25,7 @@ class SparklinesConfigTest extends IntegrationTestCase
      */
     private $config;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         FakeAccess::$superUser = true;
@@ -39,7 +39,7 @@ class SparklinesConfigTest extends IntegrationTestCase
         Fixture::loadAllTranslations();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Fixture::resetTranslations();
 
@@ -118,12 +118,11 @@ class SparklinesConfigTest extends IntegrationTestCase
         $this->assertSame($expectedSparkline, $sparklines[''][0]['metrics']['']);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Values: 10, 20, 30 Descriptions: Visits, Actions
-     */
     public function test_addSparkline_shouldThrowAnException_IfValuesDoesNotMatchAmountOfDescriptions()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Values: 10, 20, 30 Descriptions: Visits, Actions');
+
         $this->config->addSparkline($this->sparklineParams(), $values = array(10, 20, 30), $description = array('Visits', 'Actions'));
     }
 
diff --git a/plugins/CoreVisualizations/tests/Unit/GraphTest.php b/plugins/CoreVisualizations/tests/Unit/GraphTest.php
index 34c98f7268..2d61fa7f8d 100644
--- a/plugins/CoreVisualizations/tests/Unit/GraphTest.php
+++ b/plugins/CoreVisualizations/tests/Unit/GraphTest.php
@@ -139,10 +139,10 @@ class GraphTest extends \PHPUnit\Framework\TestCase
         $dataTable = new DataTable();
         $dataTable->setRows(array($row));
 
-        $bar = $this->getMock('Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Bar',
-            array('getDataTable'),
-            array('', '')
-        );
+        $bar = $this->getMockBuilder('Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Bar')
+            ->setMethods(['getDataTable'])
+            ->setConstructorArgs(['', ''])
+            ->getMock();
         $bar->expects($this->any())
             ->method('getDataTable')
             ->will($this->returnValue($dataTable));
diff --git a/plugins/CoreVisualizations/tests/Unit/SparklinesConfigTest.php b/plugins/CoreVisualizations/tests/Unit/SparklinesConfigTest.php
index 27862d31e6..ff709a7fd0 100644
--- a/plugins/CoreVisualizations/tests/Unit/SparklinesConfigTest.php
+++ b/plugins/CoreVisualizations/tests/Unit/SparklinesConfigTest.php
@@ -22,7 +22,7 @@ class SparklinesConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $config;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->config = new Config();
     }