Moving override call upstream

Author: pdohogne-magento

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

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Controller;
 
-use GraphQL\Type\Definition\Type as GraphQLType;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\Http;
@@ -20,9 +19,6 @@
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\Type\Definition\FloatType;
-use Magento\Framework\GraphQl\Type\Definition\IntType;
-use Magento\Framework\GraphQl\Type\Definition\StringType;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
 use Magento\GraphQl\Helper\Query\Logger\LogData;
@@ -167,8 +163,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
 
         $schema = null;
         try {
-            $this->overrideStandardGraphQLTypes();
-
             /** @var Http $request */
             $this->requestProcessor->validateRequest($request);
 
@@ -205,23 +199,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
         return $this->httpResponse;
     }
 
-    /**
-     * Replace the standard type definitions with ones that know how to cast input values
-     */
-    private function overrideStandardGraphQLTypes(): void
-    {
-        $standardTypes = GraphQLType::getStandardTypes();
-
-        $intType = new IntType($standardTypes[GraphQLType::INT]->config);
-        $floatType = new FloatType($standardTypes[GraphQLType::FLOAT]->config);
-        $stringType = new StringType($standardTypes[GraphQLType::STRING]->config);
-        \GraphQL\GraphQL::overrideStandardTypes([
-            GraphQLType::INT => $intType,
-            GraphQLType::FLOAT => $floatType,
-            GraphQLType::STRING => $stringType
-        ]);
-    }
-
     /**
      * Get data from request body or query string
      *

lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php

@@ -7,11 +7,16 @@
 
 namespace Magento\Framework\GraphQlSchemaStitching;
 
+use GraphQL\GraphQL;
 use GraphQL\Type\Definition\ScalarType;
+use GraphQL\Type\Definition\Type as GraphQLType;
 use GraphQL\Utils\BuildSchema;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\FileResolverInterface;
 use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQl\Type\Definition\FloatType;
+use Magento\Framework\GraphQl\Type\Definition\IntType;
+use Magento\Framework\GraphQl\Type\Definition\StringType;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InterfaceType;
 
@@ -70,6 +75,7 @@ public function __construct(
         $this->typeReader = $typeReader;
         $this->defaultScope = $defaultScope;
         $this->fileName = $fileName;
+        $this->overrideStandardGraphQLTypes();
     }
 
     /**
@@ -343,4 +349,19 @@ private function addModuleNameToTypes(array $source, string $filePath): array
 
         return $source;
     }
+
+
+    /**
+     * Replace the standard type definitions with ones that know how to cast input values
+     */
+    private function overrideStandardGraphQLTypes(): void
+    {
+        $standardTypes = GraphQLType::getStandardTypes();
+
+        GraphQL::overrideStandardTypes([
+            GraphQLType::INT => new IntType($standardTypes[GraphQLType::INT]->config),
+            GraphQLType::FLOAT => new FloatType($standardTypes[GraphQLType::FLOAT]->config),
+            GraphQLType::STRING => new StringType($standardTypes[GraphQLType::STRING]->config)
+        ]);
+    }
 }