[FrameworkBundle] Improve the DX of TemplateController when using SF 4

dunglas · dunglas · commit 6d150550cc34 · 2017-12-01T19:56:17.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -67,4 +67,9 @@ public function templateAction(string $template, int $maxAge = null, int $shared
 
         return $response;
     }
+
+    public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null): Response
+    {
+        return $this->templateAction($template, $maxAge, $sharedAge, $private);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
@@ -23,21 +23,23 @@ class TemplateControllerTest extends TestCase
     public function testTwig()
     {
         $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
-        $twig->expects($this->once())->method('render')->willReturn('bar');
+        $twig->expects($this->exactly(2))->method('render')->willReturn('bar');
 
         $controller = new TemplateController($twig);
 
         $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+        $this->assertEquals('bar', $controller('mytemplate')->getContent());
     }
 
     public function testTemplating()
     {
         $templating = $this->getMockBuilder(EngineInterface::class)->getMock();
-        $templating->expects($this->once())->method('render')->willReturn('bar');
+        $templating->expects($this->exactly(2))->method('render')->willReturn('bar');
 
         $controller = new TemplateController(null, $templating);
 
         $this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());
+        $this->assertEquals('bar', $controller('mytemplate')->getContent());
     }
 
     /**
@@ -49,5 +51,6 @@ public function testNoTwigNorTemplating()
         $controller = new TemplateController();
 
         $controller->templateAction('mytemplate')->getContent();
+        $controller('mytemplate')->getContent();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,9 @@ public function templateAction(string $template, int $maxAge = null, int $shared`
`67`	`67`
`68`	`68`	`return $response;`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null): Response`
	`72`	`+ {`
	`73`	`+ return $this->templateAction($template, $maxAge, $sharedAge, $private);`
	`74`	`+ }`
`70`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,21 +23,23 @@ class TemplateControllerTest extends TestCase`
`23`	`23`	`public function testTwig()`
`24`	`24`	`{`
`25`	`25`	`$twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();`
`26`		`- $twig->expects($this->once())->method('render')->willReturn('bar');`
	`26`	`+ $twig->expects($this->exactly(2))->method('render')->willReturn('bar');`
`27`	`27`
`28`	`28`	`$controller = new TemplateController($twig);`
`29`	`29`
`30`	`30`	`$this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());`
	`31`	`+ $this->assertEquals('bar', $controller('mytemplate')->getContent());`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public function testTemplating()`
`34`	`35`	`{`
`35`	`36`	`$templating = $this->getMockBuilder(EngineInterface::class)->getMock();`
`36`		`- $templating->expects($this->once())->method('render')->willReturn('bar');`
	`37`	`+ $templating->expects($this->exactly(2))->method('render')->willReturn('bar');`
`37`	`38`
`38`	`39`	`$controller = new TemplateController(null, $templating);`
`39`	`40`
`40`	`41`	`$this->assertEquals('bar', $controller->templateAction('mytemplate')->getContent());`
	`42`	`+ $this->assertEquals('bar', $controller('mytemplate')->getContent());`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`/**`
`@@ -49,5 +51,6 @@ public function testNoTwigNorTemplating()`
`49`	`51`	`$controller = new TemplateController();`
`50`	`52`
`51`	`53`	`$controller->templateAction('mytemplate')->getContent();`
	`54`	`+ $controller('mytemplate')->getContent();`
`52`	`55`	`}`
`53`	`56`	`}`