[Form] Removed constructor argument from FormTypeHttpFoundationExtension for forward compatibility with 2.5

webmozart · webmozart · commit 6cbc862e19a1 · 2014-09-25T11:29:33.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -151,11 +151,8 @@
         </service>
 
         <!-- FormTypeHttpFoundationExtension -->
-        <service id="form.server_params" class="Symfony\Component\Form\Util\ServerParams" public="false"/>
-
         <service id="form.type_extension.form.http_foundation" class="Symfony\Component\Form\Extension\HttpFoundation\Type\FormTypeHttpFoundationExtension">
             <tag name="form.type_extension" alias="form" />
-            <argument type="service" id="form.server_params"/>
         </service>
 
         <!-- FormTypeValidatorExtension -->
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Form\Extension\HttpFoundation;
 
 use Symfony\Component\Form\AbstractExtension;
-use Symfony\Component\Form\Util\ServerParams;
 
 /**
  * Integrates the HttpFoundation component with the Form library.
@@ -21,20 +20,10 @@
  */
 class HttpFoundationExtension extends AbstractExtension
 {
-    /**
-     * @var ServerParams
-     */
-    private $serverParams;
-
-    public function __construct(ServerParams $serverParams = null)
-    {
-        $this->serverParams = $serverParams;
-    }
-
     protected function loadTypeExtensions()
     {
         return array(
-            new Type\FormTypeHttpFoundationExtension($this->serverParams),
+            new Type\FormTypeHttpFoundationExtension(),
         );
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Form\Extension\HttpFoundation\EventListener\BindRequestListener;
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Util\ServerParams;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -32,10 +31,10 @@ class FormTypeHttpFoundationExtension extends AbstractTypeExtension
      */
     private $requestHandler;
 
-    public function __construct(ServerParams $serverParams = null)
+    public function __construct()
     {
         $this->listener = new BindRequestListener();
-        $this->requestHandler = new HttpFoundationRequestHandler($serverParams);
+        $this->requestHandler = new HttpFoundationRequestHandler();
     }
 
     /**
