EntityFieldPropertyDeriver overrides parents (#925)

EntityFieldPropertyDeriver overrides the parents defined in the GraphQLField-annotation. In RC2, the parents defined in the annotation were added to the array instead of overridden.
drupal-graphql · Oct 31, 2019 · 7d2b82c · 7d2b82c
1 parent 038dc82
commit 7d2b82c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldPropertyDeriver.php b/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldPropertyDeriver.php
@@ -21,11 +21,16 @@ protected function getDerivativeDefinitionsFromFieldDefinition(FieldDefinitionIn
       $entityType = $this->entityTypeManager->getDefinition($entityTypeId);
       $supportsBundles = $entityType->hasKey('bundle');
 
+      if (!isset($basePluginDefinition['parents'])) {
+        $basePluginDefinition['parents'] = [];
+      }
+
+      $parents = [StringHelper::camelCase('field', $entityTypeId, $supportsBundles ? $fieldBundle : '', $fieldName)];
       return ["$entityTypeId-$fieldBundle-$fieldName" => [
-        'parents' => [StringHelper::camelCase('field', $entityTypeId, $supportsBundles ? $fieldBundle : '', $fieldName)],
+        'parents' => array_merge($parents, $basePluginDefinition['parents']),
       ] + $basePluginDefinition];
     }
 
     return [];
   }
-}
+}