Merge branch '2.x' into 3.0

* 2.x:
  fix RequestBodyParamConverter tests
  Fix requests without content type
  do not implement (possibly) not available interface
  improve route loader upgrade instructions

Author: xabbuh

CHANGELOG.md

@@ -121,6 +121,12 @@ CHANGELOG
   * `FOS\RestBundle\View\View`
   * `FOS\RestBundle\View\ViewHandler`
 
+2.8.1
+-----
+
+* `FlattenExceptionNormalizer` does no longer implement the `CacheableSupportsMethodInterface` to
+  ensure compatibility with older versions of the Symfony Serializer component
+
 2.8.0
 -----
 
@@ -150,8 +156,34 @@ CHANGELOG
        routing_loader: false
    ```
 
-   You need to configure your routes explicitly or consider using the
-   [RestRoutingBundle](https://github.com/handcraftedinthealps/RestRoutingBundle).
+   You need to configure your routes explicitly, e.g. using the Symfony Core annotations or the FOSRestBundle
+   shortcuts like `FOS\RestBundle\Controller\Annotations\Get`. You can use
+   `bin/console debug:router --show-controllers` to help with the migration and compare routes before and after it.
+   Change the routing loading:
+
+   Before:
+   ```
+   Acme\Controller\TestController:
+       type: rest
+       resource: Acme\Controller\TestController
+   ```
+
+   After:
+   ```
+   Acme\Controller\TestController:
+       type: annotation
+       resource: Acme\Controller\TestController
+   ```
+
+   When using the Symfony Core route loading, route names might change as the FOSRestBundle used a different naming
+   convention. Mind the `.{_format}` suffix if you used the `fos_rest.routing_loader.include_format` option.
+
+   In case you have OpenAPI/Swagger annotations, you can also use [OpenAPI-Symfony-Routing](https://github.com/Tobion/OpenAPI-Symfony-Routing)
+   which removes the need to have routing information duplicated. It also allows to add the `.{_format}` suffix automatically as before.
+
+   If migration to explicit routes is not possible or feasible, consider using
+   [RestRoutingBundle](https://github.com/handcraftedinthealps/RestRoutingBundle) which extracted the auto-generation of routes
+   in a BC way.
 * deprecated support for serializing exceptions, disable it by setting the `serialize_exceptions`
   option to false:
 

Request/RequestBodyParamConverter.php

@@ -76,11 +76,16 @@ public function apply(Request $request, ParamConverter $configuration): bool
         }
         $this->configureContext($context = new Context(), $arrayContext);
 
+        $format = $request->getContentType();
+        if (null === $format) {
+            return $this->throwException(new UnsupportedMediaTypeHttpException(), $configuration);
+        }
+
         try {
             $object = $this->serializer->deserialize(
                 $request->getContent(),
                 $configuration->getClass(),
-                $request->getContentType(),
+                $format,
                 $context
             );
         } catch (UnsupportedFormatException $e) {

Serializer/Normalizer/FlattenExceptionNormalizer.php

@@ -14,15 +14,14 @@
 use FOS\RestBundle\Util\ExceptionValueMap;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @author Christian Flothmann <[email protected]>
  *
  * @internal
  */
-final class FlattenExceptionNormalizer implements CacheableSupportsMethodInterface, NormalizerInterface
+final class FlattenExceptionNormalizer implements NormalizerInterface
 {
     private $messagesMap;
     private $debug;
@@ -76,9 +75,4 @@ public function supportsNormalization($data, $format = null)
     {
         return $data instanceof FlattenException;
     }
-
-    public function hasCacheableSupportsMethod(): bool
-    {
-        return true;
-    }
 }

Tests/Request/RequestBodyParamConverterTest.php

@@ -134,7 +134,7 @@ public function testRequestAttribute()
              ->expects($this->once())
              ->method('deserialize')
              ->willReturn('Object');
-        $request = $this->createRequest();
+        $request = $this->createRequest(null, 'application/json');
         $this->launchExecution($converter, $request);
         $this->assertEquals('Object', $request->attributes->get('foo'));
     }
@@ -155,7 +155,7 @@ public function testValidatorParameters()
 
         $converter = new RequestBodyParamConverter($this->serializer, null, null, $validator, 'errors');
 
-        $request = $this->createRequest();
+        $request = $this->createRequest(null, 'application/json');
         $configuration = $this->createConfiguration('FooClass', null, ['validator' => ['groups' => ['foo']]]);
         $this->launchExecution($converter, $request, $configuration);
         $this->assertEquals('fooError', $request->attributes->get('errors'));
@@ -175,7 +175,7 @@ public function testValidatorSkipping()
 
         $converter = new RequestBodyParamConverter($this->serializer, null, null, $validator, 'errors');
 
-        $request = $this->createRequest();
+        $request = $this->createRequest(null, 'application/json');
         $configuration = $this->createConfiguration('FooClass', null, ['validate' => false]);
         $this->launchExecution($converter, $request, $configuration);
         $this->assertNull($request->attributes->get('errors'));
@@ -248,6 +248,14 @@ public function testSupportsWithNoClass()
         $this->assertFalse($converter->supports($this->createConfiguration(null, 'post')));
     }
 
+    public function testNoContentTypeCausesUnsupportedMediaTypeException()
+    {
+        $converter = new RequestBodyParamConverter($this->serializer);
+        $request = $this->createRequest();
+        $this->expectException(UnsupportedMediaTypeHttpException::class);
+        $this->launchExecution($converter, $request);
+    }
+
     protected function launchExecution($converter, $request = null, $configuration = null)
     {
         if (null === $request) {

UPGRADING-3.0.md

@@ -9,8 +9,34 @@ Upgrading From 2.x To 3.0
        routing_loader: false
    ```
 
-   You need to configure your routes explicitly or consider using the
-   [RestRoutingBundle](https://github.com/handcraftedinthealps/RestRoutingBundle).
+   You need to configure your routes explicitly, e.g. using the Symfony Core annotations or the FOSRestBundle
+   shortcuts like `FOS\RestBundle\Controller\Annotations\Get`. You can use
+   `bin/console debug:router --show-controllers` to help with the migration and compare routes before and after it.
+   Change the routing loading:
+
+   Before:
+   ```
+   Acme\Controller\TestController:
+       type: rest
+       resource: Acme\Controller\TestController
+   ```
+
+   After:
+   ```
+   Acme\Controller\TestController:
+       type: annotation
+       resource: Acme\Controller\TestController
+   ```
+
+   When using the Symfony Core route loading, route names might change as the FOSRestBundle used a different naming
+   convention. Mind the `.{_format}` suffix if you used the `fos_rest.routing_loader.include_format` option.
+
+   In case you have OpenAPI/Swagger annotations, you can also use [OpenAPI-Symfony-Routing](https://github.com/Tobion/OpenAPI-Symfony-Routing)
+   which removes the need to have routing information duplicated. It also allows to add the `.{_format}` suffix automatically as before.
+
+   If migration to explicit routes is not possible or feasible, consider using
+   [RestRoutingBundle](https://github.com/handcraftedinthealps/RestRoutingBundle) which extracted the auto-generation of routes
+   in a BC way.
 
  * Support for serializing exceptions has been removed. Setting the
  `fos_rest.exception.serialize_exceptions` option to anything else than `false` leads to an exception.