Merge branch 'master' of github.com:thecodingmachine/graphql-controllers

Author: moufmouf

src/AggregateControllerQueryProvider.php

@@ -69,7 +69,7 @@ public function getQueries(): array
 
         foreach ($this->controllers as $controllerName) {
             $controller = $this->container->get($controllerName);
-            $queryProvider = new ControllerQueryProvider($controller, $this->container, $this->annotationReader, $this->typeMapper, $this->hydrator);
+            $queryProvider = new ControllerQueryProvider($controller, $this->annotationReader, $this->typeMapper, $this->hydrator);
             $queryList = array_merge($queryList, $queryProvider->getQueries());
         }
 

src/GraphQLMiddleware.php

@@ -2,7 +2,7 @@
 namespace TheCodingMachine\GraphQL\Controllers;
 
 use GraphQL\GraphQL;
-use Mouf\GraphQL\Schema;
+use Youshido\GraphQL\Schema\AbstractSchema;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Youshido\GraphQL\Execution\Processor;
@@ -33,18 +33,14 @@ class GraphQLMiddleware implements \Interop\Http\ServerMiddleware\MiddlewareInte
      * @var Processor
      */
     private $schema;
-    /**
-     * @var null
-     */
-    private $rootUrl;
 
     /**
      * GraphQLMiddleware constructor.
      *
-     * @param Schema    $schema
+     * @param AbstractSchema    $schema
      * @param string    $graphqlUri
      */
-    public function __construct(Schema $schema, $graphqlUri = '/graphql', $rootUrl = null)
+    public function __construct(AbstractSchema $schema, $graphqlUri = '/graphql', $rootUrl = null)
     {
         $this->schema = $schema;
         $this->graphqlUri = rtrim($rootUrl, '/').'/'. ltrim($graphqlUri, '/');
@@ -74,7 +70,7 @@ public function process(\Psr\Http\Message\ServerRequestInterface $request, \Inte
         list($query, $variables) = $this->getPayload($request);
 
 
-        $processor = new Processor($this->schema->toGraphQLSchema());
+        $processor = new Processor($this->schema);
         $processor->processPayload($query, $variables);
         $res = $processor->getResponseData();
         return new JsonResponse($res);

src/Schema.php

@@ -21,8 +21,8 @@ class Schema extends AbstractSchema
 
     public function __construct(QueryProviderInterface $queryProvider, array $config = [])
     {
-        parent::__construct($config);
         $this->queryProvider = $queryProvider;
+        parent::__construct($config);
     }
 
     public function build(SchemaConfig $config)