Unverified Commit 61b7e46b authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3233041 by daffie: [Symfony 6] Add "array" type hint to methods... 

Issue #3233041 by daffie: [Symfony 6] Add "array" type hint to methods overridding Symfony\Component\Routing\Matcher\UrlMatcherInterface::match()
parent dfa9d9de

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT 
   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException

   *   Thrown when access checking failed.

   */

  public function match($pathinfo) {

  public function match($pathinfo): array {

    return $this->matchRequest(Request::create($pathinfo));

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ public function matchRequest(Request $request): array; 
   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException

   *   Thrown when $access_check is enabled and access checking failed.

   */

  public function match($pathinfo);

  public function match($pathinfo): array;



}

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public function addRouteEnhancer(EnhancerInterface $route_enhancer) { 
  /**

   * {@inheritdoc}

   */

  public function match($pathinfo) {

  public function match($pathinfo): array {

    $request = Request::create($pathinfo);



    return $this->matchRequest($request);