Skip to content

Commit a4a9da3

Browse files
committed
minor #11165 Don't use AbstractController in 3.4 branch (javiereguiluz)
This PR was merged into the 3.4 branch. Discussion ---------- Don't use AbstractController in 3.4 branch In 3.4 we always extend from Controller instead of AbstractController, so this PR fixes the wrong occurrences. The only remaining occurrence is one which explicitly explains something about AbstractController. Commits ------- a464d7e Don't use AbstractController in 3.4 branch
2 parents 9cf0692 + a464d7e commit a4a9da3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

routing/conditions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ define arbitrary matching logic, use the ``conditions`` routing option:
1515
// src/Controller/DefaultController.php
1616
namespace App\Controller;
1717
18-
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
18+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
1919
use Symfony\Component\Routing\Annotation\Route;
2020
21-
class DefaultController extends AbstractController
21+
class DefaultController extends Controller
2222
{
2323
/**
2424
* @Route(
@@ -27,7 +27,7 @@ define arbitrary matching logic, use the ``conditions`` routing option:
2727
* condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
2828
* )
2929
*
30-
* expressions can also include config parameters
30+
* expressions can also include config parameters
3131
* condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'"
3232
*/
3333
public function contact()

web_link.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ You can also add links to the HTTP response directly from controllers and servic
153153

154154
use Fig\Link\GenericLinkProvider;
155155
use Fig\Link\Link;
156+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
156157
use Symfony\Component\HttpFoundation\Request;
157-
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
158158

159-
class BlogController extends AbstractController
159+
class BlogController extends Controller
160160
{
161161
public function index(Request $request)
162162
{

0 commit comments

Comments
 (0)