diff --git a/core/core.services.yml b/core/core.services.yml index 2f7da56ae218764a0d868bdb84ae13712042b896..439b1ef490b1898435c77bb5dab36788effd2aa9 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -1408,7 +1408,7 @@ services: arguments: ['@app.root', '@theme_handler', '@cache.bootstrap', '@module_handler'] theme.registry: class: Drupal\Core\Theme\Registry - arguments: ['@app.root', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization', null, '@cache.bootstrap'] + arguments: ['@app.root', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization'] tags: - { name: needs_destruction } calls: diff --git a/core/lib/Drupal/Core/Theme/Registry.php b/core/lib/Drupal/Core/Theme/Registry.php index 9f716eaaee9bcdab66db627149cc861aed39e00e..d3f04555d8cd230cf94d4880617658315c4194a4 100644 --- a/core/lib/Drupal/Core/Theme/Registry.php +++ b/core/lib/Drupal/Core/Theme/Registry.php @@ -140,13 +140,6 @@ class Registry implements DestructableInterface { */ protected $themeManager; - /** - * The runtime cache. - * - * @var \Drupal\Core\Cache\CacheBackendInterface - */ - protected $runtimeCache; - /** * Constructs a \Drupal\Core\Theme\Registry object. * @@ -164,10 +157,8 @@ class Registry implements DestructableInterface { * The theme initialization. * @param string $theme_name * (optional) The name of the theme for which to construct the registry. - * @param \Drupal\Core\Cache\CacheBackendInterface $runtime_cache - * The cache backend interface to use for the runtime theme registry data. */ - public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $theme_name = NULL, CacheBackendInterface $runtime_cache = NULL) { + public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $theme_name = NULL) { $this->root = $root; $this->cache = $cache; $this->lock = $lock; @@ -175,7 +166,6 @@ public function __construct($root, CacheBackendInterface $cache, LockBackendInte $this->themeName = $theme_name; $this->themeHandler = $theme_handler; $this->themeInitialization = $theme_initialization; - $this->runtimeCache = $runtime_cache; } /** @@ -249,7 +239,7 @@ public function get() { public function getRuntime() { $this->init($this->themeName); if (!isset($this->runtimeRegistry[$this->theme->getName()])) { - $this->runtimeRegistry[$this->theme->getName()] = new ThemeRegistry('theme_registry:runtime:' . $this->theme->getName(), $this->runtimeCache ?: $this->cache, $this->lock, array('theme_registry'), $this->moduleHandler->isLoaded()); + $this->runtimeRegistry[$this->theme->getName()] = new ThemeRegistry('theme_registry:runtime:' . $this->theme->getName(), $this->cache, $this->lock, array('theme_registry'), $this->moduleHandler->isLoaded()); } return $this->runtimeRegistry[$this->theme->getName()]; }