From dc0f6a3533ca8baa3740db45ebdc951c50d85960 Mon Sep 17 00:00:00 2001 From: Justin van Elst Date: Wed, 16 May 2018 11:25:43 +0200 Subject: [PATCH 1/2] merge scemas instead of overwritting --- src/Folklore/GraphQL/GraphQL.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Folklore/GraphQL/GraphQL.php b/src/Folklore/GraphQL/GraphQL.php index 53cfb98c..60281ea8 100644 --- a/src/Folklore/GraphQL/GraphQL.php +++ b/src/Folklore/GraphQL/GraphQL.php @@ -192,11 +192,22 @@ public function addType($class, $name = null) public function addSchema($name, $schema) { - $this->schemas[$name] = $schema; + $this->mergeSchemas($name, $schema); event(new SchemaAdded($schema, $name)); } + public function mergeSchemas($name, $schema) + { + //d($name, $schema); + if (isset($this->schemas[$name]) && $this->schemas[$name]) { + $this->schemas[$name] = array_merge_recursive($this->schemas[$name], $schema); + } + else { + $this->schemas[$name] = $schema; + } + } + public function clearType($name) { if (isset($this->types[$name])) { From bb117e71ce91f0b52182589096e2d5434fae55e8 Mon Sep 17 00:00:00 2001 From: Justin van Elst Date: Sun, 3 Jun 2018 20:33:16 +0200 Subject: [PATCH 2/2] Update GraphQL.php cleanup --- src/Folklore/GraphQL/GraphQL.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Folklore/GraphQL/GraphQL.php b/src/Folklore/GraphQL/GraphQL.php index 60281ea8..c255d2c8 100644 --- a/src/Folklore/GraphQL/GraphQL.php +++ b/src/Folklore/GraphQL/GraphQL.php @@ -199,7 +199,6 @@ public function addSchema($name, $schema) public function mergeSchemas($name, $schema) { - //d($name, $schema); if (isset($this->schemas[$name]) && $this->schemas[$name]) { $this->schemas[$name] = array_merge_recursive($this->schemas[$name], $schema); }