rebasing branch on 2.5

Author: mahmoodbazdar

src/GraphQl/Action/EntrypointAction.php

@@ -19,7 +19,6 @@
 use GraphQL\Error\Debug;
 use GraphQL\Error\Error;
 use GraphQL\Error\UserError;
-use GraphQL\Error\FormattedError;
 use GraphQL\Executor\ExecutionResult;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -215,8 +214,7 @@ private function decodeVariables(string $variables): array
 
     private function buildExceptionResponse(\Exception $e, int $statusCode): JsonResponse
     {
-        $executionResult = (new ExecutionResult(null, [new Error($e->getMessage(), null, null, null, null, $e)]))
-          ->setErrorFormatter($this->exceptionFormatterCallback);
+        $executionResult = new ExecutionResult(null, [new Error($e->getMessage(), null, null, null, null, $e)]);
 
         return new JsonResponse($executionResult->toArray($this->debug), $statusCode);
     }

tests/GraphQl/Action/EntrypointActionTest.php

@@ -233,9 +233,7 @@ private function getEntrypointAction(array $variables = ['graphqlVariable']): En
 
         $executionResultProphecy = $this->prophesize(ExecutionResult::class);
         $executionResultProphecy->toArray(false)->willReturn(['GraphQL']);
-        $executionResultProphecy->setErrorFormatter(Argument::type('callable'))->willReturn($executionResultProphecy);
         $executionResultProphecy->setErrorFormatter($exceptionFormatterCallback)->willReturn($executionResultProphecy);
-        $executionResultProphecy->toArray(3)->willReturn(['GraphQL']);
         $executorProphecy = $this->prophesize(ExecutorInterface::class);
         $executorProphecy->executeQuery(Argument::is($schema->reveal()), 'graphqlQuery', null, null, $variables, 'graphqlOperationName')->willReturn($executionResultProphecy->reveal());
 
@@ -245,8 +243,6 @@ private function getEntrypointAction(array $variables = ['graphqlVariable']): En
         $graphiQlAction = new GraphiQlAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
         $graphQlPlaygroundAction = new GraphQlPlaygroundAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
 
-        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, false, true, true, 'graphiql');
-        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $exceptionFormatterFactoryProphecy->reveal(), true, true, true, 'graphiql');
-        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $exceptionFormatterCallback, true, true, true, 'graphiql');
+        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $exceptionFormatterCallback, false, true, true, 'graphiql');
     }
 }