Merge pull request #70 from samsonasik/update-to-phpunit-10-syntax

Update to latest PHPUnit 10 syntax
laminas · Nov 4, 2024 · 97752be · 97752be
2 parents 4ceb543 + 2c75296
commit 97752be
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="src/Middleware/DoublePassMiddlewareDecorator.php">
     <UnusedClosureParam>
       <code><![CDATA[$response]]></code>
@@ -15,4 +15,20 @@
       <code><![CDATA[ResponseInterface]]></code>
     </PossiblyUnusedReturnValue>
   </file>
+  <file src="test/Exception/ExceptionTest.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[exception]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="test/Middleware/HostMiddlewareDecoratorTest.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[matchingHost]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="test/Middleware/PathMiddlewareDecoratorTest.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[nestedPathCombinations]]></code>
+      <code><![CDATA[rootPathsProvider]]></code>
+    </PossiblyUnusedMethod>
+  </file>
 </files>
diff --git a/test/Exception/ExceptionTest.php b/test/Exception/ExceptionTest.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use Laminas\Stratigility\Exception\ExceptionInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function basename;
@@ -28,9 +29,7 @@ public static function exception(): Generator
         }
     }
 
-    /**
-     * @dataProvider exception
-     */
+    #[DataProvider('exception')]
     public function testExceptionIsInstanceOfExceptionInterface(string $exception): void
     {
         self::assertStringContainsString('Exception', $exception);

diff --git a/test/Middleware/HostMiddlewareDecoratorTest.php b/test/Middleware/HostMiddlewareDecoratorTest.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use Laminas\Stratigility\Middleware\HostMiddlewareDecorator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
@@ -69,9 +70,7 @@ public static function matchingHost(): Generator
         yield ['host.foo', 'hOsT.fOO'];
     }
 
-    /**
-     * @dataProvider matchingHost
-     */
+    #[DataProvider('matchingHost')]
     public function testDelegatesOriginalRequestToDecoratedMiddleware(string $requestHost, string $decoratorHost): void
     {
         $this->uri

diff --git a/test/Middleware/PathMiddlewareDecoratorTest.php b/test/Middleware/PathMiddlewareDecoratorTest.php
@@ -9,6 +9,8 @@
 use Laminas\Diactoros\Uri;
 use Laminas\Stratigility\Middleware\PathMiddlewareDecorator;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
@@ -238,9 +240,7 @@ public static function nestedPathCombinations(): array
         ];
     }
 
-    /**
-     * @dataProvider nestedPathCombinations
-     */
+    #[DataProvider('nestedPathCombinations')]
     public function testNestedMiddlewareOnlyMatchesAtPathBoundaries(
         string $prefix,
         string $nestPrefix,
@@ -302,10 +302,8 @@ public static function rootPathsProvider(): array
         ];
     }
 
-    /**
-     * @group matching
-     * @dataProvider rootPathsProvider
-     */
+    #[DataProvider('rootPathsProvider')]
+    #[Group('matching')]
     public function testTreatsBothSlashAndEmptyPathAsTheRootPath(string $path): void
     {
         $finalHandler = $this->createMock(RequestHandlerInterface::class);

diff --git a/test/MiddlewarePipeTest.php b/test/MiddlewarePipeTest.php
@@ -10,6 +10,7 @@
 use Laminas\Stratigility\IterableMiddlewarePipeInterface;
 use Laminas\Stratigility\MiddlewarePipe;
 use Laminas\Stratigility\MiddlewarePipeInterface;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -50,9 +51,7 @@ private function createFinalHandler(): RequestHandlerInterface
         return $handler;
     }
 
-    /**
-     * @group http-interop
-     */
+    #[Group('http-interop')]
     public function testCanPipeInteropMiddleware(): void
     {
         $handler = $this->createMock(RequestHandlerInterface::class);

diff --git a/test/NextTest.php b/test/NextTest.php
@@ -12,6 +12,7 @@
 use LaminasTest\Stratigility\TestAsset\DelegatingMiddleware;
 use LaminasTest\Stratigility\TestAsset\ShortCircuitingMiddleware;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
@@ -61,9 +62,7 @@ public function createDefaultResponse(): ResponseInterface
         return $this->response;
     }
 
-    /**
-     * @group http-interop
-     */
+    #[Group('http-interop')]
     public function testNextImplementsRequestHandlerInterface(): void
     {
         $next = new Next($this->queue, $this->fallbackHandler);
@@ -114,9 +113,7 @@ public function process(
         $this->assertNotSame($this->response, $response);
     }
 
-    /**
-     * @group http-interop
-     */
+    #[Group('http-interop')]
     public function testNextDelegatesToFallbackHandlerWhenQueueIsEmpty(): void
     {
         $expectedResponse = $this->createMock(ResponseInterface::class);
@@ -130,9 +127,7 @@ public function testNextDelegatesToFallbackHandlerWhenQueueIsEmpty(): void
         $this->assertSame($expectedResponse, $next->handle($this->request));
     }
 
-    /**
-     * @group http-interop
-     */
+    #[Group('http-interop')]
     public function testNextProcessesEnqueuedMiddleware(): void
     {
         $fallbackHandler = $this->createMock(RequestHandlerInterface::class);
@@ -157,9 +152,7 @@ public function testNextProcessesEnqueuedMiddleware(): void
         $this->assertSame($response, $next->handle($this->request));
     }
 
-    /**
-     * @group http-interop
-     */
+    #[Group('http-interop')]
     public function testMiddlewareReturningResponseShortCircuitsProcess(): void
     {
         $fallbackHandler = $this->createMock(RequestHandlerInterface::class);