Fixing issues drupal-graphql#611 and drupal-graphql#575 (drupal-graphql#620)

Author: FireGhost

graphql.install

@@ -19,3 +19,18 @@ function graphql_requirements($phase) {
     ],
   ];
 }
+
+/**
+ * Implements hook_uninstall().
+ */
+function graphql_uninstall() {
+  // Remove the config keys set in GraphQLConfigOverrides::loadOverrides().
+  /** @var \Drupal\Core\Config\ConfigFactoryInterface $configFactory */
+  $configFactory = \Drupal::getContainer()->get('config.factory');
+  $languageTypes = $configFactory->getEditable('language.types');
+  $negotiation = $languageTypes->get('negotiation');
+  foreach (array_keys($negotiation) as $type) {
+    unset($negotiation[$type]['enabled']['language-graphql']);
+  }
+  $languageTypes->set('negotiation', $negotiation)->save();
+}

graphql.services.yml

@@ -267,7 +267,6 @@ services:
 
   graphql.config_factory_override:
     class: Drupal\graphql\Config\GraphQLConfigOverrides
-    arguments: ['@config.storage']
+    arguments: ['@config.storage', '@plugin.manager.language_negotiation_method']
     tags:
       - { name: config.factory.override, priority: -253 }
-

src/Config/GraphQLConfigOverrides.php

@@ -5,6 +5,7 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
+use Drupal\language\LanguageNegotiationMethodManager;
 
 /**
  * GraphQL config overrides.
@@ -20,28 +21,38 @@ class GraphQLConfigOverrides implements ConfigFactoryOverrideInterface {
    */
   protected $baseStorage;
 
+  /**
+   * The negotiator manager service.
+   *
+   * @var \Drupal\language\LanguageNegotiationMethodManager
+   */
+  protected $negotiatorManager;
+
   /**
    * GraphQLConfigOverrides constructor.
    *
    * @param \Drupal\Core\Config\StorageInterface $storage
    *   The config storage service.
    */
-  public function __construct(StorageInterface $storage) {
+  public function __construct(StorageInterface $storage, LanguageNegotiationMethodManager $negotiatorManager) {
     $this->baseStorage = $storage;
+    $this->negotiatorManager = $negotiatorManager;
   }
 
   /**
    * {@inheritdoc}
    */
   public function loadOverrides($names) {
-    if (in_array('language.types', $names)) {
-      if ($config = $this->baseStorage->read('language.types')) {
-        foreach (array_keys($config['negotiation']) as $type) {
-          $config['negotiation'][$type]['enabled']['language-graphql'] = -999;
-          asort($config['negotiation'][$type]['enabled']);
-        }
-        return ['language.types' => $config];
+    if (
+      in_array('language.types', $names)
+      && $this->negotiatorManager->hasDefinition('language-graphql')
+      && $config = $this->baseStorage->read('language.types')
+    ) {
+      foreach (array_keys($config['negotiation']) as $type) {
+        $config['negotiation'][$type]['enabled']['language-graphql'] = -999;
+        asort($config['negotiation'][$type]['enabled']);
       }
+      return ['language.types' => $config];
     }
     return [];
   }