8000 feature #9178 made HttpFoundationRequestHandler a service (kor3k) · symfony/symfony@9e13cc0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9e13cc0

Browse files
fabpotfabpot
committed
feature #9178 made HttpFoundationRequestHandler a service (kor3k)
This PR was squashed before being merged into the 2.5-dev branch (closes #9178). Discussion ---------- made HttpFoundationRequestHandler a service defines HttpFoundationRequestHandler as a service Commits ------- 43451e9 made HttpFoundationRequestHandler a service
2 parents feea36d + 43451e9 commit 9e13cc0

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
1111
<parameter key="form.extension.class">Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension</parameter>
1212
<parameter key="form.type_guesser.validator.class">Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser</parameter>
13+
<parameter key="form.type_extension.form.request_handler.class">Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler</parameter>
1314
</parameters>
< 8000 code>1415

1516
<services>
@@ -148,9 +149,13 @@
148149

149150
<!-- FormTypeHttpFoundationExtension -->
150151
<service id="form.type_extension.form.http_foundation" class="Symfony\Component\Form\Extension\HttpFoundation\Type\FormTypeHttpFoundationExtension">
152+
<argument type="service" id="form.type_extension.form.request_handler" />
151153
<tag name="form.type_extension" alias="form" />
152154
</service>
153155

156+
<!-- HttpFoundationRequestHandler -->
157+
<service id="form.type_extension.form.request_handler" class="%form.type_extension.form.request_handler.class%" public="false" />
158+
154159
<!-- FormTypeValidatorExtension -->
155160
<service id="form.type_extension.form.validator" class="Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension">
156161
<tag name="form.type_extension" alias="form" />

‎src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313

1414
use Symfony\Component\Form\AbstractTypeExtension;
1515
use Symfony\Component\Form\Extension\HttpFoundation\EventListener\BindRequestListener;
16-
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
16+
use Symfony\Component\Form\RequestHandlerInterface;
1717
use Symfony\Component\Form\FormBuilderInterface;
18+
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
1819

1920
/**
2021
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -27,14 +28,17 @@ class FormTypeHttpFoundationExtension extends AbstractTypeExtension
2728
private $listener;
2829

2930
/**
30-
* @var HttpFoundationRequestHandler
31+
* @var RequestHandlerInterface
3132
*/
3233
private $requestHandler;
3334

34-
public function __construct()
35+
/**
36+
* @param RequestHandlerInterface $requestHandler
37+
*/
38+
public function __construct(RequestHandlerInterface $requestHandler = null)
3539
{
3640
$this->listener = new BindRequestListener();
37-
$this->requestHandler = new HttpFoundationRequestHandler();
41+
$this->requestHandler = $requestHandler ?: new HttpFoundationRequestHandler();
3842
}
3943

4044
/**

0 commit comments

Comments
 (0)
0