symfony · fabpot · Apr 21, 2022 · Apr 11, 2022 · Tobion · Apr 11, 2022
diff --git a/UPGRADE-6.1.md b/UPGRADE-6.1.md
@@ -25,6 +25,7 @@ FrameworkBundle
 
  * Deprecate the `reset_on_message` config option. It can be set to `true` only and does nothing now.
    To prevent services resetting after each message the "--no-reset" option in "messenger:consume" command can be set
+ * Deprecate not setting the `http_method_override` config option. The default value will change to `false` in 7.0.
 
 HttpKernel
 ----------

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Add support for first-class callable route controller in `MicroKernelTrait`
  * Add tag `routing.condition_service` to autoconfigure routing condition services
  * Automatically register kernel methods marked with the `Symfony\Component\Routing\Annotation\Route` attribute or annotation as controllers in `MicroKernelTrait`
+ * Deprecate not setting the `http_method_override` config option. The default value will change to `false` in 7.0.
 
 6.0
 ---

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -76,12 +76,23 @@ public function getConfigTreeBuilder(): TreeBuilder
                     return $v;
                 })
             ->end()
+            ->validate()
+                ->always(function ($v) {
+                    if (!isset($v['http_method_override'])) {
+                        trigger_deprecation('symfony/framework-bundle', '6.1', 'Not setting the "framework.http_method_override" config option is deprecated. It will default to "false" in 7.0.');
+
+                        $v['http_method_override'] = true;
+                    }
+
+                    return $v;
+                })
+            ->end()
             ->fixXmlConfig('enabled_locale')
             ->children()
                 ->scalarNode('secret')->end()
-                ->scalarNode('http_method_override')
+                ->booleanNode('http_method_override')
                     ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests. Note: When using the HttpCache, you need to call the method in your front controller instead")
-                    ->defaultTrue()
+                    ->treatNullLike(false)
                 ->end()
                 ->scalarNode('trust_x_sendfile_type_header')
                     ->info('Set true to enable support for xsendfile in binary file responses.')

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
@@ -32,6 +32,11 @@ public function getProjectDir(): string
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
+        $loader->load(static function (ContainerBuilder $container) {
+            $container->loadFromExtension('framework', [
+                'http_method_override' => false,
+            ]);
+        });
     }
 
     protected function build(ContainerBuilder $container)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/config.yml
@@ -1,2 +1,3 @@
 framework:
+    http_method_override: false
     secret: test
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -33,7 +33,7 @@ class ConfigurationTest extends TestCase
     public function testDefaultConfig()
     {
         $processor = new Processor();
-        $config = $processor->processConfiguration(new Configuration(true), [['secret' => 's3cr3t']]);
+        $config = $processor->processConfiguration(new Configuration(true), [['http_method_override' => false, 'secret' => 's3cr3t']]);
 
         $this->assertEquals(self::getBundleDefaultConfig(), $config);
     }
@@ -57,7 +57,7 @@ public function testInvalidSessionName($sessionName)
         $processor = new Processor();
         $processor->processConfiguration(
             new Configuration(true),
-            [['session' => ['name' => $sessionName]]]
+            [['http_method_override' => false, 'session' => ['name' => $sessionName]]]
         );
     }
 
@@ -77,7 +77,7 @@ public function testAssetsCanBeEnabled()
     {
         $processor = new Processor();
         $configuration = new Configuration(true);
-        $config = $processor->processConfiguration($configuration, [['assets' => null]]);
+        $config = $processor->processConfiguration($configuration, [['http_method_override' => false, 'assets' => null]]);
 
         $defaultConfig = [
             'enabled' => true,
@@ -103,6 +103,7 @@ public function testValidAssetsPackageNameConfiguration($packageName)
         $configuration = new Configuration(true);
         $config = $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'assets' => [
                     'packages' => [
                         $packageName => [],
@@ -135,6 +136,7 @@ public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMess
         $configuration = new Configuration(true);
         $processor->processConfiguration($configuration, [
                 [
+                    'http_method_override' => false,
                     'assets' => $assetConfig,
                 ],
             ]);
@@ -184,6 +186,7 @@ public function testValidLockConfiguration($lockConfig, $processedConfig)
         $configuration = new Configuration(true);
         $config = $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'lock' => $lockConfig,
             ],
         ]);
@@ -244,11 +247,13 @@ public function testLockMergeConfigs()
         $configuration = new Configuration(true);
         $config = $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'lock' => [
                     'payload' => 'flock',
                 ],
             ],
             [
+                'http_method_override' => false,
                 'lock' => [
                     'payload' => 'semaphore',
                 ],
@@ -275,6 +280,7 @@ public function testValidSemaphoreConfiguration($semaphoreConfig, $processedConf
         $configuration = new Configuration(true);
         $config = $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'semaphore' => $semaphoreConfig,
             ],
         ]);
@@ -327,6 +333,7 @@ public function testItShowANiceMessageIfTwoMessengerBusesAreConfiguredButNoDefau
 
         $processor->processConfiguration($configuration, [
             'framework' => [
+                'http_method_override' => false,
                 'messenger' => [
                     'default_bus' => null,
                     'buses' => [
@@ -344,6 +351,7 @@ public function testBusMiddlewareDontMerge()
         $configuration = new Configuration(true);
         $config = $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'messenger' => [
                     'default_bus' => 'existing_bus',
                     'buses' => [
@@ -358,6 +366,7 @@ public function testBusMiddlewareDontMerge()
                 ],
             ],
             [
+                'http_method_override' => false,
                 'messenger' => [
                     'buses' => [
                         'common_bus' => [
@@ -406,6 +415,7 @@ public function testItErrorsWhenDefaultBusDoesNotExist()
 
         $processor->processConfiguration($configuration, [
             [
+                'http_method_override' => false,
                 'messenger' => [
                     'default_bus' => 'foo',
                     'buses' => [
@@ -420,7 +430,7 @@ public function testItErrorsWhenDefaultBusDoesNotExist()
     protected static function getBundleDefaultConfig()
     {
         return [
-            'http_method_override' => true,
+            'http_method_override' => false,
             'trust_x_sendfile_type_header' => false,
             'ide' => '%env(default::SYMFONY_IDE)%',
             'default_locale' => 'en',

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'assets' => [
         'version' => 'SomeVersionScheme',
         'base_urls' => 'http://cdn.example.com',

diff --git a/...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php b/...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'assets' => [
         'enabled' => false,
     ],

diff --git a/...eworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php b/...eworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'assets' => [
         'version_strategy' => 'assets.custom_version_strategy',
         'base_urls' => 'http://cdn.example.com',

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'cache' => [
         'pools' => [
             'cache.foo' => [

diff --git a/...ndle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware.php b/...ndle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'cache' => [
         'app' => 'cache.adapter.redis_tag_aware',
     ],

diff --git a/...FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php b/...FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'cache' => [
         'app' => 'cache.redis_tag_aware.foo',
         'pools' => [

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'csrf_protection' => true,
     'session' => [
         'storage_factory_id' => 'session.storage.factory.native',

diff --git a/...fony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php b/...fony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'csrf_protection' => [
         'enabled' => true,
     ],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php
@@ -1,3 +1,4 @@
 <?php
 
-$container->loadFromExtension('framework', []);
+$container->loadFromExtension('framework', [
+    'http_method_override' => false,]);
diff --git a/.../FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php b/.../FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'fragments' => [
         'enabled' => false,
     ],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'esi' => [
         'enabled' => false,
     ],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/exceptions.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/exceptions.php
@@ -3,6 +3,7 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'exceptions' => [
         BadRequestHttpException::class => [
             'log_level' => 'info',

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_default_csrf.php b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_default_csrf.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'form' => [
         'legacy_error_messages' => false,
     ],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'form' => [
         'csrf_protection' => [
             'enabled' => false,

diff --git a/.../Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/fragments_and_hinclude.php b/.../Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/fragments_and_hinclude.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'fragments' => [
         'enabled' => true,
         'hinclude_default_template' => 'global_hinclude_template',

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'html_sanitizer' => [
         'default' => 'my.sanitizer',
         'sanitizers' => [

diff --git a/...le/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_default_options.php b/...le/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_default_options.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'max_host_connections' => 4,
         'default_options' => null,

diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php b/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'default_options' => [
             'headers' => ['X-powered' => 'PHP'],

diff --git a/...meworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_mock_response_factory.php b/...meworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_mock_response_factory.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'default_options' => null,
         'mock_response_factory' => 'my_response_factory',

diff --git a/...orkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php b/...orkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'max_host_connections' => 4,
         'default_options' => [

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_retry.php b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_retry.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'default_options' => [
             'retry_failed' => [

diff --git a/...Bundle/Tests/DependencyInjection/Fixtures/php/http_client_scoped_without_query_option.php b/...Bundle/Tests/DependencyInjection/Fixtures/php/http_client_scoped_without_query_option.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'scoped_clients' => [
             'foo' => [

diff --git a/...ony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_xml_key.php b/...ony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_xml_key.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'http_client' => [
         'default_options' => [
             'resolve' => [

diff --git a/...meworkBundle/Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php b/...meworkBundle/Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'secret' => 's3cr3t',
     'default_locale' => 'fr',
     'router' => [

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'mailer' => [
         'dsn' => 'smtp://example.com',
         'envelope' => [

diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_disabled_message_bus.php b/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_disabled_message_bus.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'mailer' => [
         'dsn' => 'smtp://example.com',
         'message_bus' => false,

diff --git a/...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php b/...Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php
@@ -4,6 +4,7 @@
 
 return static function (ContainerConfigurator $container) {
     $container->extension('framework', [
+        'http_method_override' => false,
         'mailer' => [
             'dsn' => 'smtp://example.com',
             'envelope' => [

diff --git a/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_specific_message_bus.php b/...ameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_specific_message_bus.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'mailer' => [
         'dsn' => 'smtp://example.com',
         'message_bus' => 'app.another_bus',