From 1151e3b9463b13b26ae8cc7f7ed947ffe11ffe17 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Sat, 18 Sep 2021 11:11:41 +1000
Subject: [PATCH] Issue #3233045 by daffie, longwave: [Symfony 6] Add "array"
type hint to methods overridding
Symfony\Component\Routing\Matcher\RequestMatcherInterface::matchRequest()
---
core/lib/Drupal/Core/Routing/AccessAwareRouter.php | 2 +-
core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php | 2 +-
core/lib/Drupal/Core/Routing/Router.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 916c384ecd77..b509d31ac802 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -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);
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php b/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
index 7b0c1c1fd320..3d3047ab120f 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
@@ -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}
diff --git a/core/lib/Drupal/Core/Routing/Router.php b/core/lib/Drupal/Core/Routing/Router.php
index bf9e7620deb8..19d738b75854 100644
--- a/core/lib/Drupal/Core/Routing/Router.php
+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -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);
}
--
GitLab