cr remarks 2

Author: konradoboza

src/bundle/EventListener/SupportedMediaTypesSubscriber.php

@@ -39,12 +39,16 @@ public function allowOnlySupportedMediaTypes(RequestEvent $event): void
             return;
         }
 
-        $contentTypeHeader = $request->headers->get('Content-Type') ?? '';
+        $acceptHeader = $request->headers->get('Accept') ?? '';
 
-        preg_match(self::SUPPORTED_MEDIA_TYPES_REGEX, $contentTypeHeader, $matches);
+        preg_match(self::SUPPORTED_MEDIA_TYPES_REGEX, $acceptHeader, $matches);
 
         $match = reset($matches);
-        if ($match !== false && in_array($match, $supportedMediaTypes, true)) {
+        if ($match === false) {
+            return;
+        }
+
+        if (in_array($match, $supportedMediaTypes, true)) {
             return;
         }
 

tests/bundle/EventListener/SupportedMediaTypesSubscriberTest.php

@@ -56,7 +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.ContentCreate+json',
+            'Accept' => 'application/vnd.ibexa.api.ContentCreate+json',
         ]);
 
         $subscriber = new SupportedMediaTypesSubscriber();
@@ -67,12 +67,12 @@ public function testDoesNothingWhenMediaTypeIsSupported(): void
         self::expectNotToPerformAssertions();
     }
 
-    public function testThrowsExceptionWhenContentTypeHeaderTypeIsNotSupported(): void
+    public function testThrowsExceptionWhenHeaderTypeIsNotSupported(): void
     {
         $request = new Request();
         $request->attributes->set('supported_media_types', ['json']);
         $request->headers = new HeaderBag([
-            'Content-Type' => 'application/vnd.ibexa.api.ContentCreate+xml',
+            'Accept' => 'application/vnd.ibexa.api.ContentCreate+xml',
         ]);
 
         $subscriber = new SupportedMediaTypesSubscriber();
@@ -87,7 +87,7 @@ 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();
@@ -96,4 +96,20 @@ public function testThrowsExceptionWhenUnknownMediaTypeIsUsed(): void
         $this->expectException(UnsupportedMediaTypeHttpException::class);
         $subscriber->allowOnlySupportedMediaTypes($event);
     }
+
+    public function testApplicationJsonHeaderIsSupported(): void
+    {
+        $request = new Request();
+        $request->attributes->set('supported_media_types', ['json']);
+        $request->headers = new HeaderBag([
+            'Accept' => 'application/json',
+        ]);
+
+        $subscriber = new SupportedMediaTypesSubscriber();
+        $event = new RequestEvent($this->kernel, $request, HttpKernelInterface::MAIN_REQUEST);
+
+        $subscriber->allowOnlySupportedMediaTypes($event);
+
+        self::expectNotToPerformAssertions();
+    }
 }