Merge pull request #68 from overblog/fix_is_type_of

Fix isTypeOf / no empty body accepted for json request parser

Author: mcg-web

Generator/TypeGenerator.php

@@ -72,26 +72,14 @@ protected function resolveTypeCode($alias)
         return  sprintf('$container->get(\'%s\')->resolve(%s)', 'overblog_graphql.type_resolver', var_export($alias, true));
     }
 
-    /**
-     * todo replace generateResolve in vendor after spec-april2016 is merged.
-     *
-     * @param array $value
-     *
-     * @return string
-     */
-    protected function generateResolve2(array $value)
-    {
-        return $this->callableCallbackFromArrayValue($value, 'resolve', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info');
-    }
-
     protected function generateResolve(array $value)
     {
         $accessIsSet = $this->arrayKeyExistsAndIsNotNull($value, 'access');
         $fieldOptions = $value;
         $fieldOptions['resolve'] = $this->arrayKeyExistsAndIsNotNull($fieldOptions, 'resolve') ? $fieldOptions['resolve'] : $this->defaultResolver;
 
         if (!$accessIsSet || true === $fieldOptions['access']) { // access granted  to this field
-            $resolveCallback = $this->generateResolve2($fieldOptions);
+            $resolveCallback = parent::generateResolve($fieldOptions);
             if ('null' === $resolveCallback) {
                 return $resolveCallback;
             }
@@ -113,7 +101,7 @@ function ($value, $args, $context, %s $info) <closureUseStatements> {
 
             return sprintf('function () { throw new %s(\'Access denied to this field.\'); }', $exceptionClass);
         } else { // wrap resolver with access
-            $resolveCallback = $this->generateResolve2($fieldOptions);
+            $resolveCallback = parent::generateResolve($fieldOptions);
             $accessChecker = $this->callableCallbackFromArrayValue($fieldOptions, 'access', '$value, $args, $context, \\GraphQL\\Type\\Definition\\ResolveInfo $info, $object');
             $resolveInfoClass = $this->shortenClassName('\\GraphQL\\Type\\Definition\\ResolveInfo');
             $argumentClass = $this->shortenClassName('\\Overblog\\GraphQLBundle\\Definition\\Argument');

Request/Parser.php

@@ -50,6 +50,10 @@ private function getParsedBody(Request $request)
 
             // JSON object
             case static::CONTENT_TYPE_JSON:
+                if (empty($body)) {
+                    throw new BadRequestHttpException('The request content body must not be empty when using json content type request.');
+                }
+
                 $parsedBody = json_decode($body, true);
 
                 if (JSON_ERROR_NONE !== json_last_error()) {

Tests/Functional/Controller/GraphControllerTest.php

@@ -95,6 +95,18 @@ public function testEndpointWithEmptyQuery()
         $client->getResponse()->getContent();
     }
 
+    /**
+     * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+     * @expectedExceptionMessage The request content body must not be empty when using json content type request.
+     */
+    public function testEndpointWithEmptyJsonBodyQuery()
+    {
+        $client = static::createClient();
+        $client->request('GET', '/', [], [], ['CONTENT_TYPE' => 'application/json']);
+        $client->getResponse()->getContent();
+    }
+
+
     /**
      * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      * @expectedExceptionMessage POST body sent invalid JSON

composer.json

@@ -24,7 +24,7 @@
     "require": {
         "php": "^5.4|~7.0",
         "doctrine/doctrine-cache-bundle": "^1.2",
-        "overblog/graphql-php-generator": "^0.2.2",
+        "overblog/graphql-php-generator": "^0.3.0",
         "symfony/expression-language": "^2.7|^3.0",
         "symfony/framework-bundle": "^2.7|^3.0",
         "symfony/options-resolver": "^2.7|^3.0",