Unverified Commit 1151e3b9 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3233045 by daffie, longwave: [Symfony 6] Add "array" type hint to... 

Issue #3233045 by daffie, longwave: [Symfony 6] Add "array" type hint to methods overridding Symfony\Component\Routing\Matcher\RequestMatcherInterface::matchRequest()
parent f6094b0e

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public function getContext() { 
   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException

   *   Thrown when access checking failed.

   */

  public function matchRequest(Request $request) {

  public function matchRequest(Request $request): array {

    $parameters = $this->router->matchRequest($request);

    $request->attributes->add($parameters);

    $this->checkAccess($request);

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ interface AccessAwareRouterInterface extends RouterInterface, RequestMatcherInte 
   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException

   *   Thrown when access checking failed.

   */

  public function matchRequest(Request $request);

  public function matchRequest(Request $request): array;



  /**

   * {@inheritdoc}

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

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public function match($pathinfo) { 
  /**

   * {@inheritdoc}

   */

  public function matchRequest(Request $request) {

  public function matchRequest(Request $request): array {

    try {

      $collection = $this->getInitialRouteCollection($request);

    }