Merge branch '6.4' into 7.0

* 6.4:
  [FrameworkBundle] Deprecate not setting both `framework.session.save_path` and `framework.session.handler_id` at the same time
  [Translation] add @welcoMattic as codeowner
  [FrameworkBundle] Add `AbstractController::renderBlock()` and `renderBlockView()`
  [Clock] Add $modifier argument to now() helper

Author: nicolas-grekas

CHANGELOG.md

@@ -18,6 +18,7 @@ CHANGELOG
 6.4
 ---
 
+ * Add `AbstractController::renderBlock()` and `renderBlockView()`
  * 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
@@ -31,6 +32,7 @@ CHANGELOG
  * Deprecate not setting the `framework.session.cookie_secure` config option; it will default to `auto` in 7.0
  * Deprecate not setting the `framework.session.cookie_samesite` config option; it will default to `lax` in 7.0
  * Deprecate not setting the `framework.session.handler_id` config option; it will default to `session.handler.native_file` when `framework.session.save_path` is set or `null` otherwise in 7.0
+ * Deprecate not setting the `framework.session.save_path` config option when `framework.session.handler_id` is not set; it will default to `null` in 7.0
  * Deprecate not setting the `framework.uid.default_uuid_version` config option; it will default to `7` in 7.0
  * Deprecate not setting the `framework.uid.time_based_uuid_version` config option; it will default to `7` in 7.0
  * Deprecate not setting the `framework.validation.email_validation_mode` config option; it will default to `html5` in 7.0

Controller/AbstractController.php

@@ -226,17 +226,17 @@ protected function denyAccessUnlessGranted(mixed $attribute, mixed $subject = nu
      */
     protected function renderView(string $view, array $parameters = []): string
     {
-        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".');
-        }
-
-        foreach ($parameters as $k => $v) {
-            if ($v instanceof FormInterface) {
-                $parameters[$k] = $v->createView();
-            }
-        }
+        return $this->doRenderView($view, null, $parameters, __FUNCTION__);
+    }
 
-        return $this->container->get('twig')->render($view, $parameters);
+    /**
+     * Returns a rendered block from a view.
+     *
+     * Forms found in parameters are auto-cast to form views.
+     */
+    protected function renderBlockView(string $view, string $block, array $parameters = []): string
+    {
+        return $this->doRenderView($view, $block, $parameters, __FUNCTION__);
     }
 
     /**
@@ -247,21 +247,18 @@ protected function renderView(string $view, array $parameters = []): string
      */
     protected function render(string $view, array $parameters = [], Response $response = null): Response
     {
-        $content = $this->renderView($view, $parameters);
-        $response ??= new Response();
-
-        if (200 === $response->getStatusCode()) {
-            foreach ($parameters as $v) {
-                if ($v instanceof FormInterface && $v->isSubmitted() && !$v->isValid()) {
-                    $response->setStatusCode(422);
-                    break;
-                }
-            }
-        }
-
-        $response->setContent($content);
+        return $this->doRender($view, null, $parameters, $response, __FUNCTION__);
+    }
 
-        return $response;
+    /**
+     * Renders a block in a view.
+     *
+     * 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.
+     */
+    protected function renderBlock(string $view, string $block, array $parameters = [], Response $response = null): Response
+    {
+        return $this->doRender($view, $block, $parameters, $response, __FUNCTION__);
     }
 
     /**
@@ -414,4 +411,42 @@ protected function sendEarlyHints(iterable $links = [], Response $response = nul
 
         return $response;
     }
+
+    private function doRenderView(string $view, ?string $block, array $parameters, string $method): string
+    {
+        if (!$this->container->has('twig')) {
+            throw new \LogicException(sprintf('You cannot use the "%s" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".', $method));
+        }
+
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof FormInterface) {
+                $parameters[$k] = $v->createView();
+            }
+        }
+
+        if (null !== $block) {
+            return $this->container->get('twig')->load($view)->renderBlock($block, $parameters);
+        }
+
+        return $this->container->get('twig')->render($view, $parameters);
+    }
+
+    private function doRender(string $view, ?string $block, array $parameters, ?Response $response, string $method): Response
+    {
+        $content = $this->doRenderView($view, $block, $parameters, $method);
+        $response ??= new Response();
+
+        if (200 === $response->getStatusCode()) {
+            foreach ($parameters as $v) {
+                if ($v instanceof FormInterface && $v->isSubmitted() && !$v->isValid()) {
+                    $response->setStatusCode(422);
+                    break;
+                }
+            }
+        }
+
+        $response->setContent($content);
+
+        return $response;
+    }
 }

DependencyInjection/Configuration.php

@@ -661,11 +661,19 @@ private function addSessionSection(ArrayNodeDefinition $rootNode): void
                         }
 
                         if (!\array_key_exists('handler_id', $v['session'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.session.handler_id" config option is deprecated. It will default to "session.handler.native_file" when "framework.session.save_path" is set or "null" otherwise in 7.0.');
+                            if (!\array_key_exists('save_path', $v['session'])) {
+                                trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.session.save_path" config option when the "framework.session.handler_id" config option is not set either is deprecated. Both options will default to "null" in 7.0.');
+                            } else {
+                                trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.session.handler_id" config option is deprecated. It will default to "session.handler.native_file" when "framework.session.save_path" is set or "null" otherwise in 7.0.');
+                            }
                         }
                     }
 
-                    $v['session'] += ['cookie_samesite' => null, 'handler_id' => 'session.handler.native_file'];
+                    $v['session'] += [
+                        'cookie_samesite' => null,
+                        'handler_id' => 'session.handler.native_file',
+                        'save_path' => '%kernel.cache_dir%/sessions',
+                    ];
 
                     return $v;
                 })
@@ -697,7 +705,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode): void
                         ->scalarNode('gc_divisor')->end()
                         ->scalarNode('gc_probability')->defaultValue(1)->end()
                         ->scalarNode('gc_maxlifetime')->end()
-                        ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
+                        ->scalarNode('save_path')->end()
                         ->integerNode('metadata_update_threshold')
                             ->defaultValue(0)
                             ->info('seconds to wait between 2 session metadata updates')