Skip to content

Commit 20b97f6

Browse files
committed
minor #1528 [DX] Extends base controller Symfony class instead of ContainerAware (tgalopin)
This PR was merged into the 2.0.x-dev branch. Discussion ---------- [DX] Extends base controller Symfony class instead of ContainerAware Controllers extend the Controller base class of Symfony instead of ContainerAware. It helps new developpers as they are less lost and they can use their shortcuts as they always did. It's a pull request for the issue #1527. Commits ------- be04c3b [DX] Extends base controller Symfony class instead of ContainerAware
2 parents 05f7f43 + be04c3b commit 20b97f6

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

Controller/ChangePasswordController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use FOS\UserBundle\Event\FilterUserResponseEvent;
1717
use FOS\UserBundle\Event\GetResponseUserEvent;
1818
use FOS\UserBundle\Model\UserInterface;
19-
use Symfony\Component\DependencyInjection\ContainerAware;
19+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2020
use Symfony\Component\HttpFoundation\Request;
2121
use Symfony\Component\HttpFoundation\RedirectResponse;
2222
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -27,7 +27,7 @@
2727
* @author Thibault Duplessis <[email protected]>
2828
* @author Christophe Coevoet <[email protected]>
2929
*/
30-
class ChangePasswordController extends ContainerAware
30+
class ChangePasswordController extends Controller
3131
{
3232
/**
3333
* Change user password

Controller/GroupController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use FOS\UserBundle\Event\FormEvent;
1717
use FOS\UserBundle\Event\GetResponseGroupEvent;
1818
use FOS\UserBundle\Event\GroupEvent;
19-
use Symfony\Component\DependencyInjection\ContainerAware;
19+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2020
use Symfony\Component\HttpFoundation\Request;
2121
use Symfony\Component\HttpFoundation\RedirectResponse;
2222
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -27,7 +27,7 @@
2727
* @author Thibault Duplessis <[email protected]>
2828
* @author Christophe Coevoet <[email protected]>
2929
*/
30-
class GroupController extends ContainerAware
30+
class GroupController extends Controller
3131
{
3232
/**
3333
* Show all groups

Controller/ProfileController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use FOS\UserBundle\Event\FilterUserResponseEvent;
1717
use FOS\UserBundle\Event\GetResponseUserEvent;
1818
use FOS\UserBundle\Model\UserInterface;
19-
use Symfony\Component\DependencyInjection\ContainerAware;
19+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2020
use Symfony\Component\HttpFoundation\Request;
2121
use Symfony\Component\HttpFoundation\RedirectResponse;
2222
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -26,7 +26,7 @@
2626
*
2727
* @author Christophe Coevoet <[email protected]>
2828
*/
29-
class ProfileController extends ContainerAware
29+
class ProfileController extends Controller
3030
{
3131
/**
3232
* Show the user

Controller/RegistrationController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use FOS\UserBundle\Event\FormEvent;
1616
use FOS\UserBundle\Event\GetResponseUserEvent;
1717
use FOS\UserBundle\Event\FilterUserResponseEvent;
18-
use Symfony\Component\DependencyInjection\ContainerAware;
18+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
1919
use Symfony\Component\HttpFoundation\Request;
2020
use Symfony\Component\HttpFoundation\RedirectResponse;
2121
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -28,7 +28,7 @@
2828
* @author Thibault Duplessis <[email protected]>
2929
* @author Christophe Coevoet <[email protected]>
3030
*/
31-
class RegistrationController extends ContainerAware
31+
class RegistrationController extends Controller
3232
{
3333
public function registerAction(Request $request)
3434
{

Controller/ResettingController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use FOS\UserBundle\Event\GetResponseUserEvent;
1717
use FOS\UserBundle\Event\FilterUserResponseEvent;
1818
use FOS\UserBundle\Model\UserInterface;
19-
use Symfony\Component\DependencyInjection\ContainerAware;
19+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2020
use Symfony\Component\HttpFoundation\Request;
2121
use Symfony\Component\HttpFoundation\RedirectResponse;
2222
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -27,7 +27,7 @@
2727
* @author Thibault Duplessis <[email protected]>
2828
* @author Christophe Coevoet <[email protected]>
2929
*/
30-
class ResettingController extends ContainerAware
30+
class ResettingController extends Controller
3131
{
3232
/**
3333
* Request reset user password: show form

Controller/SecurityController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
namespace FOS\UserBundle\Controller;
1313

14-
use Symfony\Component\DependencyInjection\ContainerAware;
14+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\Security\Core\SecurityContextInterface;
1717
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1818

19-
class SecurityController extends ContainerAware
19+
class SecurityController extends Controller
2020
{
2121
public function loginAction(Request $request)
2222
{

0 commit comments

Comments
 (0)