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

Issue #2306077 by dawehner: Fixed Get rid of connection in UserAutocomplete.

8.0.x
Alex Pott 2014-07-19 22:28:22 +01:00
parent c6cd9ac7f9
commit 29d0f4361d
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/modules/user/src/UserAutocomplete.php
View File

@ -9,7 +9,6 @@ namespace Drupal\user;
use Drupal\Component\Utility\String; use Drupal\Component\Utility\String;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Core\Entity\Query\QueryFactory;
@ -18,13 +17,6 @@ use Drupal\Core\Entity\Query\QueryFactory;
*/ */
class UserAutocomplete { class UserAutocomplete {
/**
* The database connection to query for the user names.
*
* @var \Drupal\Core\Database\Connection
*/
protected $connection;
/** /**
* The config factory to get the anonymous user name. * The config factory to get the anonymous user name.
* *
@ -49,13 +41,14 @@ class UserAutocomplete {
/** /**
* Constructs a UserAutocomplete object. * Constructs a UserAutocomplete object.
* *
* @param \Drupal\Core\Database\Connection $connection
* The database connection to query for the user names.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The config factory. * The config factory.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
* @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
* The entity query factory.
*/ */
public function __construct(Connection $connection, ConfigFactoryInterface $config_factory, EntityManagerInterface $entity_manager, QueryFactory $entity_query) { public function __construct(ConfigFactoryInterface $config_factory, EntityManagerInterface $entity_manager, QueryFactory $entity_query) {
$this->connection = $connection;
$this->configFactory = $config_factory; $this->configFactory = $config_factory;
$this->entityQuery = $entity_query; $this->entityQuery = $entity_query;
$this->entityManager = $entity_manager; $this->entityManager = $entity_manager;

2
core/modules/user/user.services.yml
View File

@ -35,7 +35,7 @@ services:
arguments: ['@database'] arguments: ['@database']
user.autocomplete: user.autocomplete:
class: Drupal\user\UserAutocomplete class: Drupal\user\UserAutocomplete
arguments: ['@database', '@config.factory', '@entity.manager', '@entity.query'] arguments: ['@config.factory', '@entity.manager', '@entity.query']
user_maintenance_mode_subscriber: user_maintenance_mode_subscriber:
class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
arguments: ['@maintenance_mode', '@current_user'] arguments: ['@maintenance_mode', '@current_user']