Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3232895 by daffie: [Symfony 6] Add "string" type hint to methods overridding Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate()

merge-requests/1117/merge
Alex Pott 2021-09-20 11:51:12 +01:00
parent 9d36d02846
commit dfa9d9de43
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
View File

@ -91,7 +91,7 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
/** /**
* {@inheritdoc} * {@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; $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
$generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE); $generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE);
$this->bubble($generated_url); $this->bubble($generated_url);

2
core/lib/Drupal/Core/Routing/AccessAwareRouter.php
View File

@ -135,7 +135,7 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
/** /**
* {@inheritdoc} * {@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) { if ($this->router instanceof UrlGeneratorInterface) {
return $this->router->generate($name, $parameters, $referenceType); return $this->router->generate($name, $parameters, $referenceType);
} }

2
core/lib/Drupal/Core/Routing/Router.php
View File

@ -331,7 +331,7 @@ class Router extends UrlMatcher implements RequestMatcherInterface, RouterInterf
/** /**
* {@inheritdoc} * {@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); @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); return $this->urlGenerator->generate($name, $parameters, $referenceType);
} }

2
core/lib/Drupal/Core/Routing/UrlGenerator.php
View File

@ -254,7 +254,7 @@ class UrlGenerator implements UrlGeneratorInterface {
/** /**
* {@inheritdoc} * {@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; $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
return $this->generateFromRoute($name, $parameters, $options); return $this->generateFromRoute($name, $parameters, $options);
} }