Merge pull request #1038 from kierate/master

Fix #1037 - Error validating param_fetcher_listener configuration parameter

Author: lsmith77

DependencyInjection/Configuration.php

@@ -57,12 +57,14 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->scalarNode('unauthorized_challenge')->defaultNull()->end()
                 ->arrayNode('param_fetcher_listener')
-                    ->validate()
-                        ->ifNotInArray(Configuration::$forceOptionValues)
-                        ->thenInvalid('The param_fetcher_listener option does not support %s. Please choose one of '.json_encode(Configuration::$forceOptionValues))
+                    ->beforeNormalization()
+                        ->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()
                     ->end()
                 ->end()

DependencyInjection/FOSRestExtension.php

@@ -192,7 +192,7 @@ private function loadParamFetcherListener(array $config, XmlFileLoader $loader,
                 $service->clearTag('kernel.event_listener');
             }
 
-            if ('force' === $config['param_fetcher_listener']) {
+            if ($config['param_fetcher_listener']['force']) {
                 $container->setParameter('fos_rest.param_fetcher_listener.set_params_as_attributes', true);
             }
         }