Skip to content

Commit 40c7bb5

Browse files
Remove BC layers related to new methods and new parameters
1 parent e0225f4 commit 40c7bb5

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
7.0
5+
---
6+
7+
* Add argument `$routeParameters` to `UrlMatcher::handleRouteRequirements()`
8+
49
6.4
510
---
611

Matcher/UrlMatcher.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,8 @@ protected function getAttributes(Route $route, string $name, array $attributes):
216216
*
217217
* @return array The first element represents the status, the second contains additional information
218218
*/
219-
protected function handleRouteRequirements(string $pathinfo, string $name, Route $route/* , array $routeParameters */): array
219+
protected function handleRouteRequirements(string $pathinfo, string $name, Route $route, array $routeParameters): array
220220
{
221-
if (\func_num_args() < 4) {
222-
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__);
223-
$routeParameters = [];
224-
} else {
225-
$routeParameters = func_get_arg(3);
226-
227-
if (!\is_array($routeParameters)) {
228-
throw new \TypeError(sprintf('"%s": Argument $routeParameters is expected to be an array, got "%s".', __METHOD__, get_debug_type($routeParameters)));
229-
}
230-
}
231-
232221
// expression condition
233222
if ($route->getCondition() && !$this->getExpressionLanguage()->evaluate($route->getCondition(), [
234223
'context' => $this->context,

0 commit comments

Comments
 (0)