symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+9-8Lines changed: 9 additions & 8 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+9-8Lines changed: 9 additions & 8 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
+20Lines changed: 20 additions & 0 deletions
@@ -8,6 +8,7 @@ CHANGELOG
  * Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.
  * Added flex-compatible default implementations for `MicroKernelTrait::registerBundles()` and `getProjectDir()`
  * Deprecated passing a `RouteCollectionBuiler` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
+ * The `TemplateController` now accepts context argument
 
 5.0.0
 -----
 
@@ -33,18 +33,19 @@ public function __construct(Environment $twig = null)
     /**
      * Renders a template.
      *
-     * @param string    $template  The template name
-     * @param int|null  $maxAge    Max age for client caching
-     * @param int|null  $sharedAge Max age for shared (proxy) caching
-     * @param bool|null $private   Whether or not caching should apply for client caches only
+     * @param string     $template  The template name
+     * @param int|null   $maxAge    Max age for client caching
+     * @param int|null   $sharedAge Max age for shared (proxy) caching
+     * @param bool|null  $private   Whether or not caching should apply for client caches only
+     * @param array      $context   The context (arguments) of the template
      */
-    public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null): Response
+    public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = []): Response
     {
         if (null === $this->twig) {
             throw new \LogicException('You can not use the TemplateController if the Twig Bundle is not available.');
         }
 
-        $response = new Response($this->twig->render($template));
+        $response = new Response($this->twig->render($template, $context));
 
         if ($maxAge) {
             $response->setMaxAge($maxAge);
@@ -63,8 +64,8 @@ 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
+    public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = []): Response
     {
-        return $this->templateAction($template, $maxAge, $sharedAge, $private);
+        return $this->templateAction($template, $maxAge, $sharedAge, $private, $context);
     }
 }
@@ -13,6 +13,8 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -39,4 +41,22 @@ public function testNoTwig()
         $controller->templateAction('mytemplate')->getContent();
         $controller('mytemplate')->getContent();
     }
+
+    public function testContext()
+    {
+        $templateName = 'template_controller.html.twig';
+        $context = [
+            'param' => 'hello world',
+        ];
+        $expected = '<h1>'.$context['param'].'</h1>';
+
+        $loader = new ArrayLoader();
+        $loader->setTemplate($templateName, '<h1>{{param}}</h1>');
+
+        $twig = new Environment($loader);
+        $controller = new TemplateController($twig);
+
+        $this->assertEquals($expected, $controller->templateAction($templateName, null, null, null, $context)->getContent());
+        $this->assertEquals($expected, $controller($templateName, null, null, null, $context)->getContent());
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,19 @@ public function __construct(Environment $twig = null)`
`33`	`33`	`/**`
`34`	`34`	`* Renders a template.`
`35`	`35`	`*`
`36`		`- * @param string $template The template name`
`37`		`- * @param int\|null $maxAge Max age for client caching`
`38`		`- * @param int\|null $sharedAge Max age for shared (proxy) caching`
`39`		`- * @param bool\|null $private Whether or not caching should apply for client caches only`
	`36`	`+ * @param string $template The template name`
	`37`	`+ * @param int\|null $maxAge Max age for client caching`
	`38`	`+ * @param int\|null $sharedAge Max age for shared (proxy) caching`
	`39`	`+ * @param bool\|null $private Whether or not caching should apply for client caches only`
	`40`	`+ * @param array $context The context (arguments) of the template`
`40`	`41`	`*/`
`41`		`- public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null): Response`
	`42`	`+ public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = []): Response`
`42`	`43`	`{`
`43`	`44`	`if (null === $this->twig) {`
`44`	`45`	`throw new \LogicException('You can not use the TemplateController if the Twig Bundle is not available.');`
`45`	`46`	`}`
`46`	`47`
`47`		`- $response = new Response($this->twig->render($template));`
	`48`	`+ $response = new Response($this->twig->render($template, $context));`
`48`	`49`
`49`	`50`	`if ($maxAge) {`
`50`	`51`	`$response->setMaxAge($maxAge);`
`@@ -63,8 +64,8 @@ public function templateAction(string $template, int $maxAge = null, int $shared`
`63`	`64`	`return $response;`
`64`	`65`	`}`
`65`	`66`
`66`		`- public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null): Response`
	`67`	`+ public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = []): Response`
`67`	`68`	`{`
`68`		`- return $this->templateAction($template, $maxAge, $sharedAge, $private);`
	`69`	`+ return $this->templateAction($template, $maxAge, $sharedAge, $private, $context);`
`69`	`70`	`}`
`70`	`71`	`}`