Description: Modify tests for phpunit >= 6
Author: James Valleroy <jvalleroy@mailbox.org>
Forwarded: not-needed

--- a/test/Dispatcher/MarkBasedTest.php
+++ b/test/Dispatcher/MarkBasedTest.php
@@ -4,7 +4,7 @@
 
 class MarkBasedTest extends DispatcherTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         preg_match('/(*MARK:A)a/', 'a', $matches);
         if (!isset($matches['MARK'])) {
--- a/test/RouteParser/StdTest.php
+++ b/test/RouteParser/StdTest.php
@@ -18,7 +18,8 @@
     public function testParseError($routeString, $expectedExceptionMessage)
     {
         $parser = new Std();
-        $this->setExpectedException('FastRoute\\BadRouteException', $expectedExceptionMessage);
+        $this->expectException('FastRoute\\BadRouteException');
+        $this->expectExceptionMessage($expectedExceptionMessage);
         $parser->parse($routeString);
     }
 
