Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit c647b0162e21 · 2023-12-29T16:37:40.000+01:00
* 6.4:
  [Cache] fix the previous fix
  [Cache] Fix expiration time for CouchbaseCollection
  [FrameworkBundle] Update docblock AbstractController
  [HttpFoundation][FrameworkBundle] Fix default locale is ignored when set_locale_from_accept_language is used
  add missing translations
  [Validator] updated Lithuanian translation
  [Validator] fix some non-sense Lithuanian translations
  [Validator] updated Slovenian translation
  [Validator] updated Finnish translation
  [RateLimit] Test and fix peeking behavior on rate limit policies
  [Validator] Add `Charset` french translation
  [Tests] Streamline CompiledUrlGenerator tests
  [Serializer] Skip uninitialized properties with deep_object_to_populate
  fix Constraints\Email::ERROR_NAMES
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
@@ -108,7 +108,7 @@ protected function generateUrl(string $route, array $parameters = [], int $refer
     /**
      * Forwards the request to another controller.
      *
-     * @param string $controller The controller name (a string like Bundle\BlogBundle\Controller\PostController::indexAction)
+     * @param string $controller The controller name (a string like "App\Controller\PostController::index" or "App\Controller\PostController" if it is invokable)
      */
     protected function forward(string $controller, array $path = [], array $query = []): Response
     {

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function generateUrl(string $route, array $parameters = [], int $refer`
`108`	`108`	`/**`
`109`	`109`	`* Forwards the request to another controller.`
`110`	`110`	`*`
`111`		`- * @param string $controller The controller name (a string like Bundle\BlogBundle\Controller\PostController::indexAction)`
	`111`	`+ * @param string $controller The controller name (a string like "App\Controller\PostController::index" or "App\Controller\PostController" if it is invokable)`
`112`	`112`	`*/`
`113`	`113`	`protected function forward(string $controller, array $path = [], array $query = []): Response`
`114`	`114`	`{`