DeprecationMiddlewareTest: removed testDeprecationMethodUsesRequestMethod

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

src/App/src/ConfigProvider.php

@@ -83,6 +83,9 @@ public function getHalConfig(): array
         return [];
     }
 
+    /**
+     * @param class-string $collectionClass
+     */
     public static function getCollection(string $collectionClass, string $route, string $collectionRelation): array
     {
         return [
@@ -93,6 +96,9 @@ public static function getCollection(string $collectionClass, string $route, str
         ];
     }
 
+    /**
+     * @param class-string $resourceClass
+     */
     public static function getResource(
         string $resourceClass,
         string $route,

src/App/src/Handler/AbstractHandler.php

@@ -23,6 +23,8 @@ abstract class AbstractHandler implements RequestHandlerInterface
     protected ?HalResponseFactory $responseFactory  = null;
     protected ?ResourceGenerator $resourceGenerator = null;
 
+    abstract public function handle(ServerRequestInterface $request): ResponseInterface;
+
     public function setResponseFactory(HalResponseFactory $responseFactory): self
     {
         $this->responseFactory = $responseFactory;

src/App/src/Middleware/DeprecationMiddleware.php

@@ -30,7 +30,6 @@
 use function implode;
 use function is_string;
 use function sprintf;
-use function strtoupper;
 
 class DeprecationMiddleware implements MiddlewareInterface
 {
@@ -79,7 +78,7 @@ public function process(
         }
 
         $this->validateAttributes($attributes);
-        $attribute = $this->getAttribute($attributes, $request->getMethod());
+        $attribute = $this->getAttribute($attributes);
         if (null === $attribute) {
             return $response;
         }
@@ -96,17 +95,22 @@ public function process(
         return $response;
     }
 
-    private function getAttribute(array $attributes, string $requestMethod): ?array
+    private function getAttribute(array $attributes): ?array
     {
-        $attribute = array_values(array_filter($attributes, function (array $attribute): bool {
-            return $attribute['deprecationType'] === self::RESOURCE_DEPRECATION_ATTRIBUTE;
-        }))[0] ?? null;
+        $attribute = array_values(
+            array_filter(
+                $attributes,
+                fn (array $attribute): bool => $attribute['deprecationType'] === self::RESOURCE_DEPRECATION_ATTRIBUTE
+            )
+        )[0] ?? null;
 
         if (null === $attribute) {
-            $attribute = array_values(array_filter($attributes, function (array $attr) use ($requestMethod): bool {
-                return $attr['deprecationType'] === self::METHOD_DEPRECATION_ATTRIBUTE &&
-                    strtoupper($attr['identifier']) === strtoupper($requestMethod);
-            }))[0] ?? null;
+            $attribute = array_values(
+                array_filter(
+                    $attributes,
+                    fn (array $attribute): bool => $attribute['deprecationType'] === self::METHOD_DEPRECATION_ATTRIBUTE
+                )
+            )[0] ?? null;
         }
 
         return $attribute;

test/Unit/App/Middleware/DeprecationMiddlewareTest.php

@@ -7,7 +7,6 @@
 use Api\App\Attribute\MethodDeprecation;
 use Api\App\Attribute\ResourceDeprecation;
 use Api\App\Exception\DeprecationConflictException;
-use Api\App\Handler\AbstractHandler;
 use Api\App\Middleware\DeprecationMiddleware as Subject;
 use Core\App\Message;
 use Fig\Http\Message\RequestMethodInterface;
@@ -204,63 +203,6 @@ public function process(
         ]), $response->getHeader('link')[0]);
     }
 
-    /**
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function testDeprecationMethodUsesRequestMethod(): void
-    {
-        $handler = new class extends AbstractHandler {
-            #[MethodDeprecation(
-                sunset: '2038-01-01',
-                link: 'get-test-link',
-                deprecationReason: 'get-test-deprecation-reason',
-                rel: 'get-rel',
-                type: 'get-type',
-            )]
-            public function get(): ResponseInterface
-            {
-                return new EmptyResponse();
-            }
-
-            #[MethodDeprecation(
-                sunset: '2038-01-01',
-                link: 'post-test-link',
-                deprecationReason: 'post-test-deprecation-reason',
-                rel: 'post-rel',
-                type: 'post-type',
-            )]
-            public function post(): ResponseInterface
-            {
-                return new EmptyResponse();
-            }
-        };
-
-        $routeResult           = $this->createMock(RouteResult::class);
-        $route                 = $this->createMock(Route::class);
-        $lazyLoadingMiddleware = new LazyLoadingMiddleware(
-            $this->createMock(MiddlewareContainer::class),
-            $handler::class,
-        );
-
-        $route->method('getMiddleware')->willReturn($lazyLoadingMiddleware);
-        $routeResult->method('isFailure')->willReturn(false);
-        $routeResult->method('getMatchedRoute')->willReturn($route);
-        $this->request->method('getAttribute')->with(RouteResult::class)->willReturn($routeResult);
-        $this->request->method('getMethod')->willReturn(RequestMethodInterface::METHOD_POST);
-        $this->handler->method('handle')->with($this->request)->willReturn($this->response);
-
-        $response = $this->subject->process($this->request, $this->handler);
-
-        $this->assertTrue($response->hasHeader('sunset'));
-        $this->assertTrue($response->hasHeader('link'));
-        $this->assertSame('2038-01-01', $response->getHeader('sunset')[0]);
-        $this->assertSame($this->formatLink('post-test-link', [
-            'rel'  => 'post-rel',
-            'type' => 'post-type',
-        ]), $response->getHeader('link')[0]);
-    }
-
     /**
      * @throws ReflectionException
      * @throws Exception