minor #46131 [Routing] Fix changelog & deprecation message for #46042 (HypeMC)

Tobion · Tobion · commit 18ef471eaffd · 2022-04-21T09:40:12.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [Routing] Fix changelog & deprecation message for #46042 | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Since #46042 was merged into 6.1 the changelog & deprecation message are now wrong. cc `@fabpot` Commits ------- bb37826 [Routing] Fix changelog & deprecation message for #46042
diff --git a/UPGRADE-6.1.md b/UPGRADE-6.1.md
@@ -32,6 +32,11 @@ HttpKernel
 
  * Deprecate StreamedResponseListener, it's not needed anymore
 
+Routing
+-------
+
+ * Add argument `$routeParameters` to `UrlMatcher::handleRouteRequirements()`
+
 Serializer
 ----------
 
diff --git a/UPGRADE-6.2.md b/UPGRADE-6.2.md
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/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);

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ protected function getAttributes(Route $route, string $name, array $attributes):`
`225`	`225`	`protected function handleRouteRequirements(string $pathinfo, string $name, Route $route/, array $routeParameters/): array`
`226`	`226`	`{`
`227`	`227`	`if (\func_num_args() < 4) {`
`228`		`- 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__);`
	`228`	`+ 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__);`
`229`	`229`	`$routeParameters = [];`
`230`	`230`	`} else {`
`231`	`231`	`$routeParameters = func_get_arg(3);`