Fixing calls to parent::parseLiteral()

Author: pdohogne-magento

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -211,12 +211,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
     private function overrideStandardGraphQLTypes(): void
     {
         $standardTypes = GraphQLType::getStandardTypes();
-//        $intConfig = [
-//            'name' => $standardInt->name,
-//            'description' => $standardInt->description,
-//            'astNode' => $standardInt->astNode,
-//            'extensionASTNodes' => $standardInt->extensionASTNodes
-//        ];
 
         $intType = new IntType($standardTypes[GraphQLType::INT]->config);
         $floatType = new FloatType($standardTypes[GraphQLType::FLOAT]->config);

lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php

@@ -9,7 +9,10 @@
 
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\FloatValueNode;
+use GraphQL\Language\AST\IntValueNode;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the FloatType definition that can typecast non-numeric values for backwards compatibility
@@ -42,9 +45,19 @@ public function parseValue($value): float
     public function parseLiteral(Node $valueNode, ?array $variables = null): float
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof FloatValueNode)
+                && !($valueNode instanceof IntValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new FloatValueNode([
+                    'value' => (string)$this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }

lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php

@@ -9,7 +9,9 @@
 
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\IntValueNode;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the IntType definition that can typecast non-numeric values for backwards compatibility
@@ -42,9 +44,18 @@ public function parseValue($value): int
     public function parseLiteral(Node $valueNode, ?array $variables = null): int
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof IntValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new IntValueNode([
+                    'value' => (string)$this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }

lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php

@@ -10,6 +10,8 @@
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\StringValueNode;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the StringType definition that can typecast non-string values for backwards compatibility
@@ -42,9 +44,18 @@ public function parseValue($value): string
     public function parseLiteral(Node $valueNode, ?array $variables = null): string
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof StringValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new StringValueNode([
+                    'value' => $this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }