[FrameworkBundle] Add $block argument to AbstractController:render() and renderView()

nicolas-grekas · nicolas-grekas · commit cea3081977b3 · 2023-08-09T17:02:00.000+02:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -78,6 +78,7 @@ FrameworkBundle
 ---------------
 
  * [BC break] Add native return type to `Translator` and to `Application::reset()`
+ * Add `$block` argument to `AbstractController:render()` and `renderView()`
  * Deprecate the integration of Doctrine annotations, either uninstall the `doctrine/annotations` package or disable
    the integration by setting `framework.annotations` to `false`
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.4
 ---
 
+ * Add `$block` argument to `AbstractController:render()` and `renderView()`
  * Add native return type to `Translator` and to `Application::reset()`
  * Deprecate the integration of Doctrine annotations, either uninstall the `doctrine/annotations` package or disable the integration by setting `framework.annotations` to `false`
  * Enable `json_decode_detailed_errors` context for Serializer by default if `kernel.debug` is true and the `seld/jsonlint` package is installed
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -226,9 +226,13 @@ protected function denyAccessUnlessGranted(mixed $attribute, mixed $subject = nu
      * Returns a rendered view.
      *
      * Forms found in parameters are auto-cast to form views.
+     *
+     * @param string|null $block
      */
-    protected function renderView(string $view, array $parameters = []): string
+    protected function renderView(string $view, array $parameters = []/* , string $block = null */): string
     {
+        $block = 2 < \func_num_args() ? func_get_arg(2) : null;
+
         if (!$this->container->has('twig')) {
             throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
         }
@@ -239,6 +243,10 @@ protected function renderView(string $view, array $parameters = []): string
             }
         }
 
+        if (null !== $block) {
+            return $this->container->get('twig')->load($view)->renderBlock($block, $parameters);
+        }
+
         return $this->container->get('twig')->render($view, $parameters);
     }
 
@@ -247,10 +255,13 @@ protected function renderView(string $view, array $parameters = []): string
      *
      * If an invalid form is found in the list of parameters, a 422 status code is returned.
      * Forms found in parameters are auto-cast to form views.
+     *
+     * @param string|null $block
      */
-    protected function render(string $view, array $parameters = [], Response $response = null): Response
+    protected function render(string $view, array $parameters = [], Response $response = null/* , string $block = null */): Response
     {
-        $content = $this->renderView($view, $parameters);
+        $block = 2 < \func_num_args() ? func_get_arg(2) : null;
+        $content = $this->renderView($view, $parameters, $block);
         $response ??= new Response();
 
         if (200 === $response->getStatusCode()) {

Original file line number	Diff line number	Diff line change
`@@ -226,9 +226,13 @@ protected function denyAccessUnlessGranted(mixed $attribute, mixed $subject = nu`
`226`	`226`	`* Returns a rendered view.`
`227`	`227`	`*`
`228`	`228`	`* Forms found in parameters are auto-cast to form views.`
	`229`	`+ *`
	`230`	`+ * @param string\|null $block`
`229`	`231`	`*/`
`230`		`- protected function renderView(string $view, array $parameters = []): string`
	`232`	`+ protected function renderView(string $view, array $parameters = []/* , string $block = null */): string`
`231`	`233`	`{`
	`234`	`+ $block = 2 < \func_num_args() ? func_get_arg(2) : null;`
	`235`	`+`
`232`	`236`	`if (!$this->container->has('twig')) {`
`233`	`237`	`throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');`
`234`	`238`	`}`
`@@ -239,6 +243,10 @@ protected function renderView(string $view, array $parameters = []): string`
`239`	`243`	`}`
`240`	`244`	`}`
`241`	`245`
	`246`	`+ if (null !== $block) {`
	`247`	`+ return $this->container->get('twig')->load($view)->renderBlock($block, $parameters);`
	`248`	`+ }`
	`249`	`+`
`242`	`250`	`return $this->container->get('twig')->render($view, $parameters);`
`243`	`251`	`}`
`244`	`252`
`@@ -247,10 +255,13 @@ protected function renderView(string $view, array $parameters = []): string`
`247`	`255`	`*`
`248`	`256`	`* If an invalid form is found in the list of parameters, a 422 status code is returned.`
`249`	`257`	`* Forms found in parameters are auto-cast to form views.`
	`258`	`+ *`
	`259`	`+ * @param string\|null $block`
`250`	`260`	`*/`
`251`		`- protected function render(string $view, array $parameters = [], Response $response = null): Response`
	`261`	`+ protected function render(string $view, array $parameters = [], Response $response = null/* , string $block = null */): Response`
`252`	`262`	`{`
`253`		`- $content = $this->renderView($view, $parameters);`
	`263`	`+ $block = 2 < \func_num_args() ? func_get_arg(2) : null;`
	`264`	`+ $content = $this->renderView($view, $parameters, $block);`
`254`	`265`	`$response ??= new Response();`
`255`	`266`
`256`	`267`	`if (200 === $response->getStatusCode()) {`