From: James Valleroy <jvalleroy@mailbox.org>
Date: Mon, 14 Dec 2020 01:52:51 -0400
Subject: Modify tests for phpunit >= 6

Forwarded: https://github.com/nikic/FastRoute/pull/177
Reviewed-by: William Desportes <williamdes@wdes.fr>
Applied-upstream: https://github.com/nikic/FastRoute/commit/6a5f3abe514724792729f0487ed65629b00feb1f
---
 test/Dispatcher/MarkBasedTest.php | 2 +-
 test/RouteParser/StdTest.php      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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