PWA-2137: [GraphQL] Need to bypass webonyx type validation

 - revert test changes
 - prevent standard types from being overridden more than once

Author: cspruiell

dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php

@@ -23,14 +23,16 @@
  */
 class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var ObjectManagerInterface */
-    private $objectManager;
-
-   /** @var \Magento\Framework\GraphQl\Config  */
+    /** @var \Magento\Framework\GraphQl\Config  */
     private $model;
 
-    public function __construct() {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    protected function setUp(): void
+    {
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Cache $cache */
+        $cache = $objectManager->get(Cache::class);
+        $cache->clean();
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
@@ -41,31 +43,21 @@ public function __construct() {
             $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
-        $graphQlReader = $this->objectManager->create(
+        $graphQlReader = $objectManager->create(
             \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
             ['fileResolver' => $fileResolverMock]
         );
-        $reader = $this->objectManager->create(
+        $reader = $objectManager->create(
         // phpstan:ignore
             \Magento\Framework\GraphQlSchemaStitching\Reader::class,
             ['readers' => ['graphql_reader' => $graphQlReader]]
         );
-        $data = $this->objectManager->create(
+        $data = $objectManager->create(
         // phpstan:ignore
             \Magento\Framework\GraphQl\Config\Data::class,
             ['reader' => $reader]
         );
-        $this->model = $this->objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
-        parent::__construct();
-    }
-
-    protected function setUp(): void
-    {
-        /** @var ObjectManagerInterface $objectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var Cache $cache */
-        $cache = $objectManager->get(Cache::class);
-        $cache->clean();
+        $this->model = $objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
     }
 
     /**
@@ -99,15 +91,15 @@ public function testGraphQlTypeAndFieldConfigStructure()
             $queryFieldArguments = $queryFields[$fieldKey]->getArguments();
             foreach (array_keys($queryFieldArguments) as $argumentKey) {
                 $argumentAssertionMap = [
-                   ['response_field' => 'name', 'expected_value' => $queryFieldArguments[$argumentKey]->getName()],
-                   ['response_field' => 'type', 'expected_value' => $queryFieldArguments[$argumentKey]->getTypeName()],
-                   ['response_field' => 'description', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->getDescription()],
-                   ['response_field' => 'required', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->isRequired()],
-                   ['response_field' => 'isList', 'expected_value' => $queryFieldArguments[$argumentKey]->isList()],
-                   ['response_field' => 'itemsRequired', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->areItemsRequired()]
+                    ['response_field' => 'name', 'expected_value' => $queryFieldArguments[$argumentKey]->getName()],
+                    ['response_field' => 'type', 'expected_value' => $queryFieldArguments[$argumentKey]->getTypeName()],
+                    ['response_field' => 'description', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->getDescription()],
+                    ['response_field' => 'required', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->isRequired()],
+                    ['response_field' => 'isList', 'expected_value' => $queryFieldArguments[$argumentKey]->isList()],
+                    ['response_field' => 'itemsRequired', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->areItemsRequired()]
                 ];
                 $this->assertResponseFields(
                     $expectedOutputArray['Query']['fields'][$fieldKey]['arguments'][$argumentKey],

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

@@ -59,6 +59,11 @@ class GraphQlReader implements ReaderInterface
      */
     private static $componentRegistrar;
 
+    /**
+     * @var boolean
+     */
+    private static $typesOverridden = false;
+
     /**
      * @param FileResolverInterface $fileResolver
      * @param TypeReaderComposite $typeReader
@@ -355,12 +360,16 @@ private function addModuleNameToTypes(array $source, string $filePath): array
      */
     private function overrideStandardGraphQLTypes(): void
     {
-        $standardTypes = GraphQLType::getStandardTypes();
+        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)
-        ]);
+            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;
+        }
     }
 }