Skip to content

[Routing] Fix changelog & deprecation message for #46042 #46131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2022
Merged

[Routing] Fix changelog & deprecation message for #46042 #46131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions UPGRADE-6.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ HttpKernel

* Deprecate StreamedResponseListener, it's not needed anymore

Routing
-------

* Add argument `$routeParameters` to `UrlMatcher::handleRouteRequirements()`

Serializer
----------

Expand Down
7 changes: 0 additions & 7 deletions UPGRADE-6.2.md
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions src/Symfony/Component/Routing/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
---

Expand All @@ -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
---
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Matcher/UrlMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down