cr remarks

Author: konradoboza

src/bundle/EventListener/SupportedMediaTypesSubscriber.php

@@ -16,7 +16,7 @@
 
 final class SupportedMediaTypesSubscriber implements EventSubscriberInterface
 {
-    private const SUPPORTED_MEDIA_TYPES_PATTERN = '(^application/vnd\.ibexa\.api(\.[A-Za-z]+)+\+%s$)';
+    private const SUPPORTED_MEDIA_TYPES_REGEX = '/(?<=\+)[A-Za-z0-9]+/';
 
     public static function getSubscribedEvents(): array
     {
@@ -35,33 +35,26 @@ public function allowOnlySupportedMediaTypes(RequestEvent $event): void
         }
 
         $supportedMediaTypes = $request->attributes->get('supported_media_types');
-        $regexps = array_map(
-            static fn (string $mediaType): string => sprintf(
-                self::SUPPORTED_MEDIA_TYPES_PATTERN,
-                strtolower($mediaType)
-            ),
-            $supportedMediaTypes
-        );
+        if (empty($supportedMediaTypes)) {
+            return;
+        }
 
         $contentTypeHeader = $request->headers->get('Content-Type') ?? '';
-        $acceptHeader = $request->headers->get('Accept') ?? '';
 
-        foreach ($regexps as $regexp) {
-            if (
-                preg_match($regexp, $contentTypeHeader) === 1
-                || preg_match($regexp, $acceptHeader) === 1
-            ) {
-                break;
-            }
+        preg_match(self::SUPPORTED_MEDIA_TYPES_REGEX, $contentTypeHeader, $matches);
 
-            throw new UnsupportedMediaTypeHttpException(
-                sprintf(
-                    'Unsupported media type was used. Available ones are: %s',
-                    implode(', ', $supportedMediaTypes)
-                ),
-                null,
-                Response::HTTP_UNSUPPORTED_MEDIA_TYPE
-            );
+        $match = reset($matches);
+        if ($match !== false && in_array($match, $supportedMediaTypes, true)) {
+            return;
         }
+
+        throw new UnsupportedMediaTypeHttpException(
+            sprintf(
+                'Unsupported media type was used. Available ones are: %s',
+                implode(', ', $supportedMediaTypes)
+            ),
+            null,
+            Response::HTTP_UNSUPPORTED_MEDIA_TYPE
+        );
     }
 }

tests/bundle/EventListener/SupportedMediaTypesSubscriberTest.php

@@ -48,7 +48,6 @@ public function testDoesNothingWhenSupportedMediaTypesParameterIsEmpty(): void
         $event = new RequestEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST);
 
         $subscriber->allowOnlySupportedMediaTypes($event);
-
         self::expectNotToPerformAssertions();
     }
 
@@ -57,8 +56,7 @@ public function testDoesNothingWhenMediaTypeIsSupported(): void
         $request = new Request();
         $request->attributes->set('supported_media_types', ['json', 'xml']);
         $request->headers = new HeaderBag([
-            'Content-Type' => 'application/vnd.ibexa.api.ContentCreat+json',
-            'Accept' => 'application/vnd.ibexa.api.ContentCreat+json',
+            'Content-Type' => 'application/vnd.ibexa.api.ContentCreate+json',
         ]);
 
         $subscriber = new SupportedMediaTypesSubscriber();
@@ -84,28 +82,12 @@ public function testThrowsExceptionWhenContentTypeHeaderTypeIsNotSupported(): vo
         $subscriber->allowOnlySupportedMediaTypes($event);
     }
 
-    public function testThrowsExceptionWhenAcceptHeaderTypeIsNotSupported(): void
-    {
-        $request = new Request();
-        $request->attributes->set('supported_media_types', ['json']);
-        $request->headers = new HeaderBag([
-            'Accept' => 'application/vnd.ibexa.api.ContentCreate+xml',
-        ]);
-
-        $subscriber = new SupportedMediaTypesSubscriber();
-        $event = new RequestEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST);
-
-        $this->expectException(UnsupportedMediaTypeHttpException::class);
-        $subscriber->allowOnlySupportedMediaTypes($event);
-    }
-
     public function testThrowsExceptionWhenUnknownMediaTypeIsUsed(): void
     {
         $request = new Request();
         $request->attributes->set('supported_media_types', ['yaml']);
         $request->headers = new HeaderBag([
             'Content-Type' => 'application/vnd.ibexa.api.ContentCreate+unknown',
-            'Accept' => 'application/vnd.ibexa.api.ContentCreate+unknown',
         ]);
 
         $subscriber = new SupportedMediaTypesSubscriber();