diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 7980131433..bf63332ced 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -151,11 +151,8 @@
-
-
-
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
index 33e9c1c4d4..08bd89c9e4 100644
--- 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 @@ use Symfony\Component\Form\Util\ServerParams;
*/
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
index 4596f06b98..9b09b05c39 100644
--- 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\AbstractTypeExtension;
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
@@ -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();
}
/**