diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Bernhard Schussek 2014-09-25 11:23:31 +02:00
parent d671406ae5
commit 6cbc862e19
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
View File

@ -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 -->

13
src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
View File

@ -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(),
);
}
}

5
src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
View File

@ -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 <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();
}
/**