Merge commit '85aabf72751b6b240b6b64fd708c1ea0f5d25fdf' into fix/add-oneOf-to-schema-printer

Author: jasonbahl

composer.json

@@ -18,7 +18,7 @@
     "amphp/http-server": "^2.1",
     "dms/phpunit-arraysubset-asserts": "dev-master",
     "ergebnis/composer-normalize": "^2.28",
-    "friendsofphp/php-cs-fixer": "3.82.1",
+    "friendsofphp/php-cs-fixer": "3.82.2",
     "mll-lab/php-cs-fixer-config": "5.11.0",
     "nyholm/psr7": "^1.5",
     "phpbench/phpbench": "^1.2",

tests/Executor/AbstractTest.php

@@ -751,7 +751,9 @@ public function testHintsOnConflictingTypeInstancesInResolveType(): void
             ],
         ]);
 
-        $schema = new Schema(['query' => $query]);
+        $schema = new Schema([
+            'query' => $query,
+        ]);
         $schema->assertValid();
 
         $query = '

tests/Executor/DeferredFieldsTest.php

@@ -452,7 +452,9 @@ public function testComplexRecursiveDeferredFields(): void
             },
         ]);
 
-        $schema = new Schema(['query' => $complexType]);
+        $schema = new Schema([
+            'query' => $complexType,
+        ]);
 
         $query = Parser::parse('
             {

tests/Executor/ExecutorSchemaTest.php

@@ -105,7 +105,9 @@ public function testExecutesUsingASchema(): void
             ],
         ]);
 
-        $BlogSchema = new Schema(['query' => $BlogQuery]);
+        $BlogSchema = new Schema([
+            'query' => $BlogQuery,
+        ]);
 
         $request = '
       {

tests/Executor/ExecutorTest.php

@@ -156,7 +156,9 @@ public function testExecutesArbitraryCode(): void
                 'deeper' => ['type' => Type::listOf($dataType)],
             ],
         ]);
-        $schema = new Schema(['query' => $dataType]);
+        $schema = new Schema([
+            'query' => $dataType,
+        ]);
 
         self::assertEquals(
             $expected,
@@ -205,7 +207,9 @@ public function testMergesParallelFragments(): void
             },
         ]);
 
-        $schema = new Schema(['query' => $Type]);
+        $schema = new Schema([
+            'query' => $Type,
+        ]);
         $expected = [
             'data' => [
                 'a' => 'Apple',
@@ -826,7 +830,9 @@ public function testCorrectFieldOrderingDespiteExecutionOrder(): void
                 'e' => ['type' => Type::string()],
             ],
         ]);
-        $schema = new Schema(['query' => $queryType]);
+        $schema = new Schema([
+            'query' => $queryType,
+        ]);
 
         $expected = [
             'data' => [

tests/Executor/ListsTest.php

@@ -86,7 +86,9 @@ private function check(Type $testType, $testData, array $expected, int $debug =
             },
         ]);
 
-        $schema = new Schema(['query' => $dataType]);
+        $schema = new Schema([
+            'query' => $dataType,
+        ]);
 
         $ast = Parser::parse('{ nest { test } }');
 

tests/Executor/NonNullTest.php

@@ -106,7 +106,9 @@ protected function setUp(): void
             },
         ]);
 
-        $this->schema = new Schema(['query' => $dataType]);
+        $this->schema = new Schema([
+            'query' => $dataType,
+        ]);
 
         $this->schemaWithNonNullArg = new Schema([
             'query' => new ObjectType([

tests/Executor/UnionInterfaceTest.php

@@ -550,7 +550,9 @@ public function testGetsExecutionInfoInResolver(): void
             ],
         ]);
 
-        $schema2 = new Schema(['query' => $PersonType2]);
+        $schema2 = new Schema([
+            'query' => $PersonType2,
+        ]);
 
         $john2 = new Person('John', [], [$this->liz]);
 

tests/Executor/VariablesTest.php

@@ -194,7 +194,9 @@ private function schema(): Schema
             ],
         ]);
 
-        return new Schema(['query' => $TestType]);
+        return new Schema([
+            'query' => $TestType,
+        ]);
     }
 
     /**

tests/IntegerFloatPrimitiveIntrospectionTest.php

@@ -35,7 +35,9 @@ public static function build(): Schema
             ],
         ]);
 
-        return new Schema(['query' => $queryType]);
+        return new Schema([
+            'query' => $queryType,
+        ]);
     }
 
     public function testDefaultValues(): void