Merge pull request #216 from 4levels/feature/relay

Removed dependency on Facades

Author: dmongeau

src/Folklore/GraphQL/LumenServiceProvider.php

@@ -1,7 +1,5 @@
 <?php namespace Folklore\GraphQL;
 
-use Illuminate\Support\Facades\Facade;
-
 class LumenServiceProvider extends ServiceProvider
 {
     /**

src/Folklore/GraphQL/Relay/ConnectionEdgeType.php

@@ -4,7 +4,6 @@
 
 use GraphQL\Type\Definition\Type;
 use Folklore\GraphQL\Support\Type as BaseType;
-use GraphQL;
 
 class ConnectionEdgeType extends BaseType
 {
@@ -15,7 +14,7 @@ protected function fields()
                 'type' => Type::nonNull(Type::id())
             ],
             'node' => [
-                'type' => GraphQL::type('Node')
+                'type' => app('graphql')->type('Node')
             ]
         ];
     }

src/Folklore/GraphQL/Relay/NodeIdField.php

@@ -4,7 +4,6 @@
 
 use GraphQL\Type\Definition\Type;
 use Folklore\GraphQL\Support\Field as BaseField;
-use Relay as RelayFacade;
 
 class NodeIdField extends BaseField
 {
@@ -45,6 +44,6 @@ public function getIdType()
     public function resolve()
     {
         $id = call_user_func_array($this->idResolver, func_get_args());
-        return RelayFacade::toGlobalId($this->idType, $id);
+        return app('graphql.relay')->toGlobalId($this->idType, $id);
     }
 }

src/Folklore/GraphQL/Relay/NodeQuery.php

@@ -5,8 +5,6 @@
 use Folklore\GraphQL\Support\Query;
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
-use GraphQL;
-use Relay as RelayFacade;
 use Folklore\GraphQL\Exception\TypeNotFound;
 use Folklore\GraphQL\Relay\Exception\NodeInvalid;
 
@@ -21,7 +19,7 @@ class NodeQuery extends Query
 
     protected function type()
     {
-        return GraphQL::type('Node');
+        return app('graphql')->type('Node');
     }
 
     protected function args()
@@ -36,10 +34,10 @@ protected function args()
 
     public function resolve($root, $args, $context, ResolveInfo $info)
     {
-        $globalId = RelayFacade::fromGlobalId($args['id']);
+        $globalId = app('graphql.relay')->fromGlobalId($args['id']);
         $typeName = $globalId['type'];
         $id = $globalId['id'];
-        $types = GraphQL::getTypes();
+        $types = app('graphql')->getTypes();
         $typeClass = array_get($types, $typeName);
 
         if (!$typeClass) {
@@ -56,7 +54,7 @@ public function resolve($root, $args, $context, ResolveInfo $info)
 
         $response = new NodeResponse();
         $response->setNode($node);
-        $response->setType(GraphQL::type($typeName));
+        $response->setType(app('graphql')->type($typeName));
 
         return $response;
     }

src/Folklore/GraphQL/Relay/Relay.php

@@ -4,7 +4,6 @@
 
 use Folklore\GraphQL\Relay\Support\ConnectionField;
 use Folklore\GraphQL\Relay\Support\ConnectionType;
-use GraphQL;
 
 class Relay
 {
@@ -32,11 +31,11 @@ public function connectionFieldFromEdgeType($edgeType, $config = [])
             'name' => $connectionName
         ]);
         $connectionType->setEdgeType($edgeType);
-        GraphQL::addType($connectionType, $connectionName);
+        $this->graphql->addType($connectionType, $connectionName);
 
         $fieldConfig = array_except($config, ['connectionTypeName']);
         $field = new ConnectionField($fieldConfig);
-        $field->setType(GraphQL::type($connectionName));
+        $field->setType($this->graphql->type($connectionName));
         return $field;
     }
 

src/Folklore/GraphQL/Relay/Support/ConnectionType.php

@@ -5,7 +5,6 @@
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\InterfaceType;
 use Folklore\GraphQL\Support\Type as BaseType;
-use GraphQL;
 
 use Folklore\GraphQL\Relay\EdgesCollection;
 use Illuminate\Pagination\AbstractPaginator;
@@ -36,7 +35,7 @@ protected function fields()
                 }
             ],
             'pageInfo' => [
-                'type' => GraphQL::type('PageInfo'),
+                'type' => app('graphql')->type('PageInfo'),
                 'resolve' => function ($root) {
                     return $this->getPageInfoFromRoot($root);
                 }
@@ -60,8 +59,8 @@ protected function getEdgeObjectType()
     {
         $edgeType = $this->getEdgeType();
         $name = $edgeType->config['name'].'Edge';
-        GraphQL::addType(\Folklore\GraphQL\Relay\ConnectionEdgeType::class, $name);
-        $type = GraphQL::type($name);
+        app('graphql')->addType(\Folklore\GraphQL\Relay\ConnectionEdgeType::class, $name);
+        $type = app('graphql')->type($name);
         $type->setEdgeType($edgeType);
         return $type;
     }

src/Folklore/GraphQL/Relay/Support/Traits/TypeIsNode.php

@@ -2,7 +2,6 @@
 
 namespace Folklore\GraphQL\Relay\Support\Traits;
 
-use GraphQL;
 use Folklore\GraphQL\Relay\NodeIdField;
 
 trait TypeIsNode
@@ -47,7 +46,7 @@ protected function getIdResolverFromFields($fields)
     protected function relayInterfaces()
     {
         return [
-            GraphQL::type('Node')
+            app('graphql')->type('Node')
         ];
     }