Upgrade to phpunit 12

Author: Tom Mitchelmore

composer.json

@@ -30,7 +30,7 @@
         "mockery/mockery": "^1.4.3",
         "php-coveralls/php-coveralls": "^2.4",
         "php-di/php-di": "^7.1.1",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^12",
         "rector/rector": "^2.1",
         "squizlabs/php_codesniffer": "^3.6.0"
     },

phpunit.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <testsuites>
     <testsuite name="Rareloop Router Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

tests/ControllerMiddlewareOptionsTest.php

@@ -2,12 +2,13 @@
 
 namespace Rareloop\Router\Test;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Rareloop\Router\ControllerMiddlewareOptions;
 
 class ControllerMiddlewareOptionsTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function by_default_no_methods_are_excluded()
     {
         $options = new ControllerMiddlewareOptions;
@@ -16,15 +17,15 @@ public function by_default_no_methods_are_excluded()
         $this->assertFalse($options->excludedForMethod('bar'));
     }
 
-    /** @test */
+    #[Test]
     public function only_is_chainable()
     {
         $options = new ControllerMiddlewareOptions;
 
         $this->assertSame($options, $options->only('foo'));
     }
 
-    /** @test */
+    #[Test]
     public function can_use_only_to_limit_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -35,7 +36,7 @@ public function can_use_only_to_limit_methods()
         $this->assertTrue($options->excludedForMethod('bar'));
     }
 
-    /** @test */
+    #[Test]
     public function can_use_only_to_limit_multiple_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -47,15 +48,15 @@ public function can_use_only_to_limit_multiple_methods()
         $this->assertTrue($options->excludedForMethod('baz'));
     }
 
-    /** @test */
+    #[Test]
     public function except_is_chainable()
     {
         $options = new ControllerMiddlewareOptions;
 
         $this->assertSame($options, $options->except('foo'));
     }
 
-    /** @test */
+    #[Test]
     public function can_use_except_to_limit_methods()
     {
         $options = new ControllerMiddlewareOptions;
@@ -66,7 +67,7 @@ public function can_use_except_to_limit_methods()
         $this->assertFalse($options->excludedForMethod('bar'));
     }
 
-    /** @test */
+    #[Test]
     public function can_use_except_to_limit_multiple_methods()
     {
         $options = new ControllerMiddlewareOptions;

tests/ControllerMiddlewareTest.php

@@ -6,10 +6,11 @@
 use Rareloop\Router\ControllerMiddleware;
 use Rareloop\Router\ControllerMiddlewareOptions;
 use Rareloop\Router\Test\Middleware\AddHeaderMiddleware;
+use PHPUnit\Framework\Attributes\Test;
 
 class ControllerMiddlewareTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function can_retrieve_middleware()
     {
         $middleware = new AddHeaderMiddleware('X-Header', 'testing123');
@@ -20,7 +21,7 @@ public function can_retrieve_middleware()
         $this->assertSame($middleware, $controllerMiddleware->middleware());
     }
 
-    /** @test */
+    #[Test]
     public function can_retrieve_options()
     {
         $middleware = new AddHeaderMiddleware('X-Header', 'testing123');

tests/ControllerTest.php

@@ -11,10 +11,11 @@
 use Rareloop\Router\Test\Controllers\MiddlewareProvidingController;
 use Rareloop\Router\Test\Middleware\AddHeaderMiddleware;
 use Laminas\Diactoros\ServerRequest;
+use PHPUnit\Framework\Attributes\Test;
 
 class ControllerTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function can_add_single_middleware_via_controller()
     {
         $container = new \DI\Container();
@@ -36,7 +37,7 @@ public function can_add_single_middleware_via_controller()
         $this->assertSame('testing123', $response->getHeader('X-Header')[0]);
     }
 
-    /** @test */
+    #[Test]
     public function can_resolve_middleware_on_a_controller_using_custom_resolver()
     {
         $container = new \DI\Container();
@@ -59,7 +60,7 @@ public function can_resolve_middleware_on_a_controller_using_custom_resolver()
         $this->assertSame('testing123', $response->getHeader('X-Header')[0]);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_multiple_middleware_as_array_via_controller()
     {
         $container = new \DI\Container();
@@ -86,7 +87,7 @@ public function can_add_multiple_middleware_as_array_via_controller()
         $this->assertSame('testing456', $response->getHeader('X-Header-2')[0]);
     }
 
-    /** @test */
+    #[Test]
     public function controller_middleware_method_returns_options()
     {
         $controller = new MiddlewareProvidingController;
@@ -96,7 +97,7 @@ public function controller_middleware_method_returns_options()
         $this->assertInstanceOf(ControllerMiddlewareOptions::class, $options);
     }
 
-    /** @test */
+    #[Test]
     public function middleware_can_be_limited_to_methods_using_only()
     {
         $container = new \DI\Container();
@@ -115,7 +116,7 @@ public function middleware_can_be_limited_to_methods_using_only()
         $this->assertMiddlewareIsAppliedToMethods($router, $middlewareAppliedToMethods);
     }
 
-    /** @test */
+    #[Test]
     public function middleware_can_be_limited_to_multiple_methods_using_only()
     {
         $container = new \DI\Container();
@@ -134,7 +135,7 @@ public function middleware_can_be_limited_to_multiple_methods_using_only()
         $this->assertMiddlewareIsAppliedToMethods($router, $middlewareAppliedToMethods);
     }
 
-    /** @test */
+    #[Test]
     public function middleware_can_be_limited_to_methods_using_except()
     {
         $container = new \DI\Container();
@@ -153,7 +154,7 @@ public function middleware_can_be_limited_to_methods_using_except()
         $this->assertMiddlewareIsAppliedToMethods($router, $middlewareAppliedToMethods);
     }
 
-    /** @test */
+    #[Test]
     public function middleware_can_be_limited_to_multiple_methods_using_except()
     {
         $container = new \DI\Container();

tests/FormattingTest.php

@@ -4,50 +4,51 @@
 
 use PHPUnit\Framework\TestCase;
 use Rareloop\Router\Helpers\Formatting;
+use PHPUnit\Framework\Attributes\Test;
 
 class FormattingTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function can_remove_trialing_slash()
     {
         $string = 'string/';
 
         $this->assertSame('string', Formatting::removeTrailingSlash($string));
     }
 
-    /** @test */
+    #[Test]
     public function can_add_trialing_slash()
     {
         $string = 'string';
 
         $this->assertSame('string/', Formatting::addTrailingSlash($string));
     }
 
-    /** @test */
+    #[Test]
     public function add_trialing_slash_does_not_produce_duplicates()
     {
         $string = 'string/';
 
         $this->assertSame('string/', Formatting::addTrailingSlash($string));
     }
 
-    /** @test */
+    #[Test]
     public function can_remove_leading_slash()
     {
         $string = '/string';
 
         $this->assertSame('string', Formatting::removeLeadingSlash($string));
     }
 
-    /** @test */
+    #[Test]
     public function can_add_leading_slash()
     {
         $string = 'string';
 
         $this->assertSame('/string', Formatting::addLeadingSlash($string));
     }
 
-    /** @test */
+    #[Test]
     public function add_leading_slash_does_not_produce_duplicates()
     {
         $string = '/string';

tests/ResponseFactoryTest.php

@@ -10,6 +10,7 @@
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\TextResponse;
 use Laminas\Diactoros\ServerRequest;
+use PHPUnit\Framework\Attributes\Test;
 
 class ResponseFactoryTest extends TestCase
 {
@@ -24,15 +25,15 @@ public function setUp(): void
         $this->request = new ServerRequest([], [], '/test/123', 'GET');
     }
 
-    /** @test */
+    #[Test]
     public function when_passed_a_response_instance_the_same_object_is_returned()
     {
         $response = new TextResponse('Testing', 200);
 
         $this->assertSame($response, ResponseFactory::create($this->request, $response));
     }
 
-    /** @test */
+    #[Test]
     public function when_passed_a_non_response_instance_a_response_object_is_returned()
     {
         $response = ResponseFactory::create($this->request, 'Testing');
@@ -41,15 +42,15 @@ public function when_passed_a_non_response_instance_a_response_object_is_returne
         $this->assertSame('Testing', $response->getBody()->getContents());
     }
 
-    /** @test */
+    #[Test]
     public function when_nothing_is_passed_an_empty_response_object_is_returned()
     {
         $response = ResponseFactory::create($this->request);
 
         $this->assertInstanceOf(EmptyResponse::class, $response);
     }
 
-    /** @test */
+    #[Test]
     public function when_a_responsable_object_is_passed_the_response_object_is_returned()
     {
         $textResponse = new TextResponse('testing123');

tests/RouteGroupTest.php

@@ -6,18 +6,19 @@
 use Rareloop\Router\Route;
 use Rareloop\Router\RouteGroup;
 use Rareloop\Router\Router;
+use PHPUnit\Framework\Attributes\Test;
 
 class RouteGroupTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function group_function_is_chainable()
     {
         $router = new Router;
 
         $this->assertInstanceOf(Router::class, $router->group('test/123', function () {}));
     }
 
-    /** @test */
+    #[Test]
     public function can_add_get_request_to_a_group()
     {
         $router = new Router;
@@ -35,7 +36,7 @@ public function can_add_get_request_to_a_group()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_request_to_a_group_with_leading_slash()
     {
         $router = new Router;
@@ -53,7 +54,7 @@ public function can_add_request_to_a_group_with_leading_slash()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_post_request_to_a_group()
     {
         $router = new Router;
@@ -71,7 +72,7 @@ public function can_add_post_request_to_a_group()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_put_request_to_a_group()
     {
         $router = new Router;
@@ -89,7 +90,7 @@ public function can_add_put_request_to_a_group()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_patch_request_to_a_group()
     {
         $router = new Router;
@@ -107,7 +108,7 @@ public function can_add_patch_request_to_a_group()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_delete_request_to_a_group()
     {
         $router = new Router;
@@ -125,7 +126,7 @@ public function can_add_delete_request_to_a_group()
         $this->assertSame(1, $count);
     }
 
-    /** @test */
+    #[Test]
     public function can_add_options_request_to_a_group()
     {
         $router = new Router;