Fixes #363: Augment template variables instead of replacing them.

When adding a GraphQL query, a new template variable `graphql` containing the result will be injected.

Author: pmelab

modules/graphql_twig/graphql_twig.module

@@ -104,7 +104,7 @@ function graphql_twig_process_query(&$variables, $hook, $info) {
 
     $queryResult = $processor->processQuery($query, $arguments);
 
-    $variables['graphql_result'] = $queryResult->getData();
+    $variables['graphql'] = $queryResult->getData();
 
     $variables['#cache']['contexts'] = $queryResult->getCacheContexts();
     $variables['#cache']['tags'] = $queryResult->getCacheTags();

modules/graphql_twig/src/GraphQLTemplateTrait.php

@@ -7,20 +7,6 @@
  */
 trait GraphQLTemplateTrait {
 
-  /**
-   * {@inheritdoc}
-   *
-   * Override of the original template render. If the context contains as
-   * `graphql_result` key, this will be passed into the template instead of
-   * the whole context.
-   */
-  public function render(array $variables) {
-    if (array_key_exists('graphql_result', $variables)) {
-      return parent::render($variables['graphql_result']);
-    }
-    return parent::render($variables);
-  }
-
   /**
    * Recursively build the GraphQL query.
    *

modules/graphql_twig/tests/themes/graphql_twig_test_theme/templates/graphql-echo.html.twig

@@ -3,4 +3,4 @@ query($input: String!) {
   echo(input: $input)
 }
 #}
-<strong>{{ data.echo }}</strong>
+<strong>{{ graphql.data.echo }}</strong>

modules/graphql_twig/tests/themes/graphql_twig_test_theme/templates/graphql-garage.html.twig

@@ -7,6 +7,6 @@ query {
 }
 #}
 Garage:
-{% for vehicle in data.garage %}
+{% for vehicle in graphql.data.garage %}
   {% include '@graphql_twig_test_theme/graphql-vehicle.html.twig' with vehicle %}
 {% endfor %}

modules/graphql_twig/tests/themes/graphql_twig_test_theme/templates/node.html.twig

@@ -1 +1 @@
-<h1>{{ data.node.title }}</h1>
+<h1>{{ graphql.data.node.title }}</h1>