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

Issue #2330043 by andypost: Theme handler is not needed for theme manager.

8.0.x
webchick 2014-08-29 23:08:36 -07:00
parent d1670a7bdf
commit 408458672c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.services.yml
View File

@ -873,7 +873,7 @@ services:
class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry
theme.manager:
class: Drupal\Core\Theme\ThemeManager
arguments: ['@theme_handler', '@theme.registry', '@theme.negotiator', '@theme.initialization', '@request_stack']
arguments: ['@theme.registry', '@theme.negotiator', '@theme.initialization', '@request_stack']
theme.initialization:
class: Drupal\Core\Theme\ThemeInitialization
arguments: ['@theme_handler', '@state']

12
core/lib/Drupal/Core/Theme/ThemeManager.php
View File

@ -7,7 +7,6 @@
namespace Drupal\Core\Theme;
use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Routing\StackedRouteMatchInterface;
use Symfony\Component\HttpFoundation\RequestStack;
@ -18,11 +17,11 @@ use Symfony\Component\HttpFoundation\RequestStack;
class ThemeManager implements ThemeManagerInterface {
/**
* The theme handler used to get a list of all themes.
* The theme negotiator.
*
* @var \Drupal\Core\Extension\ThemeHandlerInterface
* @var \Drupal\Core\Theme\ThemeNegotiatorInterface
*/
protected $themeHandler;
protected $themeNegotiator;
/**
* The theme registry used to render an output.
@ -51,8 +50,6 @@ class ThemeManager implements ThemeManagerInterface {
/**
* Constructs a new ThemeManager object.
*
* @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
* The theme handler.
* @param \Drupal\Core\Theme\Registry $theme_registry
* The theme registry.
* @param \Drupal\Core\Theme\ThemeNegotiatorInterface $theme_negotiator
@ -62,8 +59,7 @@ class ThemeManager implements ThemeManagerInterface {
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* The request stack.
*/
public function __construct(ThemeHandlerInterface $theme_handler, Registry $theme_registry, ThemeNegotiatorInterface $theme_negotiator, ThemeInitialization $theme_initialization, RequestStack $request_stack) {
$this->themeHandler = $theme_handler;
public function __construct(Registry $theme_registry, ThemeNegotiatorInterface $theme_negotiator, ThemeInitialization $theme_initialization, RequestStack $request_stack) {
$this->themeNegotiator = $theme_negotiator;
$this->themeRegistry = $theme_registry;
$this->themeInitialization = $theme_initialization;