refactored view_response_listener configuration, added tests

Author: lsmith77

DependencyInjection/Configuration.php

@@ -26,8 +26,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    public static $forceOptionValues = array(false, true, 'force');
-
     /**
      * Generates the configuration tree.
      *
@@ -170,16 +168,14 @@ private function addViewSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->arrayNode('view_response_listener')
                             ->beforeNormalization()
-                                ->ifString()->then(function($v) { return array('enabled' => true, 'mode' => $v); })
-                            ->end()
-                            ->validate()
-                                ->ifTrue(function ($v) { return !in_array($v['mode'], Configuration::$forceOptionValues); })
-                                ->thenInvalid('The view_response_listener "mode" does not support %s. Please choose one of '.json_encode(Configuration::$forceOptionValues))
+                                ->ifString()
+                                ->then(function ($v) { return array('enabled' => in_array($v, array('force', 'true')), 'force' => 'force' === $v); })
                             ->end()
                             ->canBeEnabled()
                             ->children()
+                                ->booleanNode('enabled')->defaultFalse()->end()
+                                ->booleanNode('force')->defaultFalse()->end()
                                 ->scalarNode('service')->defaultNull()->end()
-                                ->scalarNode('mode')->defaultFalse()->end()
                             ->end()
                         ->end()
                         ->scalarNode('failed_validation')->defaultValue(Codes::HTTP_BAD_REQUEST)->end()

DependencyInjection/FOSRestExtension.php

@@ -264,7 +264,7 @@ private function loadView(array $config, XmlFileLoader $loader, ContainerBuilder
                 $service->clearTag('kernel.event_listener');
             }
 
-            $container->setParameter('fos_rest.view_response_listener.force_view', 'force' === $config['view']['view_response_listener']['mode']);
+            $container->setParameter('fos_rest.view_response_listener.force_view', $config['view']['view_response_listener']['force']);
         }
 
         $formats = array();

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -179,6 +179,28 @@ public function testLoadFormatListenerWithSingleRule()
         $this->assertTrue($this->container->hasDefinition('fos_rest.format_listener'));
     }
 
+    public function testLoadParamFetcherListener()
+    {
+        $config = array(
+            'fos_rest' => array('param_fetcher_listener' => true),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.param_fetcher_listener'));
+        $this->assertFalse($this->container->getParameter('fos_rest.param_fetcher_listener.set_params_as_attributes'));
+    }
+
+    public function testLoadParamFetcherListenerForce()
+    {
+        $config = array(
+            'fos_rest' => array('param_fetcher_listener' => 'force'),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.param_fetcher_listener'));
+        $this->assertTrue($this->container->getParameter('fos_rest.param_fetcher_listener.set_params_as_attributes'));
+    }
+
     public function testLoadFormatListenerWithMultipleRule()
     {
         $config = array(
@@ -224,6 +246,28 @@ public function testDisableViewResponseListener()
         $this->assertFalse($this->container->hasDefinition('fos_rest.view_response_listener'));
     }
 
+    public function testLoadViewResponseListener()
+    {
+        $config = array(
+            'fos_rest' => array('view' => array('view_response_listener' => true)),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.view_response_listener'));
+        $this->assertFalse($this->container->getParameter('fos_rest.view_response_listener.force_view'));
+    }
+
+    public function testLoadViewResponseListenerForce()
+    {
+        $config = array(
+            'fos_rest' => array('view' => array('view_response_listener' => 'force')),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.view_response_listener'));
+        $this->assertTrue($this->container->getParameter('fos_rest.view_response_listener.force_view'));
+    }
+
     public function testForceEmptyContentDefault()
     {
         $this->extension->load(array(), $this->container);