cr remarks 3

Author: konradoboza

phpstan-baseline.neon

@@ -792,12 +792,6 @@ parameters:
 			count: 1
 			path: src/lib/Input/Handler/Json.php
 
-		-
-			message: '#^Argument of an invalid type \(DOMNamedNodeMap&iterable\<DOMAttr\>\)\|null supplied for foreach, only iterables are supported\.$#'
-			identifier: foreach.nonIterable
-			count: 1
-			path: src/lib/Input/Handler/Xml.php
-
 		-
 			message: '#^Cannot assign new offset to array\|string\.$#'
 			identifier: offsetAssign.dimType

src/bundle/EventListener/SupportedMediaTypesSubscriber.php

@@ -8,6 +8,7 @@
 
 namespace Ibexa\Bundle\Rest\EventListener;
 
+use RuntimeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -39,16 +40,24 @@ 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, $acceptHeader, $matches);
+        try {
+            $isContentTypeHeaderSupported = $this->isMediaTypeSupported(
+                $contentTypeHeader,
+                $supportedMediaTypes
+            );
 
-        $match = reset($matches);
-        if ($match === false) {
-            return;
-        }
+            $isAcceptHeaderSupported = $this->isMediaTypeSupported(
+                $acceptHeader,
+                $supportedMediaTypes
+            );
 
-        if (in_array($match, $supportedMediaTypes, true)) {
+            if ($isContentTypeHeaderSupported && $isAcceptHeaderSupported) {
+                return;
+            }
+        } catch (RuntimeException $e) {
             return;
         }
 
@@ -61,4 +70,24 @@ public function allowOnlySupportedMediaTypes(RequestEvent $event): void
             Response::HTTP_UNSUPPORTED_MEDIA_TYPE
         );
     }
+
+    /**
+     * @param string[] $supportedMediaTypes
+     */
+    private function isMediaTypeSupported(
+        string $header,
+        array $supportedMediaTypes
+    ): bool {
+        preg_match(self::SUPPORTED_MEDIA_TYPES_REGEX, $header, $matches);
+
+        $match = reset($matches);
+        if ($match === false) {
+            throw new RuntimeException(sprintf(
+                'Failed to extract media type from header: %s',
+                $header
+            ));
+        }
+
+        return in_array($match, $supportedMediaTypes, true);
+    }
 }

tests/bundle/EventListener/SupportedMediaTypesSubscriberTest.php

@@ -56,6 +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',
         ]);
 
@@ -72,6 +73,7 @@ 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',
         ]);
 
@@ -87,6 +89,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',
         ]);
 
@@ -97,11 +100,28 @@ public function testThrowsExceptionWhenUnknownMediaTypeIsUsed(): void
         $subscriber->allowOnlySupportedMediaTypes($event);
     }
 
+    public function testThrowsExceptionWhenDifferentMediaTypesInHeadersAreUsed(): void
+    {
+        $request = new Request();
+        $request->attributes->set('supported_media_types', ['json']);
+        $request->headers = new HeaderBag([
+            'Content-Type' => 'application/vnd.ibexa.api.ContentCreate+json',
+            '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 testApplicationJsonHeaderIsSupported(): void
     {
         $request = new Request();
         $request->attributes->set('supported_media_types', ['json']);
         $request->headers = new HeaderBag([
+            'Content-Type' => 'application/json',
             'Accept' => 'application/json',
         ]);