Merge f1437c3 into 611f1c6

composer.json

@@ -12,7 +12,9 @@
     "php": ">=7.1",
     "thecodingmachine/funky": "^1",
     "thecodingmachine/graphqlite": "~4.0.0",
-    "thecodingmachine/doctrine-annotations-universal-module": "^1.1"
+    "thecodingmachine/doctrine-annotations-universal-module": "^1.1",
+    "zendframework/zend-diactoros": "^2",
+    "thecodingmachine/middleware-list-universal-module": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.3.1",

src/GraphQLiteServiceProvider.php

@@ -3,6 +3,9 @@
 namespace TheCodingMachine;
 
 use Doctrine\Common\Annotations\Reader;
+use Psr\Http\Server\MiddlewareInterface;
+use TheCodingMachine\GraphQLite\Http\Psr15GraphQLMiddlewareBuilder;
+use TheCodingMachine\GraphQLite\Http\WebonyxGraphqlMiddleware;
 use function extension_loaded;
 use Psr\Container\ContainerInterface;
 use Psr\SimpleCache\CacheInterface;
@@ -47,6 +50,9 @@
 use TheCodingMachine\GraphQLite\TypeRegistry;
 use TheCodingMachine\GraphQLite\Types\ArgumentResolver;
 use TheCodingMachine\GraphQLite\Types\TypeResolver;
+use TheCodingMachine\Funky\Annotations\Tag;
+use TheCodingMachine\MiddlewareListServiceProvider;
+use TheCodingMachine\MiddlewareOrder;
 
 class GraphQLiteServiceProvider extends ServiceProvider
 {
@@ -97,4 +103,20 @@ public static function getSchemaFactory(
 
         return $schemaFactory;
     }
+
+    /**
+     * @Factory()
+     */
+    public static function getMiddlewareBuilder(Schema $schema): Psr15GraphQLMiddlewareBuilder
+    {
+        return new Psr15GraphQLMiddlewareBuilder($schema);
+    }
+
+    /**
+     * @Factory(name=WebonyxGraphqlMiddleware::class,tags={@Tag(name=MiddlewareListServiceProvider::MIDDLEWARES_QUEUE, priority=MiddlewareOrder::ROUTER)})
+     */
+    public static function getMiddleware(Psr15GraphQLMiddlewareBuilder $builder): MiddlewareInterface
+    {
+        return $builder->createMiddleware();
+    }
 }

tests/GraphQLiteServiceProviderTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Simplex\Container;
+use TheCodingMachine\GraphQLite\Http\WebonyxGraphqlMiddleware;
 use TheCodingMachine\GraphQLite\Schema;
 use TheCodingMachine\GraphQLite\Security\AuthenticationServiceInterface;
 use TheCodingMachine\GraphQLite\Security\AuthorizationServiceInterface;
@@ -25,5 +26,8 @@ public function testServiceProvider(): void
 
         $schema = $container->get(Schema::class);
         $this->assertInstanceOf(Schema::class, $schema);
+
+        $middleware = $container->get(WebonyxGraphqlMiddleware::class);
+        $this->assertInstanceOf(WebonyxGraphqlMiddleware::class, $middleware);
     }
 }