Replace demo page by twig file

nicolas-grekas · weaverryan · commit 995b534666fb · 2018-02-08T22:13:04.000-05:00
diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php
@@ -30,10 +30,12 @@
 final class MakeController extends AbstractMaker
 {
     private $router;
+    private $projectDir;
 
-    public function __construct(RouterInterface $router)
+    public function __construct(RouterInterface $router, string $projectDir)
     {
         $this->router = $router;
+        $this->projectDir = $projectDir;
     }
 
     public static function getCommandName(): string
@@ -55,20 +57,34 @@ public function getParameters(InputInterface $input): array
         $controllerClassName = Str::asClassName($input->getArgument('controller-class'), 'Controller');
         Validator::validateClassName($controllerClassName);
 
+        if (file_exists($this->projectDir.'/templates/base.html.twig')) {
+            $twigFirstLine = "{% extends 'base.html.twig' %}\n\n{% block title %}Hello {{ controller_name }}!{% endblock %}\n";
+        } else {
+            $twigFirstLine = "<!DOCTYPE html>\n\n<title>Hello {{ controller_name }}!</title>\n";
+        }
+
         return [
             'controller_class_name' => $controllerClassName,
+            'controller_class_file' => 'src/Controller/'.$controllerClassName.'.php',
             'route_path' => Str::asRoutePath(str_replace('Controller', '', $controllerClassName)),
             'route_name' => Str::asRouteName(str_replace('Controller', '', $controllerClassName)),
+            'twig_file' => Str::asFilePath(str_replace('Controller', '', $controllerClassName)).'.html.twig',
+            'twig_first_line' => $twigFirstLine,
+            'twig_installed' => $this->isTwigInstalled(),
         ];
     }
 
     public function getFiles(array $params): array
     {
-        $skeletonFile = $this->isTwigInstalled() ? 'ControllerWithTwig.tpl.php' : 'Controller.tpl.php';
+        $dir = __DIR__.'/../Resources/skeleton/controller/';
 
-        return [
-            __DIR__.'/../Resources/skeleton/controller/'.$skeletonFile => 'src/Controller/'.$params['controller_class_name'].'.php',
-        ];
+        $paths = [$dir.'Controller.tpl.php' => $params['controller_class_file']];
+
+        if ($params['twig_installed']) {
+            $paths[$dir.'Controller.twig.php'] = 'templates/'.$params['twig_file'];
+        }
+
+        return $paths;
     }
 
     public function writeSuccessMessage(array $params, ConsoleStyle $io)
diff --git a/src/Resources/config/makers.xml b/src/Resources/config/makers.xml
@@ -17,6 +17,7 @@
 
             <service id="maker.maker.make_controller" class="Symfony\Bundle\MakerBundle\Maker\MakeController">
                 <argument type="service" id="router" />
+                <argument>%kernel.project_dir%</argument>
                 <tag name="maker.command" />
             </service>
 
diff --git a/src/Resources/skeleton/controller/Controller.tpl.php b/src/Resources/skeleton/controller/Controller.tpl.php
@@ -6,13 +6,19 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
 
-class <?= $controller_class_name ?> extends Controller
+class <?= $controller_class_name ?> extends AbstractController
 {
     /**
      * @Route("<?= $route_path ?>", name="<?= $route_name ?>")
      */
     public function index()
     {
+<?php if ($twig_installed) { ?>
+        return $this->render('<?= $twig_file ?>', [
+            'controller_name' => '<?= $controller_name ?>',
+        ]);
+<?php } else { ?>
         return new Response('Welcome to your new controller!');
+<?php } ?>
     }
 }
diff --git a/src/Resources/skeleton/controller/Controller.twig.php b/src/Resources/skeleton/controller/Controller.twig.php
@@ -0,0 +1,6 @@
+<?= $twig_first_line ?>
+
+{% block body %}
+<h1>Hello {{ controller_name }}!</h1>
+<p>From <code>templates/<?= $twig_file ?></code></p>
+{% endblock %}
diff --git a/src/Resources/skeleton/controller/ControllerWithTwig.tpl.php b/src/Resources/skeleton/controller/ControllerWithTwig.tpl.php
diff --git a/src/Str.php b/src/Str.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\MakerBundle;
 
+use Symfony\Component\DependencyInjection\Container;
+
 /**
  * @author Javier Eguiluz <javier.eguiluz@gmail.com>
  * @author Ryan Weaver <weaverryan@gmail.com>
@@ -97,6 +99,14 @@ public static function asEventMethod(string $eventName): string
         return sprintf('on%s', self::asClassName($eventName));
     }
 
+    public static function asFilePath(string $value): string
+    {
+        $value = Container::underscore(trim($value));
+        $value = str_replace('\\', '/', $value);
+
+        return $value;
+    }
+
     public static function getRandomTerm(): string
     {
         $adjectives = [

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,19 @@`
`6`	`6`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`7`	`7`	`use Symfony\Component\HttpFoundation\Response;`
`8`	`8`
`9`		`-class <?= $controller_class_name ?> extends Controller`
	`9`	`+class <?= $controller_class_name ?> extends AbstractController`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`	`12`	`* @Route("<?= $route_path ?>", name="<?= $route_name ?>")`
`13`	`13`	`*/`
`14`	`14`	`public function index()`
`15`	`15`	`{`
	`16`	`+<?php if ($twig_installed) { ?>`
	`17`	`+ return $this->render('<?= $twig_file ?>', [`
	`18`	`+ 'controller_name' => '<?= $controller_name ?>',`
	`19`	`+ ]);`
	`20`	`+<?php } else { ?>`
`16`	`21`	`return new Response('Welcome to your new controller!');`
	`22`	`+<?php } ?>`
`17`	`23`	`}`
`18`	`24`	`}`