Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 5.4:
  [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
  [Validator] Add `Charset` french translation
  [Tests] Streamline CompiledUrlGenerator tests
  [Serializer] Skip uninitialized properties with deep_object_to_populate
  fix Constraints\Email::ERROR_NAMES
  • Loading branch information
nicolas-grekas committed Dec 29, 2023
2 parents 00e9503 + ee446bb commit 0b436fd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Controller/AbstractController.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,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
{
Expand Down

0 comments on commit 0b436fd

Please sign in to comment.