[Routing] Fix changelog & deprecation message for #46042

symfony · Apr 21, 2022 · 67f8e56 · 67f8e56
1 parent 6d18b11
commit 67f8e56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,6 @@
 CHANGELOG
 =========
 
-6.2
----
-
- * Add `params` variable to condition expression
- * Deprecate not passing route parameters as the fourth argument to `UrlMatcher::handleRouteRequirements()`
-
 6.1
 ---
 
@@ -16,6 +10,8 @@ CHANGELOG
  * Already encoded slashes are not decoded nor double-encoded anymore when generating URLs (query parameters)
  * Add `EnumRequirement` to help generate route requirements from a `\BackedEnum`
  * Add `Requirement`, a collection of universal regular-expression constants to use as route parameter requirements
+ * Add `params` variable to condition expression
+ * Deprecate not passing route parameters as the fourth argument to `UrlMatcher::handleRouteRequirements()`
 
 5.3
 ---

diff --git a/Matcher/UrlMatcher.php b/Matcher/UrlMatcher.php
@@ -225,7 +225,7 @@ protected function getAttributes(Route $route, string $name, array $attributes):
     protected function handleRouteRequirements(string $pathinfo, string $name, Route $route/*, array $routeParameters*/): array
     {
         if (\func_num_args() < 4) {
-            trigger_deprecation('symfony/routing', '6.2', 'The "%s()" method will have a new "array $routeParameters" argument in version 7.0, not defining it is deprecated.', __METHOD__);
+            trigger_deprecation('symfony/routing', '6.1', 'The "%s()" method will have a new "array $routeParameters" argument in version 7.0, not defining it is deprecated.', __METHOD__);
             $routeParameters = [];
         } else {
             $routeParameters = func_get_arg(3);