diff --git a/core/core.services.yml b/core/core.services.yml index 2bc5edc..a631572 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -1306,7 +1306,7 @@ services: tags: - { name: twig.extension, priority: 100 } calls: - - [setGenerators, ['@url_generator']] + - [setUrlGenerator, ['@url_generator']] - [setThemeManager, ['@theme.manager']] # @todo Figure out what to do about debugging functions. # @see https://www.drupal.org/node/1804998 diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php index 2b76b20..99e807a 100644 --- a/core/lib/Drupal/Core/Template/TwigExtension.php +++ b/core/lib/Drupal/Core/Template/TwigExtension.php @@ -65,8 +65,23 @@ public function __construct(RendererInterface $renderer) { * The URL generator. * * @return $this + * + * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0. + * Use \Drupal\Core\Template\TwigExtension::setUrlGenerator(). */ public function setGenerators(UrlGeneratorInterface $url_generator) { + return $this->setUrlGenerator($url_generator); + } + + /** + * Sets the URL generator. + * + * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator + * The URL generator. + * + * @return $this + */ + public function setUrlGenerator(UrlGeneratorInterface $url_generator) { $this->urlGenerator = $url_generator; return $this; } diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index ed82e38..75d0ef5 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -32,7 +32,7 @@ public function testEscaping($template, $expected) { 'autoescape' => TRUE, 'optimizations' => 0 )); - $twig->addExtension((new TwigExtension($renderer))->setGenerators($this->getMock('Drupal\Core\Routing\UrlGeneratorInterface'))); + $twig->addExtension((new TwigExtension($renderer))->setUrlGenerator($this->getMock('Drupal\Core\Routing\UrlGeneratorInterface'))); $nodes = $twig->parse($twig->tokenize($template));