merged branch havvg/feature/config-http_method_override (PR #7202)

fabpot · fabpot · commit ea252671b062 · 2013-03-07T09:07:20.000+01:00
This PR was squashed before being merged into the master branch (closes #7202). Commits ------- 817453c [2.2] add http_method_override option to ease setup Discussion ---------- [2.2] add http_method_override option to ease setup | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -52,6 +52,10 @@ public function getConfigTreeBuilder()
                     ->end()
                 ->end()
                 ->scalarNode('secret')->end()
+                ->scalarNode('http_method_override')
+                    ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests.")
+                    ->defaultTrue()
+                ->end()
                 ->scalarNode('trust_proxy_headers')->defaultFalse()->end() // @deprecated, to be removed in 2.3
                 ->arrayNode('trusted_proxies')
                     ->beforeNormalization()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -66,6 +66,8 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setParameter('kernel.secret', $config['secret']);
         }
 
+        $container->setParameter('kernel.http_method_override', $config['http_method_override']);
+
         $container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);
 
         // @deprecated, to be removed in 2.3
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -46,6 +46,10 @@ public function boot()
         } elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {
             Request::trustProxyData(); // @deprecated, to be removed in 2.3
         }
+
+        if ($this->container->getParameter('kernel.http_method_override')) {
+            Request::enableHttpMethodParameterOverride();
+        }
     }
 
     public function build(ContainerBuilder $container)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -24,6 +24,7 @@
 
         <!-- charset is deprecated and will be removed in 2.2 -->
         <xsd:attribute name="charset" type="xsd:string" />
+        <xsd:attribute name="http-method-override" type="xsd:boolean" />
         <xsd:attribute name="trust-proxy-headers" type="xsd:string" />
         <xsd:attribute name="trusted-proxies" type="xsd:string" />
         <xsd:attribute name="ide" type="xsd:string" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -88,6 +88,7 @@ protected static function getBundleDefaultConfig()
     {
         return array(
             'charset'             => null,
+            'http_method_override' => true,
             'trust_proxy_headers' => false,
             'trusted_proxies'     => array(),
             'ide'                 => null,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -4,6 +4,7 @@
     'secret' => 's3cr3t',
     'default_locale' => 'fr',
     'form' => null,
+    'http_method_override' => false,
     'trust_proxy_headers' => true,
     'trusted_proxies' => array('127.0.0.1', '10.0.0.1'),
     'csrf_protection' => array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-    <framework:config secret="s3cr3t" ide="file%%link%%format" default-locale="fr" trust-proxy-headers="true" trusted-proxies="127.0.0.1, 10.0.0.1">
+    <framework:config secret="s3cr3t" ide="file%%link%%format" default-locale="fr" trust-proxy-headers="true" trusted-proxies="127.0.0.1, 10.0.0.1" http-method-override="false">
         <framework:csrf-protection enabled="true" field-name="_csrf" />
         <framework:form />
         <framework:esi enabled="true" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -2,6 +2,7 @@ framework:
     secret: s3cr3t
     default_locale: fr
     form: ~
+    http_method_override: false
     trust_proxy_headers: true
     trusted_proxies: ['127.0.0.1', '10.0.0.1']
     csrf_protection:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -41,6 +41,13 @@ public function testProxies()
         $this->assertEquals(array('127.0.0.1', '10.0.0.1'), $container->getParameter('kernel.trusted_proxies'));
     }
 
+    public function testHttpMethodOverride()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertFalse($container->getParameter('kernel.http_method_override'));
+    }
+
     public function testEsi()
     {
         $container = $this->createContainerFromFile('full');

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ public function load(array $configs, ContainerBuilder $container)`
`66`	`66`	`$container->setParameter('kernel.secret', $config['secret']);`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ $container->setParameter('kernel.http_method_override', $config['http_method_override']);`
	`70`	`+`
`69`	`71`	`$container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);`
`70`	`72`
`71`	`73`	`// @deprecated, to be removed in 2.3`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ public function boot()`
`46`	`46`	`} elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {`
`47`	`47`	`Request::trustProxyData(); // @deprecated, to be removed in 2.3`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ if ($this->container->getParameter('kernel.http_method_override')) {`
	`51`	`+ Request::enableHttpMethodParameterOverride();`
	`52`	`+ }`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`public function build(ContainerBuilder $container)`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ protected static function getBundleDefaultConfig()`
`88`	`88`	`{`
`89`	`89`	`return array(`
`90`	`90`	`'charset' => null,`
	`91`	`+ 'http_method_override' => true,`
`91`	`92`	`'trust_proxy_headers' => false,`
`92`	`93`	`'trusted_proxies' => array(),`
`93`	`94`	`'ide' => null,`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,13 @@ public function testProxies()`
`41`	`41`	`$this->assertEquals(array('127.0.0.1', '10.0.0.1'), $container->getParameter('kernel.trusted_proxies'));`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public function testHttpMethodOverride()`
	`45`	`+ {`
	`46`	`+ $container = $this->createContainerFromFile('full');`
	`47`	`+`
	`48`	`+ $this->assertFalse($container->getParameter('kernel.http_method_override'));`
	`49`	`+ }`
	`50`	`+`
`44`	`51`	`public function testEsi()`
`45`	`52`	`{`
`46`	`53`	`$container = $this->createContainerFromFile('full');`