diff --git a/core/.deprecation-ignore.txt b/core/.deprecation-ignore.txt index c4cdd883e8eae6d4402a9fd7b5afe8d680369472..e0e1c111a0b26df129bb841bc319742c577bdc0c 100644 --- a/core/.deprecation-ignore.txt +++ b/core/.deprecation-ignore.txt @@ -32,5 +32,4 @@ %"PHPUnit\\TextUI\\DefaultResultPrinter".*is considered internal% # Symfony 6.1 deprecations. -%Since symfony\/routing 6\.1: Construction of .*MissingMandatoryParametersException.* with an exception message is deprecated, provide the route name and an array of missing parameters instead% %Since symfony\/routing 6\.1: The .*UrlMatcher::handleRouteRequirements\(\).* method will have a new .*routeParameters.* argument in version 7\.0, not defining it is deprecated% diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php index 185784db374db7e7f724fd7d0f4122975751fda8..7efa6b75b80ce0fabd0d4d928884389a004637ce 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -178,7 +178,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens, // all params must be given if ($diff = array_diff_key($variables, $mergedParams)) { - throw new MissingMandatoryParametersException(sprintf('Some mandatory parameters are missing ("%s") to generate a URL for route "%s".', implode('", "', array_keys($diff)), $name)); + throw new MissingMandatoryParametersException($name, array_keys($diff)); } $url = ''; diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php index 865779dc090c9d066a2b06db167f9cdfc7813e11..2bd2e03755c55e021abaeaf5c3c9e729fdec51f7 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php @@ -407,7 +407,7 @@ public function testUriRelationships() { $url_generator->expects($this->any()) ->method('generateFromRoute') ->with($route_name_1) - ->willThrowException(new MissingMandatoryParametersException()); + ->willThrowException(new MissingMandatoryParametersException($route_name_1, ['missing_parameter'])); $this->assertEquals([], $entity->uriRelationships()); }