Skip to content

Commit 00c366e

Browse files
committed
Fix the configuration of controllers for Symfony 2.8
Symfony 2.8 does not inject the container in ContainerAware controllers defined as services, unlike recent 3.x versions.
1 parent 32c2eed commit 00c366e

File tree

6 files changed

+18
-0
lines changed

6 files changed

+18
-0
lines changed

Resources/config/change_password.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<argument type="service" id="event_dispatcher" />
2222
<argument type="service" id="fos_user.change_password.form.factory" />
2323
<argument type="service" id="fos_user.user_manager" />
24+
<call method="setContainer">
25+
<argument type="service" id="service_container" />
26+
</call>
2427
</service>
2528
</services>
2629

Resources/config/group.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<argument type="service" id="event_dispatcher" />
2222
<argument type="service" id="fos_user.group.form.factory" />
2323
<argument type="service" id="fos_user.group_manager" />
24+
<call method="setContainer">
25+
<argument type="service" id="service_container" />
26+
</call>
2427
</service>
2528
</services>
2629

Resources/config/profile.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<argument type="service" id="event_dispatcher" />
2323
<argument type="service" id="fos_user.profile.form.factory" />
2424
<argument type="service" id="fos_user.user_manager" />
25+
<call method="setContainer">
26+
<argument type="service" id="service_container" />
27+
</call>
2528
</service>
2629
</services>
2730

Resources/config/registration.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<argument type="service" id="fos_user.registration.form.factory" />
2424
<argument type="service" id="fos_user.user_manager" />
2525
<argument type="service" id="security.token_storage" />
26+
<call method="setContainer">
27+
<argument type="service" id="service_container" />
28+
</call>
2629
</service>
2730
</services>
2831

Resources/config/resetting.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
<argument type="service" id="fos_user.util.token_generator" />
3232
<argument type="service" id="fos_user.mailer" />
3333
<argument>%fos_user.resetting.retry_ttl%</argument>
34+
<call method="setContainer">
35+
<argument type="service" id="service_container" />
36+
</call>
3437
</service>
3538
</services>
3639

Resources/config/security.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535

3636
<service id="fos_user.security.controller" class="FOS\UserBundle\Controller\SecurityController" public="true">
3737
<argument type="service" id="security.csrf.token_manager" on-invalid="null" />
38+
<call method="setContainer">
39+
<argument type="service" id="service_container" />
40+
</call>
3841
</service>
3942
</services>
4043

0 commit comments

Comments
 (0)