Merge pull request #1479 from FriendsOfSymfony/MERGE1.71.8

Merge 1.7 into 1.8

Author: GuilhemN

CHANGELOG.md

@@ -49,6 +49,8 @@ CHANGELOG
 1.7.9
 -----
 
+* fixed that the default exclusion strategy groups for the serializer are not the empty string
+
 * fixed a BC break that prevented the `CamelKeysNormalizer` from removing leading underscores
 
 * fixed the `AllowedMethodsRouteLoader` to work with Symfony 3.0

Controller/ExceptionController.php

@@ -132,7 +132,11 @@ public function showAction(Request $request, $exception, DebugLoggerInterface $l
             }
 
             $response = $viewHandler->handle($view);
-        } catch (\Exception $e) {
+        } catch (\Exception $handleException) {
+        } catch (\Throwable $handleException) {
+        }
+
+        if (isset($handleException)) {
             $message = 'An Exception was thrown while handling: ';
             $message .= $this->getExceptionMessage($exception);
             $response = $this->createPlainResponse($message, Codes::HTTP_INTERNAL_SERVER_ERROR, $exception->getHeaders());

Resources/config/view.xml

@@ -6,7 +6,7 @@
 
     <parameters>
         <parameter key="fos_rest.serializer.exclusion_strategy.version" />
-        <parameter key="fos_rest.serializer.exclusion_strategy.groups" type="collection"/>
+        <parameter key="fos_rest.serializer.exclusion_strategy.groups" type="collection" />
         <parameter key="fos_rest.view_handler.jsonp.callback_param"/>
         <parameter key="fos_rest.view.exception_wrapper_handler">FOS\RestBundle\View\ExceptionWrapperHandler</parameter>
         <parameter key="fos_rest.view_handler.default.class">FOS\RestBundle\View\ViewHandler</parameter>