PWA-2356: Fixing schema introspection test to override GQL types first

Author: pdohogne-magento

dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\GraphQl\Schema\Type\InputObjectType;
 use Magento\Framework\GraphQl\Schema\Type\ObjectType;
+use Magento\Framework\GraphQl\Type\TypeManagement;
 use Magento\Framework\ObjectManagerInterface;
 
 class GraphQlIntrospectionTest extends \PHPUnit\Framework\TestCase
@@ -27,6 +28,8 @@ protected function setUp(): void
 
     public function testIntrospectionQuery()
     {
+        $typeManagement = new TypeManagement();
+        $typeManagement->overrideStandardGraphQLTypes();
         $emptySchema = $this->schemaFactory->create(
             [
                 'query' => new ObjectType(
@@ -272,10 +275,10 @@ public function testIntrospectsIncludeTheDeprecatedParameter()
       description
       isDeprecated
       deprecationReason
-      
+
     }
   }
-}           
+}
 
 QUERY;
         $response = \GraphQL\GraphQL::executeQuery($testSchema, $request);

lib/internal/Magento/Framework/GraphQl/SchemaFactory.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Framework\GraphQl;
 
+use Magento\Framework\GraphQl\Type\TypeManagement;
+
 /**
  * Factory for @see Schema
  */
@@ -20,6 +22,8 @@ class SchemaFactory
      */
     public function create(array $config) : Schema
     {
+        $typeManagement = new TypeManagement();
+        $typeManagement->overrideStandardGraphQLTypes();
         return new Schema($config);
     }
 }

lib/internal/Magento/Framework/GraphQl/Type/TypeManagement.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Type;
+
+use GraphQL\GraphQL;
+use GraphQL\Type\Definition\Type as GraphQLType;
+use Magento\Framework\GraphQl\Type\Definition\FloatType;
+use Magento\Framework\GraphQl\Type\Definition\IntType;
+use Magento\Framework\GraphQl\Type\Definition\StringType;
+
+/**
+ * Class containing shared methods for GraphQL type management
+ */
+class TypeManagement
+{
+    /**
+     * Replace the standard type definitions with ones that know how to cast input values
+     */
+    public function overrideStandardGraphQLTypes(): void
+    {
+        $standardTypes = GraphQLType::getStandardTypes();
+        $overrideTypes = [];
+        if (!($standardTypes[GraphQLType::INT] instanceof IntType)) {
+            $overrideTypes[GraphQLType::INT] = new IntType($standardTypes[GraphQLType::INT]->config);
+        }
+        if (!($standardTypes[GraphQLType::FLOAT] instanceof FloatType)) {
+            $overrideTypes[GraphQLType::FLOAT] = new FloatType($standardTypes[GraphQLType::FLOAT]->config);
+        }
+        if (!($standardTypes[GraphQLType::STRING] instanceof StringType)) {
+            $overrideTypes[GraphQLType::STRING] = new StringType($standardTypes[GraphQLType::STRING]->config);
+        }
+        if ($overrideTypes) {
+            GraphQL::overrideStandardTypes($overrideTypes);
+        }
+    }
+}

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

@@ -7,16 +7,12 @@
 
 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\GraphQl\Type\TypeManagement;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InterfaceType;
 
@@ -78,7 +74,8 @@ public function __construct(
         $this->typeReader = $typeReader;
         $this->defaultScope = $defaultScope;
         $this->fileName = $fileName;
-        $this->overrideStandardGraphQLTypes();
+        $typeManagement = new TypeManagement();
+        $typeManagement->overrideStandardGraphQLTypes();
     }
 
     /**
@@ -352,22 +349,4 @@ 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
-    {
-        if (!self::$typesOverridden) {
-            $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)
-            ]);
-
-            self::$typesOverridden = true;
-        }
-    }
 }