undo BC breaks

Author: lsmith77

DependencyInjection/Configuration.php

@@ -76,7 +76,7 @@ public function getConfigTreeBuilder()
                         ->scalarNode('templating')->defaultValue('templating')->end()
                         ->scalarNode('serializer')->defaultNull()->end()
                         ->scalarNode('view_handler')->defaultValue('fos_rest.view_handler.default')->end()
-                        ->scalarNode('exception_handler')->defaultValue('fos_rest.exception_handler.default')->end()
+                        ->scalarNode('exception_handler')->defaultValue('fos_rest.view.exception_wrapper_handler')->end()
                         ->scalarNode('inflector')->defaultValue('fos_rest.inflector.doctrine')->end()
                         ->scalarNode('validator')->defaultValue('validator')->end()
                     ->end()
@@ -145,6 +145,7 @@ private function addViewSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->scalarNode('failed_validation')->defaultValue(Codes::HTTP_BAD_REQUEST)->end()
                         ->scalarNode('empty_content')->defaultValue(Codes::HTTP_NO_CONTENT)->end()
+                        ->scalarNode('exception_wrapper_handler')->defaultNull()->end()
                         ->booleanNode('serialize_null')->defaultFalse()->end()
                         ->arrayNode('jsonp_handler')
                             ->canBeUnset()

DependencyInjection/FOSRestExtension.php

@@ -184,6 +184,10 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        if (!empty($config['view']['exception_wrapper_handler'])) {
+            $container->setParameter($this->getAlias().'.view.exception_wrapper_handler', $config['view']['exception_wrapper_handler']);
+        }
+
         if (!empty($config['view']['jsonp_handler'])) {
             $handler = new DefinitionDecorator($config['service']['view_handler']);
             $handler->setPublic(true);

Resources/config/view.xml

@@ -8,7 +8,7 @@
         <parameter key="fos_rest.serializer.exclusion_strategy.version" />
         <parameter key="fos_rest.serializer.exclusion_strategy.groups"/>
         <parameter key="fos_rest.view_handler.jsonp.callback_param"/>
-        <parameter key="fos_rest.exception_handler.default.class">FOS\RestBundle\View\ExceptionWrapperHandler</parameter>
+        <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>
         <parameter key="fos_rest.view_handler.jsonp.class">FOS\RestBundle\View\JsonpHandler</parameter>
         <parameter key="fos_rest.serializer.exception_wrapper_serialize_handler.class">FOS\RestBundle\Serializer\ExceptionWrapperSerializeHandler</parameter>
@@ -41,8 +41,7 @@
             <argument>%fos_rest.view_handler.jsonp.callback_param%</argument>
         </service>
 
-        <service id="fos_rest.exception_handler.default" class="%fos_rest.exception_handler.default.class%" public="false">
-        </service>
+        <service id="fos_rest.view.exception_wrapper_handler" class="%fos_rest.view.exception_wrapper_handler%"/>
 
         <service id="fos_rest.serializer.exception_wrapper_serialize_handler" class="%fos_rest.serializer.exception_wrapper_serialize_handler.class%">
             <tag name="jms_serializer.subscribing_handler" />

Resources/doc/configuration-reference.rst

@@ -52,7 +52,7 @@ Full default configuration
             view_response_listener:  false
             failed_validation:    400
             empty_content:        204
-            exception_wrapper_handler:  FOS\RestBundle\View\ExceptionWrapperHandler
+            exception_wrapper_handler:  null
             serialize_null:       false
             jsonp_handler:
                 callback_param:       callback

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -172,7 +172,7 @@ public function testLoadServicesWithDefaults()
         $this->extension->load(array(), $this->container);
 
         $this->assertAlias('fos_rest.view_handler.default', 'fos_rest.view_handler');
-        $this->assertAlias('fos_rest.exception_handler.default', 'fos_rest.exception_handler');
+        $this->assertAlias('fos_rest.view.exception_wrapper_handler', 'fos_rest.exception_handler');
     }
 
     public function testLoadFormatsWithDefaults()
@@ -560,6 +560,16 @@ public function testCheckViewHandlerWithJsonp()
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\DefinitionDecorator', $viewHandler);
     }
 
+    public function testCheckExceptionWrapperHandler()
+    {
+        $this->extension->load(array(), $this->container);
+
+        $this->assertTrue($this->container->has('fos_rest.view.exception_wrapper_handler'));
+
+        $exceptionWrapperHandler = $this->container->getDefinition('fos_rest.view.exception_wrapper_handler');
+        $this->assertEquals('%fos_rest.view.exception_wrapper_handler%', $exceptionWrapperHandler->getClass());
+    }
+
     /**
      * @expectedException \LogicException
      */