From e0e440430e14a9c46be7b42a479c55e8cf99390d Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Wed, 27 Feb 2019 10:54:07 +0100
Subject: [PATCH] repatched domain_site_settings

---
 .../domain_site_settings/2930391-21.patch     | 58 +++++++++++++++++++
 .../domain_site_settings.services.yml         |  2 +-
 .../Configuration/DomainConfigOverride.php    | 18 ++----
 3 files changed, 63 insertions(+), 15 deletions(-)
 create mode 100644 sites/all/modules/contrib/admin/domain_site_settings/2930391-21.patch

diff --git a/sites/all/modules/contrib/admin/domain_site_settings/2930391-21.patch b/sites/all/modules/contrib/admin/domain_site_settings/2930391-21.patch
new file mode 100644
index 000000000..e362363d2
--- /dev/null
+++ b/sites/all/modules/contrib/admin/domain_site_settings/2930391-21.patch
@@ -0,0 +1,58 @@
+diff --git a/domain_site_settings.services.yml b/domain_site_settings.services.yml
+index 65e9113..6ebd87d 100644
+--- a/domain_site_settings.services.yml
++++ b/domain_site_settings.services.yml
+@@ -1,6 +1,6 @@
+ services:
+   domain_site_settings.overrider:
+     class: \Drupal\domain_site_settings\Configuration\DomainConfigOverride
+-    arguments: ['@domain.negotiator', '@config.factory']
++    arguments: ['@config.factory']
+     tags:
+       - {name: config.factory.override, priority: 5}
+diff --git a/src/Configuration/DomainConfigOverride.php b/src/Configuration/DomainConfigOverride.php
+index 272e052..8497e2a 100644
+--- a/src/Configuration/DomainConfigOverride.php
++++ b/src/Configuration/DomainConfigOverride.php
+@@ -16,13 +16,6 @@ use Drupal\Core\Config\ConfigFactoryInterface;
+ class DomainConfigOverride implements ConfigFactoryOverrideInterface {
+ 
+   /**
+-   * The Domain negotiator.
+-   *
+-   * @var \Drupal\domain\DomainNegotiatorInterface
+-   */
+-  protected $negotiator;
+-
+-  /**
+    * The config factory.
+    *
+    * @var \Drupal\Core\Config\ConfigFactoryInterface
+@@ -32,15 +25,10 @@ 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;
++  public function __construct(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');
diff --git a/sites/all/modules/contrib/admin/domain_site_settings/domain_site_settings.services.yml b/sites/all/modules/contrib/admin/domain_site_settings/domain_site_settings.services.yml
index 65e9113fb..6ebd87db9 100644
--- a/sites/all/modules/contrib/admin/domain_site_settings/domain_site_settings.services.yml
+++ b/sites/all/modules/contrib/admin/domain_site_settings/domain_site_settings.services.yml
@@ -1,6 +1,6 @@
 services:
   domain_site_settings.overrider:
     class: \Drupal\domain_site_settings\Configuration\DomainConfigOverride
-    arguments: ['@domain.negotiator', '@config.factory']
+    arguments: ['@config.factory']
     tags:
       - {name: config.factory.override, priority: 5}
diff --git a/sites/all/modules/contrib/admin/domain_site_settings/src/Configuration/DomainConfigOverride.php b/sites/all/modules/contrib/admin/domain_site_settings/src/Configuration/DomainConfigOverride.php
index 272e0527b..8497e2a2a 100644
--- a/sites/all/modules/contrib/admin/domain_site_settings/src/Configuration/DomainConfigOverride.php
+++ b/sites/all/modules/contrib/admin/domain_site_settings/src/Configuration/DomainConfigOverride.php
@@ -15,13 +15,6 @@ use Drupal\Core\Config\ConfigFactoryInterface;
  */
 class DomainConfigOverride implements ConfigFactoryOverrideInterface {
 
-  /**
-   * The Domain negotiator.
-   *
-   * @var \Drupal\domain\DomainNegotiatorInterface
-   */
-  protected $negotiator;
-
   /**
    * The config factory.
    *
@@ -32,15 +25,10 @@ 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;
+  public function __construct(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');