Commit b0a87e42 authored by catch's avatar catch
Browse files

Issue #3278122 by andregp, mondrake, Spokje, daffie: Since symfony/routing... 

Issue #3278122 by andregp, mondrake, Spokje, daffie: Since symfony/routing 6.1: The "Symfony\Component\Routing\Matcher\UrlMatcher::handleRouteRequirements()" method will have a new "array $routeParameters" argument in version 7.0, not defining it is deprecated

(cherry picked from commit 256ceca3)
parent d07d94ce

core/.deprecation-ignore.txt

+0 −2
Original line number Diff line number Diff line
@@ -31,5 +31,3 @@ 
%"PHPUnit\\Framework\\TestSuite".*is considered internal%

%"PHPUnit\\TextUI\\DefaultResultPrinter".*is considered internal%

# Symfony 6.1 deprecations.

%Since symfony\/routing 6\.1: The .*UrlMatcher::handleRouteRequirements\(\).* method will have a new .*routeParameters.* argument in version 7\.0, not defining it is deprecated%

core/lib/Drupal/Core/Routing/Router.php

+4 −2
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ protected function doMatchCollection($pathinfo, RouteCollection $routes, $case_s 
        }

      }



      $status = $this->handleRouteRequirements($pathinfo, $name, $route);

      $attributes = $this->getAttributes($route, $name, array_replace($matches, $hostMatches));



      $status = $this->handleRouteRequirements($pathinfo, $name, $route, $attributes);



      if (self::ROUTE_MATCH === $status[0]) {

        return $status[1];
@@ -201,7 +203,7 @@ protected function doMatchCollection($pathinfo, RouteCollection $routes, $case_s 
        continue;

      }



      return $this->getAttributes($route, $name, array_replace($matches, $hostMatches));

      return $attributes;

    }

  }