Exception handler move to a service

Author: tyx

Controller/ExceptionController.php

@@ -41,7 +41,7 @@ class ExceptionController extends ContainerAware
     protected function createExceptionWrapper(array $parameters)
     {
         /** @var ExceptionWrapperHandlerInterface $exceptionWrapperHandler */
-        $exceptionWrapperHandler = $this->container->get('fos_rest.view.exception_wrapper_handler');
+        $exceptionWrapperHandler = $this->container->get('fos_rest.exception_handler');
 
         return $exceptionWrapperHandler->wrap($parameters);
     }

DependencyInjection/Configuration.php

@@ -76,6 +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('inflector')->defaultValue('fos_rest.inflector.doctrine')->end()
                         ->scalarNode('validator')->defaultValue('validator')->end()
                     ->end()
@@ -144,7 +145,6 @@ 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')->defaultValue('FOS\RestBundle\View\ExceptionWrapperHandler')->end()
                         ->booleanNode('serialize_null')->defaultFalse()->end()
                         ->arrayNode('jsonp_handler')
                             ->canBeUnset()

DependencyInjection/FOSRestExtension.php

@@ -184,10 +184,6 @@ 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.view.exception_wrapper_handler" />
+        <parameter key="fos_rest.exception_handler.default.class">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,7 +41,8 @@
             <argument>%fos_rest.view_handler.jsonp.callback_param%</argument>
         </service>
 
-        <service id="fos_rest.view.exception_wrapper_handler" class="%fos_rest.view.exception_wrapper_handler%" />
+        <service id="fos_rest.exception_handler.default" class="%fos_rest.exception_handler.default.class%" public="false">
+        </service>
 
         <service id="fos_rest.serializer.exception_wrapper_serialize_handler" class="%fos_rest.serializer.exception_wrapper_serialize_handler.class%">
             <tag name="jms_serializer.subscribing_handler" />

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -172,6 +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');
     }
 
     public function testLoadFormatsWithDefaults()
@@ -559,16 +560,6 @@ 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
      */

Tests/View/ViewHandlerTest.php

@@ -209,7 +209,7 @@ public function testShouldReturnErrorResponseWhenDataContainsFormAndFormIsNotVal
         ;
 
         $container->set('fos_rest.serializer', $serializer);
-        $container->set('fos_rest.view.exception_wrapper_handler', new ExceptionWrapperHandler());
+        $container->set('fos_rest.exception_handler', new ExceptionWrapperHandler());
 
         //test
         $viewHandler = new ViewHandler(null, $expectedFailedValidationCode = Codes::HTTP_I_AM_A_TEAPOT);
@@ -309,15 +309,15 @@ private function setupMockedSerializer($container, $expected)
             ->method('get')
             ->with($this->logicalOr(
                   $this->equalTo('fos_rest.serializer'),
-                  $this->equalTo('fos_rest.view.exception_wrapper_handler')
+                  $this->equalTo('fos_rest.exception_handler')
               ))
             ->will(
                   $this->returnCallback(
                       function ($method) use ($serializer) {
                             switch ($method) {
                                 case 'fos_rest.serializer':
                                     return $serializer;
-                                case 'fos_rest.view.exception_wrapper_handler':
+                                case 'fos_rest.exception_handler':
                                     return new ExceptionWrapperHandler();
                             }
                       }

View/ViewHandler.php

@@ -500,7 +500,7 @@ private function getDataFromView(View $view)
         }
 
         /** @var ExceptionWrapperHandlerInterface $exceptionWrapperHandler */
-        $exceptionWrapperHandler = $this->container->get('fos_rest.view.exception_wrapper_handler');
+        $exceptionWrapperHandler = $this->container->get('fos_rest.exception_handler');
 
         return $exceptionWrapperHandler->wrap(
             array(