Fix request variables validation

src/Execution/Processor.php

@@ -8,6 +8,8 @@
 namespace Youshido\GraphQL\Execution;
 
 
+use Youshido\GraphQL\Exception\Parser\InvalidRequestException;
+use Youshido\GraphQL\Exception\Parser\SyntaxErrorException;
 use Youshido\GraphQL\Exception\ResolveException;
 use Youshido\GraphQL\Execution\Container\Container;
 use Youshido\GraphQL\Execution\Context\ExecutionContext;
@@ -564,6 +566,13 @@ protected function resolveComposite(FieldInterface $field, AstFieldInterface $as
         });
     }
 
+    /**
+     * @param mixed $payload
+     * @param array $variables
+     *
+     * @throws InvalidRequestException
+     * @throws SyntaxErrorException
+     */
     protected function parseAndCreateRequest($payload, $variables = [])
     {
         if (empty($payload)) {

src/Execution/Request.php

@@ -62,18 +62,6 @@ public function __construct($data = [], $variables = [])
         }
 
         if (array_key_exists('variableReferences', $data)) {
-            foreach ($data['variableReferences'] as $ref) {
-                if (!array_key_exists($ref->getName(), $variables)) {
-                    /** @var Variable $variable */
-                    $variable = $ref->getVariable();
-                    if ($variable->hasDefaultValue()) {
-                        $variables[$variable->getName()] = $variable->getDefaultValue()->getValue();
-                        continue;
-                    }
-                    throw new InvalidRequestException(sprintf("Variable %s hasn't been submitted", $ref->getName()), $ref->getLocation());
-                }
-            }
-
             $this->addVariableReferences($data['variableReferences']);
         }
 

src/Validator/RequestValidator/RequestValidator.php

@@ -14,50 +14,75 @@
 class RequestValidator implements RequestValidatorInterface
 {
 
+    /**
+     * @param Request $request
+     *
+     * @throws InvalidRequestException
+     */
     public function validate(Request $request)
     {
         $this->assertFragmentReferencesValid($request);
-        $this->assetFragmentsUsed($request);
+        $this->assertFragmentsUsed($request);
         $this->assertAllVariablesExists($request);
         $this->assertAllVariablesUsed($request);
     }
 
-    private function assetFragmentsUsed(Request $request)
+    /**
+     * @param Request $request
+     *
+     * @throws InvalidRequestException
+     */
+    private function assertFragmentsUsed(Request $request)
     {
         foreach ($request->getFragmentReferences() as $fragmentReference) {
             $request->getFragment($fragmentReference->getName())->setUsed(true);
         }
 
         foreach ($request->getFragments() as $fragment) {
             if (!$fragment->isUsed()) {
-                throw new InvalidRequestException(sprintf('Fragment "%s" not used', $fragment->getName()), $fragment->getLocation());
+                throw new InvalidRequestException(sprintf('Fragment "%s" is not used', $fragment->getName()), $fragment->getLocation());
             }
         }
     }
 
+    /**
+     * @param Request $request
+     *
+     * @throws InvalidRequestException
+     */
     private function assertFragmentReferencesValid(Request $request)
     {
         foreach ($request->getFragmentReferences() as $fragmentReference) {
             if (!$request->getFragment($fragmentReference->getName())) {
-                throw new InvalidRequestException(sprintf('Fragment "%s" not defined in query', $fragmentReference->getName()), $fragmentReference->getLocation());
+                throw new InvalidRequestException(sprintf('Fragment "%s" is not defined in query', $fragmentReference->getName()), $fragmentReference->getLocation());
             }
         }
     }
 
+    /**
+     * @param Request $request
+     *
+     * @throws InvalidRequestException
+     */
     private function assertAllVariablesExists(Request $request)
     {
         foreach ($request->getVariableReferences() as $variableReference) {
             if (!$variableReference->getVariable()) {
-                throw new InvalidRequestException(sprintf('Variable "%s" not exists', $variableReference->getName()), $variableReference->getLocation());
+                throw new InvalidRequestException(sprintf('Variable "%s" does not exists', $variableReference->getName()), $variableReference->getLocation());
             }
         }
     }
 
+    /**
+     * @param Request $request
+     *
+     * @throws InvalidRequestException
+     */
     private function assertAllVariablesUsed(Request $request)
     {
         foreach ($request->getQueryVariables() as $queryVariable) {
             if (!$queryVariable->isUsed()) {
-                throw new InvalidRequestException(sprintf('Variable "%s" not used', $queryVariable->getName()), $queryVariable->getLocation());
+                throw new InvalidRequestException(sprintf('Variable "%s" is not used', $queryVariable->getName()), $queryVariable->getLocation());
             }
         }
     }

tests/Issues/Issue238/MissingVariablesTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Youshido\Tests\Issues\Issue238;
+
+use PHPUnit\Framework\TestCase;
+use Youshido\GraphQL\Execution\Processor;
+use Youshido\Tests\StarWars\Schema\StarWarsSchema;
+
+class MissingVariablesTest extends TestCase
+{
+
+    /**
+     * @see https://github.com/youshido-php/GraphQL/issues/238
+     */
+    public function testProperExceptionOnMissingVariables()
+    {
+        $payload = <<<GQL
+query GetHero {
+    hero(episode:\$episode) {
+        name
+    }
+}
+GQL;
+
+        $schema = new StarWarsSchema();
+        $processor = new Processor($schema);
+
+        $processor->processPayload($payload);
+        $response = $processor->getResponseData();
+
+        $this->assertEquals([
+            'errors' => [
+                [
+                    'message' => 'Variable "episode" does not exists',
+                    'locations' => [
+                        [
+                            'line' => 2,
+                            'column' => 18,
+                        ],
+                    ],
+                ],
+            ],
+        ], $response);
+    }
+}

tests/Schema/VariablesTest.php

@@ -140,7 +140,7 @@ public function queries()
                 [
                     'errors' => [
                         [
-                            'message'   => 'Fragment "someFragment" not defined in query',
+                            'message'   => 'Fragment "someFragment" is not defined in query',
                             'locations' => [
                                 [
                                     'line'   => 3,