diff --git a/domain_site_settings/src/Configuration/DomainConfigOverride.php b/domain_site_settings/src/Configuration/DomainConfigOverride.php index 272e052..17603dd 100644 --- a/domain_site_settings/src/Configuration/DomainConfigOverride.php +++ b/domain_site_settings/src/Configuration/DomainConfigOverride.php @@ -5,7 +5,6 @@ namespace Drupal\domain_site_settings\Configuration; use Drupal\Core\Cache\CacheableMetadata; use Drupal\Core\Config\ConfigFactoryOverrideInterface; use Drupal\Core\Config\StorageInterface; -use Drupal\domain\DomainNegotiatorInterface; use Drupal\Core\Config\ConfigFactoryInterface; /** @@ -15,13 +14,6 @@ use Drupal\Core\Config\ConfigFactoryInterface; */ class DomainConfigOverride implements ConfigFactoryOverrideInterface { - /** - * The Domain negotiator. - * - * @var \Drupal\domain\DomainNegotiatorInterface - */ - protected $negotiator; - /** * The config factory. * @@ -32,15 +24,11 @@ class DomainConfigOverride implements ConfigFactoryOverrideInterface { /** * Constructs a DomainSourcePathProcessor object. * - * @param \Drupal\domain\DomainNegotiatorInterface $negotiator - * The domain negotiator. * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The module handler service. */ public function __construct( - DomainNegotiatorInterface $negotiator, - ConfigFactoryInterface $config_factory) { - $this->negotiator = $negotiator; + ConfigFactoryInterface $config_factory) { $this->configFactory = $config_factory; } @@ -57,7 +45,9 @@ class DomainConfigOverride implements ConfigFactoryOverrideInterface { public function loadOverrides($names = []) { $overrides = []; if (in_array('system.site', $names)) { - $domain = $this->negotiator->getActiveDomain(); + /* @var \Drupal\domain\DomainNegotiator $negotiator */ + $negotiator = \Drupal::service('domain.negotiator'); + $domain = $negotiator->getActiveDomain(); if (!empty($domain)) { $domain_key = $domain->id(); $configFactory = $this->configFactory->get('domain_site_settings.domainconfigsettings');