Skip to content

Commit 8a2eaf7

Browse files
committed
Separated the force option into it's own boolean key
1 parent a838712 commit 8a2eaf7

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

DependencyInjection/Configuration.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,12 @@ public function getConfigTreeBuilder()
5959
->arrayNode('param_fetcher_listener')
6060
->beforeNormalization()
6161
->ifString()
62-
->then(function ($v) { return array('enabled' => $v); })
62+
->then(function ($v) { return array('enabled' => in_array($v, array('force', 'true')), 'force' => 'force' === $v); })
6363
->end()
6464
->canBeEnabled()
6565
->children()
66-
->scalarNode('enabled')->defaultFalse()
67-
->validate()
68-
->ifNotInArray(Configuration::$forceOptionValues)
69-
->thenInvalid('The param_fetcher_listener option does not support %s. Please choose one of '.json_encode(Configuration::$forceOptionValues))
70-
->end()
71-
->end()
66+
->booleanNode('enabled')->defaultFalse()->end()
67+
->scalarNode('force')->defaultFalse()->end()
7268
->scalarNode('service')->defaultNull()->end()
7369
->end()
7470
->end()

DependencyInjection/FOSRestExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private function loadParamFetcherListener(array $config, XmlFileLoader $loader,
192192
$service->clearTag('kernel.event_listener');
193193
}
194194

195-
if ('force' === $config['param_fetcher_listener']['enabled']) {
195+
if ($config['param_fetcher_listener']['force']) {
196196
$container->setParameter('fos_rest.param_fetcher_listener.set_params_as_attributes', true);
197197
}
198198
}

0 commit comments

Comments
 (0)