Merge branch '3.4' into 4.2

* 3.4:
  Don't use AbstractController in 3.4 branch
  Added Oskar to the Docs Team

Author: javiereguiluz

contributing/code/core_team.rst

@@ -114,6 +114,7 @@ Active Core Members
   * **Wouter De Jong** (`wouterj`_);
   * **Jules Pietri** (`HeahDude`_);
   * **Javier Eguiluz** (`javiereguiluz`_).
+  * **Oskar Stark** (`OskarStark`_).
 
 Former Core Members
 ~~~~~~~~~~~~~~~~~~~
@@ -259,3 +260,4 @@ discretion of the **Project Leader**.
 .. _`michaelcullum`: https://github.com/michaelcullum
 .. _`wouterj`: https://github.com/wouterj
 .. _`HeahDude`: https://github.com/HeahDude
+.. _`OskarStark`: https://github.com/OskarStark

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(

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)
         {