From a464d7e0eca7eeae82293fb8116b3707d6fce7b5 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 15 Mar 2019 09:22:58 +0100 Subject: [PATCH] Don't use AbstractController in 3.4 branch --- routing/conditions.rst | 6 +++--- web_link.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/routing/conditions.rst b/routing/conditions.rst index 2240dc0bbc9..0eb83d544b6 100644 --- a/routing/conditions.rst +++ b/routing/conditions.rst @@ -15,10 +15,10 @@ define arbitrary matching logic, use the ``conditions`` routing option: // src/Controller/DefaultController.php namespace App\Controller; - use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; + use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Routing\Annotation\Route; - class DefaultController extends AbstractController + class DefaultController extends Controller { /** * @Route( @@ -27,7 +27,7 @@ define arbitrary matching logic, use the ``conditions`` routing option: * condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'" * ) * - * expressions can also include config parameters + * expressions can also include config parameters * condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'" */ public function contact() diff --git a/web_link.rst b/web_link.rst index e590326b336..ac0a08b16c9 100644 --- a/web_link.rst +++ b/web_link.rst @@ -153,10 +153,10 @@ You can also add links to the HTTP response directly from controllers and servic use Fig\Link\GenericLinkProvider; use Fig\Link\Link; + use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; - use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; - class BlogController extends AbstractController + class BlogController extends Controller { public function index(Request $request) {