Merge pull request #1517 from FriendsOfSymfony/DOC

Remove outdated parts of the doc
FriendsOfSymfony · Jun 15, 2016 · 1490774 · 1490774
2 parents e0bd6c8 + 72a77a2
commit 1490774
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -296,10 +296,6 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode)
                         })
                     ->end()
                     ->canBeEnabled()
-                    ->validate()
-                        ->ifTrue(function ($v) { return empty($v['rules']) && !empty($v['media_type']['enabled']); })
-                        ->thenInvalid('To enable the "media_type" setting, a "rules" setting must also needs to be defined for the "format_listener"')
-                    ->end()
                     ->children()
                         ->scalarNode('service')->defaultNull()->end()
                         ->arrayNode('rules')

diff --git a/Resources/doc/configuration-reference.rst b/Resources/doc/configuration-reference.rst
@@ -68,7 +68,6 @@ Full default configuration
                 service:              null
             failed_validation:    400
             empty_content:        204
-            exception_wrapper_handler:  null
             serialize_null:       false
             jsonp_handler:
                 callback_param:       callback
@@ -114,10 +113,6 @@ Full default configuration
                 fallback_format:      html
                 attributes:           []
                 priorities:           []
-            media_type:
-                enabled:              false
-                service:              null
-                version_regex:        '/(v|version)=(?P<version>[0-9\.]+)/'
         versioning:
             enabled: false
             default_version: ~