Merge pull request #342 from simPod/cs-src

Fix CS in src

src/Deferred.php

@@ -1,23 +1,20 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GraphQL;
 
 use GraphQL\Executor\Promise\Adapter\SyncPromise;
 
 class Deferred
 {
-    /**
+    /** @var \SplQueue */
-     * @var \SplQueue
-     */
     private static $queue;
 
-    /**
+    /** @var callable */
-     * @var callable
-     */
     private $callback;
 
-    /**
+    /** @var SyncPromise */
-     * @var SyncPromise
-     */
     public $promise;
 
     public static function getQueue()
@@ -47,7 +44,7 @@ class Deferred
         return $this->promise->then($onFulfilled, $onRejected);
     }
 
-    private function run()
+    public function run() : void
     {
         try {
             $cb = $this->callback;

src/Executor/Executor.php

@@ -35,6 +35,7 @@ use GraphQL\Utils\TypeInfo;
 use GraphQL\Utils\Utils;
 use function array_keys;
 use function array_merge;
+use function array_reduce;
 use function array_values;
 use function get_class;
 use function is_array;
@@ -996,7 +997,6 @@ class Executor
      * return a Promise.
      *
      * @param mixed[]            $values
-     * @param \Closure $callback
      * @param Promise|mixed|null $initialValue
      * @return mixed[]
      */
@@ -1291,11 +1291,6 @@ class Executor
         return $this->executeFields($returnType, $result, $path, $subFieldNodes);
     }
 
-    /**
-     * @param ObjectType $returnType
-     * @param $fieldNodes
-     * @return ArrayObject
-     */
     private function collectSubFields(ObjectType $returnType, $fieldNodes) : ArrayObject
     {
         if (! isset($this->subFieldCache[$returnType])) {

src/GraphQL.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GraphQL;
 
 use GraphQL\Error\Error;
@@ -6,15 +9,19 @@ use GraphQL\Executor\ExecutionResult;
 use GraphQL\Executor\Executor;
 use GraphQL\Executor\Promise\Adapter\SyncPromiseAdapter;
 use GraphQL\Executor\Promise\Promise;
+use GraphQL\Executor\Promise\PromiseAdapter;
 use GraphQL\Language\AST\DocumentNode;
 use GraphQL\Language\Parser;
 use GraphQL\Language\Source;
-use GraphQL\Executor\Promise\PromiseAdapter;
 use GraphQL\Type\Definition\Directive;
 use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Schema as SchemaType;
 use GraphQL\Validator\DocumentValidator;
-use GraphQL\Validator\Rules\ValidationRule;
 use GraphQL\Validator\Rules\QueryComplexity;
+use GraphQL\Validator\Rules\ValidationRule;
+use function array_values;
+use function trigger_error;
+use const E_USER_DEPRECATED;
 
 /**
  * This is the primary facade for fulfilling GraphQL operations.
@@ -58,32 +65,35 @@ class GraphQL
      *    queries which are validated before persisting and assumed valid during execution)
      *
      * @api
-     * @param \GraphQL\Type\Schema $schema
      * @param string|DocumentNode $source
      * @param mixed               $rootValue
      * @param mixed               $context
-     * @param array|null $variableValues
+     * @param mixed[]|null        $variableValues
-     * @param string|null $operationName
+     * @param ValidationRule[]    $validationRules
-     * @param callable $fieldResolver
-     * @param array $validationRules
-     *
-     * @return ExecutionResult
      */
     public static function executeQuery(
-        \GraphQL\Type\Schema $schema,
+        SchemaType $schema,
         $source,
         $rootValue = null,
         $context = null,
         $variableValues = null,
-        $operationName = null,
+        ?string $operationName = null,
-        callable $fieldResolver = null,
+        ?callable $fieldResolver = null,
-        array $validationRules = null
+        ?array $validationRules = null
-    )
+    ) : ExecutionResult {
-    {
         $promiseAdapter = new SyncPromiseAdapter();
 
-        $promise = self::promiseToExecute($promiseAdapter, $schema, $source, $rootValue, $context,
+        $promise = self::promiseToExecute(
-            $variableValues, $operationName, $fieldResolver, $validationRules);
+            $promiseAdapter,
+            $schema,
+            $source,
+            $rootValue,
+            $context,
+            $variableValues,
+            $operationName,
+            $fieldResolver,
+            $validationRules
+        );
 
         return $promiseAdapter->wait($promise);
     }
@@ -93,30 +103,23 @@ class GraphQL
      * Useful for Async PHP platforms.
      *
      * @api
-     * @param PromiseAdapter $promiseAdapter
-     * @param \GraphQL\Type\Schema $schema
      * @param string|DocumentNode   $source
      * @param mixed                 $rootValue
      * @param mixed                 $context
-     * @param array|null $variableValues
+     * @param mixed[]|null          $variableValues
-     * @param string|null $operationName
+     * @param ValidationRule[]|null $validationRules
-     * @param callable $fieldResolver
-     * @param array $validationRules
-     *
-     * @return Promise
      */
     public static function promiseToExecute(
         PromiseAdapter $promiseAdapter,
-        \GraphQL\Type\Schema $schema,
+        SchemaType $schema,
         $source,
         $rootValue = null,
         $context = null,
         $variableValues = null,
-        $operationName = null,
+        ?string $operationName = null,
-        callable $fieldResolver = null,
+        ?callable $fieldResolver = null,
-        array $validationRules = null
+        ?array $validationRules = null
-    )
+    ) : Promise {
-    {
         try {
             if ($source instanceof DocumentNode) {
                 $documentNode = $source;
@@ -125,16 +128,18 @@ class GraphQL
             }
 
             // FIXME
-            if (!empty($validationRules)) {
+            if (empty($validationRules)) {
-                foreach ($validationRules as $rule) {
-                    if ($rule instanceof QueryComplexity) {
-                        $rule->setRawVariableValues($variableValues);
-                    }
-                }
-            } else {
                 /** @var QueryComplexity $queryComplexity */
                 $queryComplexity = DocumentValidator::getRule(QueryComplexity::class);
                 $queryComplexity->setRawVariableValues($variableValues);
+            } else {
+                foreach ($validationRules as $rule) {
+                    if (! ($rule instanceof QueryComplexity)) {
+                        continue;
+                    }
+
+                    $rule->setRawVariableValues($variableValues);
+                }
             }
 
             $validationErrors = DocumentValidator::validate($schema, $documentNode, $validationRules);
@@ -143,7 +148,8 @@ class GraphQL
                 return $promiseAdapter->createFulfilled(
                     new ExecutionResult(null, $validationErrors)
                 );
-            } else {
+            }
+
             return Executor::promiseToExecute(
                 $promiseAdapter,
                 $schema,
@@ -154,7 +160,6 @@ class GraphQL
                 $operationName,
                 $fieldResolver
             );
-            }
         } catch (Error $e) {
             return $promiseAdapter->createFulfilled(
                 new ExecutionResult(null, [$e])
@@ -165,29 +170,28 @@ class GraphQL
     /**
      * @deprecated Use executeQuery()->toArray() instead
      *
-     * @param \GraphQL\Type\Schema $schema
      * @param string|DocumentNode $source
      * @param mixed               $rootValue
      * @param mixed               $contextValue
-     * @param array|null $variableValues
+     * @param mixed[]|null        $variableValues
-     * @param string|null $operationName
+     * @return Promise|mixed[]
-     * @return Promise|array
      */
     public static function execute(
-        \GraphQL\Type\Schema $schema,
+        SchemaType $schema,
         $source,
         $rootValue = null,
         $contextValue = null,
         $variableValues = null,
-        $operationName = null
+        ?string $operationName = null
-    )
+    ) {
-    {
         trigger_error(
             __METHOD__ . ' is deprecated, use GraphQL::executeQuery()->toArray() as a quick replacement',
             E_USER_DEPRECATED
         );
+
+        $promiseAdapter = Executor::getPromiseAdapter();
         $result         = self::promiseToExecute(
-            $promiseAdapter = Executor::getPromiseAdapter(),
+            $promiseAdapter,
             $schema,
             $source,
             $rootValue,
@@ -203,36 +207,36 @@ class GraphQL
                 return $r->toArray();
             });
         }
+
         return $result;
     }
 
     /**
      * @deprecated renamed to executeQuery()
      *
-     * @param \GraphQL\Type\Schema $schema
      * @param string|DocumentNode $source
      * @param mixed               $rootValue
      * @param mixed               $contextValue
-     * @param array|null $variableValues
+     * @param mixed[]|null        $variableValues
-     * @param string|null $operationName
      *
      * @return ExecutionResult|Promise
      */
     public static function executeAndReturnResult(
-        \GraphQL\Type\Schema $schema,
+        SchemaType $schema,
         $source,
         $rootValue = null,
         $contextValue = null,
         $variableValues = null,
-        $operationName = null
+        ?string $operationName = null
-    )
+    ) {
-    {
         trigger_error(
             __METHOD__ . ' is deprecated, use GraphQL::executeQuery() as a quick replacement',
             E_USER_DEPRECATED
         );
+
+        $promiseAdapter = Executor::getPromiseAdapter();
         $result         = self::promiseToExecute(
-            $promiseAdapter = Executor::getPromiseAdapter(),
+            $promiseAdapter,
             $schema,
             $source,
             $rootValue,
@@ -240,9 +244,11 @@ class GraphQL
             $variableValues,
             $operationName
         );
+
         if ($promiseAdapter instanceof SyncPromiseAdapter) {
             $result = $promiseAdapter->wait($result);
         }
+
         return $result;
     }
 
@@ -252,7 +258,7 @@ class GraphQL
      * @api
      * @return Directive[]
      */
-    public static function getStandardDirectives()
+    public static function getStandardDirectives() : array
     {
         return array_values(Directive::getInternalDirectives());
     }
@@ -263,7 +269,7 @@ class GraphQL
      * @api
      * @return Type[]
      */
-    public static function getStandardTypes()
+    public static function getStandardTypes() : array
     {
         return array_values(Type::getInternalTypes());
     }
@@ -274,23 +280,17 @@ class GraphQL
      * @api
      * @return ValidationRule[]
      */
-    public static function getStandardValidationRules()
+    public static function getStandardValidationRules() : array
     {
         return array_values(DocumentValidator::defaultRules());
     }
 
-    /**
+    public static function setDefaultFieldResolver(callable $fn) : void
-     * @param callable $fn
-     */
-    public static function setDefaultFieldResolver(callable $fn)
     {
         Executor::setDefaultFieldResolver($fn);
     }
 
-    /**
+    public static function setPromiseAdapter(?PromiseAdapter $promiseAdapter = null) : void
-     * @param PromiseAdapter|null $promiseAdapter
-     */
-    public static function setPromiseAdapter(PromiseAdapter $promiseAdapter = null)
     {
         Executor::setPromiseAdapter($promiseAdapter);
     }
@@ -301,7 +301,7 @@ class GraphQL
      * @deprecated Renamed to getStandardDirectives
      * @return Directive[]
      */
-    public static function getInternalDirectives()
+    public static function getInternalDirectives() : array
     {
         return self::getStandardDirectives();
     }

src/Schema.php

@@ -1,6 +1,12 @@
 <?php
+
+declare(strict_types=1);
+
 namespace GraphQL;
 
+use function trigger_error;
+use const E_USER_DEPRECATED;
+
 trigger_error(
     'GraphQL\Schema is moved to GraphQL\Type\Schema',
     E_USER_DEPRECATED

src/Server/OperationParams.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace GraphQL\Server;
 
-use const CASE_LOWER;
 use function array_change_key_case;
 use function is_string;
 use function json_decode;
 use function json_last_error;
+use const CASE_LOWER;
 
 /**
  * Structure representing parsed HTTP parameters for GraphQL operation