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

Issue #2389407 by chx: System Manager Service is not database dependent

8.0.x
Alex Pott 2014-12-11 15:57:23 +01:00
parent ae049e93cc
commit 44162ebdc0
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/modules/system/src/SystemManager.php
View File

@ -28,13 +28,6 @@ class SystemManager {
*/ */
protected $moduleHandler; protected $moduleHandler;
/**
* Database Service Object.
*
* @var \Drupal\Core\Database\Connection
*/
protected $database;
/** /**
* The request stack. * The request stack.
* *
@ -83,8 +76,6 @@ class SystemManager {
* *
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler. * The module handler.
* @param \Drupal\Core\Database\Connection $database
* The database connection.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager. * The entity manager.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
@ -94,9 +85,8 @@ class SystemManager {
* @param \Drupal\Core\Menu\MenuActiveTrailInterface $menu_active_trail * @param \Drupal\Core\Menu\MenuActiveTrailInterface $menu_active_trail
* The active menu trail service. * The active menu trail service.
*/ */
public function __construct(ModuleHandlerInterface $module_handler, Connection $database, EntityManagerInterface $entity_manager, RequestStack $request_stack, MenuLinkTreeInterface $menu_tree, MenuActiveTrailInterface $menu_active_trail) { public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager, RequestStack $request_stack, MenuLinkTreeInterface $menu_tree, MenuActiveTrailInterface $menu_active_trail) {
$this->moduleHandler = $module_handler; $this->moduleHandler = $module_handler;
$this->database = $database;
$this->requestStack = $request_stack; $this->requestStack = $request_stack;
$this->menuTree = $menu_tree; $this->menuTree = $menu_tree;
$this->menuActiveTrail = $menu_active_trail; $this->menuActiveTrail = $menu_active_trail;

4
core/modules/system/system.services.yml
View File

@ -9,9 +9,7 @@ services:
- { name: access_check, applies_to: _access_system_update } - { name: access_check, applies_to: _access_system_update }
system.manager: system.manager:
class: Drupal\system\SystemManager class: Drupal\system\SystemManager
arguments: ['@module_handler', '@database', '@entity.manager', '@request_stack', '@menu.link_tree', '@menu.active_trail'] arguments: ['@module_handler', '@entity.manager', '@request_stack', '@menu.link_tree', '@menu.active_trail']
tags:
- { name: backend_overridable }
system.breadcrumb.default: system.breadcrumb.default:
class: Drupal\system\PathBasedBreadcrumbBuilder class: Drupal\system\PathBasedBreadcrumbBuilder
arguments: ['@router.request_context', '@access_manager', '@router', '@path_processor_manager', '@config.factory', '@title_resolver', '@current_user'] arguments: ['@router.request_context', '@access_manager', '@router', '@path_processor_manager', '@config.factory', '@title_resolver', '@current_user']