From 2e6403b346cfedeabe030ad6fe5e500346fd9323 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 4 Jul 2018 17:23:38 +0200
Subject: [PATCH] Extend from AbstractController when using Symfony 4.1 or
 higher

---
 src/Maker/MakeController.php                         | 2 ++
 src/Resources/skeleton/controller/Controller.tpl.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php
index 387d4aef7..4606fb557 100644
--- a/src/Maker/MakeController.php
+++ b/src/Maker/MakeController.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Maker;
 
 use Doctrine\Common\Annotations\Annotation;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Generator;
@@ -55,6 +56,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $controllerClassNameDetails->getFullName(),
             'controller/Controller.tpl.php',
             [
+                'parent_class_name' => \method_exists(AbstractController::class, 'getParameter') ? 'AbstractController' : 'Controller',
                 'route_path' => Str::asRoutePath($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
                 'route_name' => Str::asRouteName($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
                 'twig_installed' => $this->isTwigInstalled(),
diff --git a/src/Resources/skeleton/controller/Controller.tpl.php b/src/Resources/skeleton/controller/Controller.tpl.php
index a207cd6ae..6f67ea939 100644
--- a/src/Resources/skeleton/controller/Controller.tpl.php
+++ b/src/Resources/skeleton/controller/Controller.tpl.php
@@ -2,10 +2,10 @@
 
 namespace <?= $namespace; ?>;
 
+use Symfony\Bundle\FrameworkBundle\Controller\<?= $parent_class_name; ?>;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class <?= $class_name; ?> extends Controller
+class <?= $class_name; ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
     /**
      * @Route("<?= $route_path ?>", name="<?= $route_name ?>")