reverted: --- b/core/core.services.yml +++ a/core/core.services.yml @@ -1219,7 +1219,8 @@ tags: - { name: twig.extension, priority: 100 } calls: + - [setGenerators, ['@url_generator']] + - [setLinkGenerator, ['@link_generator']] - - [setDependencies, ['@url_generator', '@link_generator', '@theme.manager']] # @todo Figure out what to do about debugging functions. # @see http://drupal.org/node/1804998 twig.extension.debug: reverted: --- b/core/lib/Drupal/Core/Template/TwigExtension.php +++ a/core/lib/Drupal/Core/Template/TwigExtension.php @@ -15,7 +15,6 @@ use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Url; use Drupal\Core\Utility\LinkGeneratorInterface; -use Drupal\Core\Theme\ThemeManagerInterface; /** * A class providing Drupal Twig extensions. @@ -41,28 +40,26 @@ protected $linkGenerator; /** + * Constructs \Drupal\Core\Template\TwigExtension. - * The theme manager. * + * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator + * The URL generator. - * @var \Drupal\Core\Theme\ThemeManagerInterface; */ + public function setGenerators(UrlGeneratorInterface $url_generator) { + $this->urlGenerator = $url_generator; + return $this; + } - protected $themeManager; /** + * Sets the link generator. - * Constructs \Drupal\Core\Template\TwigExtension. * - * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator - * The URL generator. * @param \Drupal\Core\Utility\LinkGeneratorInterface $link_generator * The link generator. - * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager - * The theme manager. * * @return $this */ + public function setLinkGenerator(LinkGeneratorInterface $link_generator) { - public function setDependencies(UrlGeneratorInterface $url_generator, LinkGeneratorInterface $link_generator, ThemeManagerInterface $theme_manager) { - $this->urlGenerator = $url_generator; $this->linkGenerator = $link_generator; - $this->themeManager = $theme_manager; return $this; } @@ -80,7 +77,6 @@ new \Twig_SimpleFunction('url_from_path', array($this, 'getUrlFromPath'), array('is_safe_callback' => array($this, 'isUrlGenerationSafe'))), new \Twig_SimpleFunction('link', array($this, 'getLink')), new \Twig_SimpleFunction('file_url', 'file_create_url'), - new \Twig_SimpleFunction('active_theme', array($this, 'activeTheme')), ); } @@ -223,16 +219,6 @@ } /** - * Gets the name of the active theme. - * - * @return string - * The name of the active theme. - */ - public function activeTheme() { - return $this->themeManager->getActiveTheme()->getName(); - } - - /** * Determines at compile time whether the generated URL will be safe. * * Saves the unneeded automatic escaping for performance reasons. reverted: --- b/core/modules/system/src/Tests/Theme/EngineTwigTest.php +++ a/core/modules/system/src/Tests/Theme/EngineTwigTest.php @@ -111,13 +111,4 @@ $this->assertRaw('