fix: resettable schemas

Author: Vladyslav Lyshenko

src/Definition/Builder/SchemaBuilder.php

@@ -10,12 +10,14 @@
 use Overblog\GraphQLBundle\Definition\Type\SchemaExtension\ValidatorExtension;
 use Overblog\GraphQLBundle\Resolver\TypeResolver;
 
+use Symfony\Contracts\Service\ResetInterface;
 use function array_map;
 
-final class SchemaBuilder
+final class SchemaBuilder implements ResetInterface
 {
     private TypeResolver $typeResolver;
     private bool $enableValidation;
+    private array $builders = [];
 
     public function __construct(TypeResolver $typeResolver, bool $enableValidation = false)
     {
@@ -26,12 +28,11 @@ public function __construct(TypeResolver $typeResolver, bool $enableValidation =
     public function getBuilder(string $name, ?string $queryAlias, string $mutationAlias = null, string $subscriptionAlias = null, array $types = [], bool $resettable = false): Closure
     {
         return function () use ($name, $queryAlias, $mutationAlias, $subscriptionAlias, $types, $resettable): ExtensibleSchema {
-            static $schema = null;
-            if (null === $schema) {
-                $schema = $this->create($name, $queryAlias, $mutationAlias, $subscriptionAlias, $types, $resettable);
+            if (!isset($this->builders[$name])) {
+                $this->builders[$name] = $this->create($name, $queryAlias, $mutationAlias, $subscriptionAlias, $types, $resettable);
             }
 
-            return $schema;
+            return $this->builders[$name];
         };
     }
 
@@ -75,4 +76,12 @@ private function buildSchemaArguments(string $schemaName, Type $query, ?Type $mu
             },
         ];
     }
+
+    public function reset(): void
+    {
+        $this->builders = array_filter(
+            $this->builders,
+            fn (ExtensibleSchema $schema) => false === $schema->isResettable()
+        );
+    }
 }

src/Resolver/AbstractResolver.php

@@ -4,21 +4,21 @@
 
 namespace Overblog\GraphQLBundle\Resolver;
 
+use Symfony\Contracts\Service\ResetInterface;
 use function array_keys;
 
-abstract class AbstractResolver implements FluentResolverInterface
+abstract class AbstractResolver implements FluentResolverInterface, ResetInterface
 {
+    private array $solutionsFactory = [];
     private array $solutions = [];
     private array $aliases = [];
     private array $solutionOptions = [];
-    private array $fullyLoadedSolutions = [];
 
     public function addSolution(string $id, callable $factory, array $aliases = [], array $options = []): self
     {
-        $this->fullyLoadedSolutions[$id] = false;
         $this->addAliases($id, $aliases);
 
-        $this->solutions[$id] = $factory;
+        $this->solutionsFactory[$id] = $factory;
         $this->solutionOptions[$id] = $options;
 
         return $this;
@@ -28,7 +28,7 @@ public function hasSolution(string $id): bool
     {
         $id = $this->resolveAlias($id);
 
-        return isset($this->solutions[$id]);
+        return isset($this->solutionsFactory[$id]);
     }
 
     /**
@@ -81,13 +81,12 @@ private function loadSolution(string $id)
             return null;
         }
 
-        if ($this->fullyLoadedSolutions[$id]) {
+        if (isset($this->solutions[$id])) {
             return $this->solutions[$id];
         } else {
-            $loader = $this->solutions[$id];
+            $loader = $this->solutionsFactory[$id];
             $this->solutions[$id] = $solution = $loader();
             $this->onLoadSolution($solution);
-            $this->fullyLoadedSolutions[$id] = true;
 
             return $solution;
         }
@@ -110,10 +109,15 @@ private function resolveAlias(string $alias): string
      */
     private function loadSolutions(): array
     {
-        foreach ($this->solutions as $name => &$solution) {
-            $solution = $this->loadSolution($name);
+        foreach (array_keys($this->solutionsFactory) as $name) {
+            $this->loadSolution($name);
         }
 
         return $this->solutions;
     }
+
+    public function reset(): void
+    {
+        $this->solutions = [];
+    }
 }

src/Resolver/TypeResolver.php

@@ -87,4 +87,11 @@ protected function supportedSolutionClass(): ?string
     {
         return Type::class;
     }
+
+    public function reset(): void
+    {
+        parent::reset();
+
+        $this->cache = [];
+    }
 }

src/Resources/config/services.yaml

@@ -28,6 +28,8 @@ services:
         arguments:
             - '@Overblog\GraphQLBundle\Resolver\TypeResolver'
             - false
+        tags:
+            - { name: 'kernel.reset', 'method': "reset" }
 
     Overblog\GraphQLBundle\Definition\Builder\TypeFactory:
         arguments:
@@ -39,6 +41,7 @@ services:
             - ['setDispatcher', ['@event_dispatcher']]
         tags:
             - { name: overblog_graphql.service, alias: typeResolver }
+            - {name: 'kernel.reset', 'method': "reset"}
 
     Overblog\GraphQLBundle\Transformer\ArgumentsTransformer:
         arguments: