Upgrade webonyx graphql to 15.0+

composer.json

@@ -22,13 +22,12 @@
     "require": {
         "php": "^8.1",
         "psr/container": "^1.0|^2.0",
-        "psr/event-dispatcher": "^1.0",
+        "railt/event-dispatcher": "^2.0",
         "railt/http": "^2.0",
         "railt/http-factory": "^2.0",
         "railt/http-middleware": "^2.0",
         "railt/sdl": "^2.0",
-        "railt/type-system": "^2.0",
-        "symfony/event-dispatcher": "^5.4|^6.0"
+        "railt/type-system": "^2.0"
     },
     "autoload": {
         "psr-4": {

src/Application.php

@@ -4,7 +4,9 @@
 
 namespace Railt\Foundation;
 
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Railt\Contracts\Http\Middleware\MiddlewareInterface;
+use Railt\EventDispatcher\EventDispatcher;
 use Railt\Foundation\Connection\OnDestructor;
 use Railt\Foundation\Event\Connection\ConnectionClosed;
 use Railt\Foundation\Event\Connection\ConnectionEstablished;
@@ -18,8 +20,6 @@
 use Railt\SDL\Compiler;
 use Railt\SDL\CompilerInterface;
 use Railt\TypeSystem\DictionaryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 final class Application implements ApplicationInterface
 {
@@ -32,6 +32,8 @@ final class Application implements ApplicationInterface
 
     private readonly MutablePipelineInterface $pipeline;
 
+    private readonly EventDispatcherInterface $dispatcher;
+
     /**
      * @param iterable<array-key, MiddlewareInterface>|MutablePipelineInterface $middleware
      * @param iterable<array-key, ExtensionInterface>|Repository $extensions
@@ -41,22 +43,18 @@ public function __construct(
         private readonly CompilerInterface $compiler = new Compiler(),
         iterable|MutablePipelineInterface $middleware = [],
         iterable|Repository $extensions = [],
-        private readonly EventDispatcherInterface $dispatcher = new EventDispatcher(),
+        ?EventDispatcherInterface $dispatcher = null,
     ) {
-        if (!$middleware instanceof MutablePipelineInterface) {
-            $middleware = new Pipeline($middleware);
-        }
-
-        if (!$extensions instanceof Repository) {
-            $extensions = new Repository($extensions);
-        }
-
+        $this->pipeline = !$middleware instanceof MutablePipelineInterface
+            ? new Pipeline($middleware)
+            : $middleware;
+        $this->extensions = !$extensions instanceof Repository
+            ? new Repository($extensions)
+            : $extensions;
+        $this->dispatcher = new EventDispatcher($dispatcher);
         /** @psalm-suppress PropertyTypeCoercion */
         $this->connections = new \WeakMap();
 
-        $this->extensions = $extensions;
-        $this->pipeline = $middleware;
-
         $this->bootDefaultExtensions();
     }
 

src/Connection.php

@@ -9,7 +9,7 @@
 use Railt\Contracts\Http\ResponseInterface;
 use Railt\Http\Middleware\PipelineInterface;
 use Railt\TypeSystem\DictionaryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Railt\EventDispatcher\EventDispatcherInterface;
 
 final class Connection implements ConnectionInterface
 {

src/ExecutorInterface.php

@@ -6,7 +6,7 @@
 
 use Railt\Contracts\Http\Middleware\RequestHandlerInterface;
 use Railt\TypeSystem\DictionaryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Railt\EventDispatcher\EventDispatcherInterface;
 
 interface ExecutorInterface
 {

src/Extension/DefaultValueResolverExtension.php

@@ -10,13 +10,28 @@
 use Railt\TypeSystem\ListType;
 use Railt\TypeSystem\NonNullType;
 use Railt\TypeSystem\WrappingTypeInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Railt\EventDispatcher\EventDispatcherInterface;
 
 final class DefaultValueResolverExtension implements ExtensionInterface
 {
+    /**
+     * @var \Closure(FieldResolving):void
+     */
+    private readonly \Closure $fieldResolving;
+
+    public function __construct()
+    {
+        $this->fieldResolving = $this->tryFieldResolving(...);
+    }
+
     public function load(EventDispatcherInterface $dispatcher): void
     {
-        $dispatcher->addListener(FieldResolving::class, $this->tryFieldResolving(...));
+        $dispatcher->addListener(FieldResolving::class, $this->fieldResolving);
+    }
+
+    public function unload(EventDispatcherInterface $dispatcher): void
+    {
+        $dispatcher->removeListener(FieldResolving::class, $this->fieldResolving);
     }
 
     private function tryFieldResolving(FieldResolving $event): void

src/Extension/ExtensionInterface.php

@@ -4,9 +4,11 @@
 
 namespace Railt\Foundation\Extension;
 
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Railt\EventDispatcher\EventDispatcherInterface;
 
 interface ExtensionInterface
 {
     public function load(EventDispatcherInterface $dispatcher): void;
+
+    public function unload(EventDispatcherInterface $dispatcher): void;
 }

src/Extension/Repository.php

@@ -4,12 +4,12 @@
 
 namespace Railt\Foundation\Extension;
 
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Railt\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @template-implements \IteratorAggregate<array-key, ExtensionInterface>
  */
-final class Repository implements ExtensionInterface, \IteratorAggregate, \Countable
+final class Repository implements RepositoryInterface, \IteratorAggregate
 {
     /**
      * @var list<ExtensionInterface>
@@ -46,6 +46,17 @@ public function load(EventDispatcherInterface $dispatcher): void
         }
     }
 
+    public function unload(EventDispatcherInterface $dispatcher): void
+    {
+        while ($this->loaded !== []) {
+            $extension = \array_shift($this->loaded);
+
+            $extension->unload($dispatcher);
+
+            $this->registered[] = $extension;
+        }
+    }
+
     public function count(): int
     {
         return \count($this->loaded) + \count($this->registered);

src/Extension/RepositoryInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Railt\Foundation\Extension;
+
+/**
+ * @template-implements \Traversable<array-key, ExtensionInterface>
+ */
+interface RepositoryInterface extends ExtensionInterface, \Traversable, \Countable
+{
+    /**
+     * @param ExtensionInterface $extension
+     */
+    public function register(ExtensionInterface $extension): void;
+}

tests/Architecture/ComposerDependenciesTest.php

@@ -28,7 +28,7 @@ public function testDependencies(): Rule
                 Selector::namespace('Railt\Http\Middleware'),
                 Selector::namespace('Railt\SDL'),
                 Selector::namespace('Railt\TypeSystem'),
-                Selector::namespace('Symfony\Component\EventDispatcher'),
+                Selector::namespace('Railt\EventDispatcher'),
             )
         ;
     }