From 6568b6287dcb1d7e494c6e1a613fdb998a07c3c6 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Tue, 2 Jun 2015 17:38:59 +0200 Subject: [PATCH 1/2] fix indention and add missing end() --- DependencyInjection/Configuration.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 8aeb50465..77d9e058d 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -279,11 +279,13 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode) ->arrayNode('media_type') ->canBeEnabled() ->beforeNormalization() - ->ifString()->then(function($v) { return array('enabled' => true, 'version_regex' => $v); }) - ->end() - ->children() - ->scalarNode('service')->defaultNull()->end() - ->scalarNode('version_regex')->defaultValue('/(v|version)=(?P[0-9\.]+)/')->end() + ->ifString() + ->then(function ($v) { return array('enabled' => true, 'version_regex' => $v); }) + ->end() + ->children() + ->scalarNode('service')->defaultNull()->end() + ->scalarNode('version_regex')->defaultValue('/(v|version)=(?P[0-9\.]+)/')->end() + ->end() ->end() ->end() ->end() From 6165a96c59318d81b2e3919b871116f187e38be6 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Tue, 2 Jun 2015 17:47:59 +0200 Subject: [PATCH 2/2] updated docs --- Resources/doc/configuration-reference.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Resources/doc/configuration-reference.rst b/Resources/doc/configuration-reference.rst index ba2a44114..dde59508c 100644 --- a/Resources/doc/configuration-reference.rst +++ b/Resources/doc/configuration-reference.rst @@ -117,9 +117,6 @@ Full default configuration exception_fallback_format: null priorities: [] media_type: - version_regex: - enabled: false - service: null - regex: '/(v|version)=(?P[0-9\.]+)/' - - + enabled: false + service: null + version_regex: '/(v|version)=(?P[0-9\.]+)/'