Merge pull request #1056 from FriendsOfSymfony/version_regexp

fix indention and add missing end()
FriendsOfSymfony · Jun 3, 2015 · ea4f6f6 · ea4f6f6
2 parents e620c99 + 6165a96
commit ea4f6f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git 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<version>[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<version>[0-9\.]+)/')->end()
+                            ->end()
                         ->end()
                     ->end()
                 ->end()

diff --git 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<version>[0-9\.]+)/'
-
-
+                enabled:              false
+                service:              null
+                version_regex:        '/(v|version)=(?P<version>[0-9\.]+)/'