From dfa9d9de433d599ee3ff76189c9efe39ae717afc Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 20 Sep 2021 11:51:12 +0100
Subject: [PATCH] Issue #3232895 by daffie: [Symfony 6] Add "string" type hint
to methods overridding
Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate()
---
core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php | 2 +-
core/lib/Drupal/Core/Routing/AccessAwareRouter.php | 2 +-
core/lib/Drupal/Core/Routing/Router.php | 2 +-
core/lib/Drupal/Core/Routing/UrlGenerator.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
index 6a5527bdebd3..82c71377a77d 100644
--- a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
+++ b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
@@ -91,7 +91,7 @@ protected function bubble(GeneratedUrl $generated_url, array $options = []) {
/**
* {@inheritdoc}
*/
- public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+ public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string {
$options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
$generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE);
$this->bubble($generated_url);
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index b509d31ac802..b8d8ea2817f4 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -135,7 +135,7 @@ public function getRouteCollection(): RouteCollection {
/**
* {@inheritdoc}
*/
- public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+ public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string {
if ($this->router instanceof UrlGeneratorInterface) {
return $this->router->generate($name, $parameters, $referenceType);
}
diff --git a/core/lib/Drupal/Core/Routing/Router.php b/core/lib/Drupal/Core/Routing/Router.php
index 19d738b75854..cb3e5586f90c 100644
--- a/core/lib/Drupal/Core/Routing/Router.php
+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -331,7 +331,7 @@ public function getRouteCollection(): RouteCollection {
/**
* {@inheritdoc}
*/
- public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+ public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string {
@trigger_error(__METHOD__ . '() is deprecated in drupal:8.3.0 and will throw an exception from drupal:10.0.0. Use the \Drupal\Core\Url object instead. See https://www.drupal.org/node/2820197', E_USER_DEPRECATED);
return $this->urlGenerator->generate($name, $parameters, $referenceType);
}
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 5e21568be586..c4276a3d224c 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -254,7 +254,7 @@ protected function getInternalPathFromRoute($name, SymfonyRoute $route, $paramet
/**
* {@inheritdoc}
*/
- public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+ public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string {
$options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
return $this->generateFromRoute($name, $parameters, $options);
}
--
GitLab