From 3d46886f4102f602d7142c1d33b911c472394cb9 Mon Sep 17 00:00:00 2001 From: elazar Date: Fri, 3 Apr 2020 16:59:39 -0500 Subject: [PATCH 1/3] Modify usage of deprecated expectExceptionMessageRegExp() method --- composer.json | 2 +- tests/MiddlewareDispatcherTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ee597f1c1..0f73c9336 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "nyholm/psr7-server": "^0.3.0", "phpspec/prophecy": "^1.10", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5|^9", "slim/http": "^1.0", "slim/psr7": "^1.0", "squizlabs/php_codesniffer": "^3.5" diff --git a/tests/MiddlewareDispatcherTest.php b/tests/MiddlewareDispatcherTest.php index 8ffcf0534..46f82bd98 100644 --- a/tests/MiddlewareDispatcherTest.php +++ b/tests/MiddlewareDispatcherTest.php @@ -283,7 +283,7 @@ public function testResolveThrowsExceptionWhenResolvableDoesNotImplementMiddlewa public function testResolveThrowsExceptionWithoutContainerAndUnresolvableClass() { $this->expectException(RuntimeException::class); - $this->expectExceptionMessageRegExp('/(Middleware|Callable) Unresolvable::class does not exist/'); + $this->expectExceptionMessage('Unresolvable::class does not exist'); $handler = new MockRequestHandler(); $middlewareDispatcher = $this->createMiddlewareDispatcher($handler, null); @@ -296,7 +296,7 @@ public function testResolveThrowsExceptionWithoutContainerAndUnresolvableClass() public function testResolveThrowsExceptionWithoutContainerNonAdvancedCallableResolverAndUnresolvableClass() { $this->expectException(RuntimeException::class); - $this->expectExceptionMessageRegExp('/(Middleware|Callable) Unresolvable::class does not exist/'); + $this->expectExceptionMessage('Unresolvable::class does not exist'); $unresolvable = 'Unresolvable::class'; From 1acba186b937abe240d98f482db540b8edad90bc Mon Sep 17 00:00:00 2001 From: elazar Date: Mon, 13 Apr 2020 13:24:20 -0500 Subject: [PATCH 2/3] Remove use of PHPUnit 9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0f73c9336..ee597f1c1 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "nyholm/psr7-server": "^0.3.0", "phpspec/prophecy": "^1.10", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^8.5|^9", + "phpunit/phpunit": "^8.5", "slim/http": "^1.0", "slim/psr7": "^1.0", "squizlabs/php_codesniffer": "^3.5" From eeb0947ee256349bfa367f62eeba2d7173c594fd Mon Sep 17 00:00:00 2001 From: elazar Date: Mon, 13 Apr 2020 13:24:30 -0500 Subject: [PATCH 3/3] Use correct assertion methods --- tests/MiddlewareDispatcherTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/MiddlewareDispatcherTest.php b/tests/MiddlewareDispatcherTest.php index 46f82bd98..726744ead 100644 --- a/tests/MiddlewareDispatcherTest.php +++ b/tests/MiddlewareDispatcherTest.php @@ -283,7 +283,7 @@ public function testResolveThrowsExceptionWhenResolvableDoesNotImplementMiddlewa public function testResolveThrowsExceptionWithoutContainerAndUnresolvableClass() { $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('Unresolvable::class does not exist'); + $this->expectExceptionMessageMatches('/(Middleware|Callable) Unresolvable::class does not exist/'); $handler = new MockRequestHandler(); $middlewareDispatcher = $this->createMiddlewareDispatcher($handler, null); @@ -296,7 +296,7 @@ public function testResolveThrowsExceptionWithoutContainerAndUnresolvableClass() public function testResolveThrowsExceptionWithoutContainerNonAdvancedCallableResolverAndUnresolvableClass() { $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('Unresolvable::class does not exist'); + $this->expectExceptionMessageMatches('/(Middleware|Callable) Unresolvable::class does not exist/'); $unresolvable = 'Unresolvable::class';