Clean up tests

spawnia · spawnia · commit 1089e908608b · 2025-06-30T09:36:34.000+02:00
- use data providers
- use native types
- minimum visibility
diff --git a/tests/Executor/DeferredFieldsTest.php b/tests/Executor/DeferredFieldsTest.php
@@ -61,7 +61,7 @@ final class DeferredFieldsTest extends TestCase
 
     private ObjectType $queryType;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->storyDataSource = [
             ['id' => 1, 'authorId' => 1, 'title' => 'Story #1', 'categoryIds' => [2, 3]],
diff --git a/tests/Executor/ListsTest.php b/tests/Executor/ListsTest.php
@@ -502,7 +502,7 @@ public function testHandlesNonNullListOfNonNullsWithArray(): void
      * @throws \Exception
      * @throws InvariantViolation
      */
-    public function checkHandlesNonNullListOfNonNulls($testData, array $expected, int $debug = DebugFlag::NONE): void
+    private function checkHandlesNonNullListOfNonNulls($testData, array $expected, int $debug = DebugFlag::NONE): void
     {
         $testType = Type::nonNull(Type::listOf(Type::nonNull(Type::int())));
         $this->check($testType, $testData, $expected, $debug);
diff --git a/tests/Executor/NonNullTest.php b/tests/Executor/NonNullTest.php
@@ -39,7 +39,7 @@ final class NonNullTest extends TestCase
 
     public Schema $schemaWithNonNullArg;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->syncError = new UserError('sync');
         $this->syncNonNullError = new UserError('syncNonNull');
diff --git a/tests/Executor/Promise/ReactPromiseAdapterTest.php b/tests/Executor/Promise/ReactPromiseAdapterTest.php
@@ -22,7 +22,7 @@ final class ReactPromiseAdapterTest extends TestCase
     /** @var class-string<object> */
     private string $classRejectedPromise;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         /** @var class-string<object> $classFulfilledPromise */
         $classFulfilledPromise = class_exists('\React\Promise\FulfilledPromise')
diff --git a/tests/Executor/Promise/SyncPromiseAdapterTest.php b/tests/Executor/Promise/SyncPromiseAdapterTest.php
@@ -13,7 +13,7 @@ final class SyncPromiseAdapterTest extends TestCase
 {
     private SyncPromiseAdapter $promises;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->promises = new SyncPromiseAdapter();
     }
diff --git a/tests/Executor/ScopedContextTest.php b/tests/Executor/ScopedContextTest.php
@@ -24,7 +24,7 @@ final class ScopedContextTest extends TestCase
     /** @var array<string, MyScopedContext|MySharedContext> */
     private array $contexts = [];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->contexts = [];
 
diff --git a/tests/Executor/SyncTest.php b/tests/Executor/SyncTest.php
@@ -28,7 +28,7 @@ final class SyncTest extends TestCase
 
     private SyncPromiseAdapter $promiseAdapter;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->schema = new Schema([
             'query' => new ObjectType([
diff --git a/tests/Executor/TestClasses/Human.php b/tests/Executor/TestClasses/Human.php
@@ -4,8 +4,7 @@
 
 final class Human
 {
-    /** @var string */
-    public $name;
+    public string $name;
 
     public function __construct(string $name)
     {
diff --git a/tests/Executor/TestClasses/NotSpecial.php b/tests/Executor/TestClasses/NotSpecial.php
@@ -4,11 +4,9 @@
 
 final class NotSpecial
 {
-    /** @var string */
-    public $value;
+    public string $value;
 
-    /** @param string $value */
-    public function __construct($value)
+    public function __construct(string $value)
     {
         $this->value = $value;
     }
diff --git a/tests/Executor/TestClasses/NumberHolder.php b/tests/Executor/TestClasses/NumberHolder.php
@@ -4,8 +4,7 @@
 
 final class NumberHolder
 {
-    /** @var float */
-    public $theNumber;
+    public float $theNumber;
 
     public function __construct(float $originalNumber)
     {
diff --git a/tests/Executor/TestClasses/Person.php b/tests/Executor/TestClasses/Person.php
@@ -4,8 +4,7 @@
 
 final class Person
 {
-    /** @var string */
-    public $name;
+    public string $name;
 
     /** @var array<Dog|Cat>|null */
     public ?array $pets;
diff --git a/tests/Executor/TestClasses/Special.php b/tests/Executor/TestClasses/Special.php
@@ -4,11 +4,9 @@
 
 final class Special
 {
-    /** @var string */
-    public $value;
+    public string $value;
 
-    /** @param string $value */
-    public function __construct($value)
+    public function __construct(string $value)
     {
         $this->value = $value;
     }
diff --git a/tests/Executor/UnionInterfaceTest.php b/tests/Executor/UnionInterfaceTest.php
@@ -30,7 +30,7 @@ final class UnionInterfaceTest extends TestCase
 
     public Person $john;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $NamedType = new InterfaceType([
             'name' => 'Named',
diff --git a/tests/Executor/VariablesTest.php b/tests/Executor/VariablesTest.php
@@ -134,7 +134,7 @@ private function executeQuery(string $query, ?array $variableValues = null): Exe
     }
 
     /** @throws InvariantViolation */
-    public function schema(): Schema
+    private function schema(): Schema
     {
         $ComplexScalarType = new ComplexScalar();
 
diff --git a/tests/PhpStan/Type/Definition/Type/IsAbstractTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsAbstractTypeStaticMethodTypeSpecifyingExtension.php
@@ -16,8 +16,7 @@
 
 final class IsAbstractTypeStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /** @var TypeSpecifier */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/tests/PhpStan/Type/Definition/Type/IsCompositeTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsCompositeTypeStaticMethodTypeSpecifyingExtension.php
@@ -16,8 +16,7 @@
 
 final class IsCompositeTypeStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /** @var TypeSpecifier */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/tests/PhpStan/Type/Definition/Type/IsInputTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsInputTypeStaticMethodTypeSpecifyingExtension.php
@@ -16,8 +16,7 @@
 
 final class IsInputTypeStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /** @var TypeSpecifier */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/tests/PhpStan/Type/Definition/Type/IsOutputTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsOutputTypeStaticMethodTypeSpecifyingExtension.php
@@ -16,8 +16,7 @@
 
 final class IsOutputTypeStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
-    /** @var TypeSpecifier */
-    private $typeSpecifier;
+    private TypeSpecifier $typeSpecifier;
 
     public function getClass(): string
     {
diff --git a/tests/Server/QueryExecutionTest.php b/tests/Server/QueryExecutionTest.php
@@ -23,7 +23,7 @@ final class QueryExecutionTest extends ServerTestCase
 
     private ServerConfig $config;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $schema = $this->buildSchema();
         $this->config = ServerConfig::create()
diff --git a/tests/Server/StandardServerTest.php b/tests/Server/StandardServerTest.php
@@ -21,7 +21,7 @@ final class StandardServerTest extends ServerTestCase
     /** @var ServerConfig */
     private $config;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $schema = $this->buildSchema();
         $this->config = ServerConfig::create()
diff --git a/tests/TestCaseBase.php b/tests/TestCaseBase.php
@@ -15,7 +15,7 @@ abstract class TestCaseBase extends TestCase
      *
      * @see TestCase::expectNotToPerformAssertions()
      */
-    public function assertDidNotCrash(): void
+    protected function assertDidNotCrash(): void
     {
         $this->addToAssertionCount(1);
     }
diff --git a/tests/Type/DefinitionTest.php b/tests/Type/DefinitionTest.php
@@ -55,7 +55,7 @@ final class DefinitionTest extends TestCaseBase
 
     public CustomScalarType $scalarType;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectType = new ObjectType(['name' => 'Object', 'fields' => ['tmp' => Type::string()]]);
         $this->interfaceType = new InterfaceType(['name' => 'Interface', 'fields' => ['irrelevant' => Type::int()]]);
diff --git a/tests/Type/EagerTypeLoaderTest.php b/tests/Type/EagerTypeLoaderTest.php
@@ -24,7 +24,7 @@ final class EagerTypeLoaderTest extends TypeLoaderTestCaseBase
 
     private InputObjectType $postStoryMutationInput;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Type/EnumTypeTest.php b/tests/Type/EnumTypeTest.php
@@ -33,7 +33,7 @@ final class EnumTypeTest extends TestCase
     /** @var \ArrayObject<string, int> */
     private \ArrayObject $Complex2;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $ColorType = new EnumType([
             'name' => 'Color',
diff --git a/tests/Type/LazyTypeLoaderTest.php b/tests/Type/LazyTypeLoaderTest.php
@@ -29,7 +29,7 @@ final class LazyTypeLoaderTest extends TypeLoaderTestCaseBase
     /** @var array<string, Type> */
     private array $loadedTypes = [];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Type/SchemaTest.php b/tests/Type/SchemaTest.php
@@ -25,7 +25,7 @@ final class SchemaTest extends TestCase
 
     private Schema $schema;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->interfaceType = new InterfaceType([
             'name' => 'Interface',
diff --git a/tests/Type/TestClasses/MyCustomType.php b/tests/Type/TestClasses/MyCustomType.php
@@ -9,11 +9,10 @@ final class MyCustomType extends ObjectType
 {
     public function __construct()
     {
-        $config = [
+        parent::__construct([
             'fields' => [
                 'a' => Type::string(),
             ],
-        ];
-        parent::__construct($config);
+        ]);
     }
 }
diff --git a/tests/Type/TestClasses/ObjectIdStub.php b/tests/Type/TestClasses/ObjectIdStub.php
@@ -4,11 +4,9 @@
 
 final class ObjectIdStub
 {
-    /** @var int */
-    private $id;
+    private int $id;
 
-    /** @param int $id */
-    public function __construct($id)
+    public function __construct(int $id)
     {
         $this->id = $id;
     }
diff --git a/tests/Type/TestClasses/OtherCustom.php b/tests/Type/TestClasses/OtherCustom.php
@@ -5,18 +5,15 @@
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 
-/**
- * Note: named OtherCustom vs OtherCustomType intentionally.
- */
+/** Named OtherCustom vs. OtherCustomType intentionally. */
 final class OtherCustom extends ObjectType
 {
     public function __construct()
     {
-        $config = [
+        parent::__construct([
             'fields' => [
                 'b' => Type::string(),
             ],
-        ];
-        parent::__construct($config);
+        ]);
     }
 }
diff --git a/tests/Type/TypeLoaderTestCaseBase.php b/tests/Type/TypeLoaderTestCaseBase.php
@@ -24,7 +24,7 @@ abstract class TypeLoaderTestCaseBase extends TestCaseBase
     /** @var array<int, string> */
     protected array $calls;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->calls = [];
     }
diff --git a/tests/Type/ValidationTest.php b/tests/Type/ValidationTest.php
@@ -55,7 +55,7 @@ final class ValidationTest extends TestCaseBase
 
     public float $Number;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->Number = 1;
 
diff --git a/tests/Utils/BreakingChangesFinderTest.php b/tests/Utils/BreakingChangesFinderTest.php
@@ -18,7 +18,7 @@ final class BreakingChangesFinderTest extends TestCase
 {
     private ObjectType $queryType;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->queryType = new ObjectType([
             'name' => 'Query',
diff --git a/tests/Utils/CoerceInputValueTest.php b/tests/Utils/CoerceInputValueTest.php
@@ -36,7 +36,7 @@ final class CoerceInputValueTest extends TestCase
     /** @var ListOfType<ListOfType<ScalarType>> */
     private ListOfType $testNestedList;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->testNonNull = Type::nonNull(Type::int());
 
diff --git a/tests/Utils/ExtractTypesTest.php b/tests/Utils/ExtractTypesTest.php
@@ -52,7 +52,7 @@ final class ExtractTypesTest extends TestCase
     /** @var InputObjectType */
     private $postCommentMutationInput;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->node = new InterfaceType([
             'name' => 'Node',
diff --git a/tests/Utils/MixedStoreTest.php b/tests/Utils/MixedStoreTest.php
diff --git a/tests/Utils/SchemaExtenderTest/SomeInterfaceClassType.php b/tests/Utils/SchemaExtenderTest/SomeInterfaceClassType.php
diff --git a/tests/Utils/SchemaExtenderTest/SomeObjectClassType.php b/tests/Utils/SchemaExtenderTest/SomeObjectClassType.php
diff --git a/tests/Utils/SchemaExtenderTest/SomeScalarClassType.php b/tests/Utils/SchemaExtenderTest/SomeScalarClassType.php
diff --git a/tests/Utils/SchemaExtenderTest/SomeUnionClassType.php b/tests/Utils/SchemaExtenderTest/SomeUnionClassType.php
diff --git a/tests/Validator/KnownDirectivesTest.php b/tests/Validator/KnownDirectivesTest.php

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ final class DeferredFieldsTest extends TestCase`
`61`	`61`
`62`	`62`	`private ObjectType $queryType;`
`63`	`63`
`64`		`- public function setUp(): void`
	`64`	`+ protected function setUp(): void`
`65`	`65`	`{`
`66`	`66`	`$this->storyDataSource = [`
`67`	`67`	`['id' => 1, 'authorId' => 1, 'title' => 'Story #1', 'categoryIds' => [2, 3]],`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ public function testHandlesNonNullListOfNonNullsWithArray(): void`
`502`	`502`	`* @throws \Exception`
`503`	`503`	`* @throws InvariantViolation`
`504`	`504`	`*/`
`505`		`- public function checkHandlesNonNullListOfNonNulls($testData, array $expected, int $debug = DebugFlag::NONE): void`
	`505`	`+ private function checkHandlesNonNullListOfNonNulls($testData, array $expected, int $debug = DebugFlag::NONE): void`
`506`	`506`	`{`
`507`	`507`	`$testType = Type::nonNull(Type::listOf(Type::nonNull(Type::int())));`
`508`	`508`	`$this->check($testType, $testData, $expected, $debug);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ final class NonNullTest extends TestCase`
`39`	`39`
`40`	`40`	`public Schema $schemaWithNonNullArg;`
`41`	`41`
`42`		`- public function setUp(): void`
	`42`	`+ protected function setUp(): void`
`43`	`43`	`{`
`44`	`44`	`$this->syncError = new UserError('sync');`
`45`	`45`	`$this->syncNonNullError = new UserError('syncNonNull');`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class ReactPromiseAdapterTest extends TestCase`
`22`	`22`	`/** @var class-string<object> */`
`23`	`23`	`private string $classRejectedPromise;`
`24`	`24`
`25`		`- public function setUp(): void`
	`25`	`+ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`/** @var class-string<object> $classFulfilledPromise */`
`28`	`28`	`$classFulfilledPromise = class_exists('\React\Promise\FulfilledPromise')`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class SyncPromiseAdapterTest extends TestCase`
`13`	`13`	`{`
`14`	`14`	`private SyncPromiseAdapter $promises;`
`15`	`15`
`16`		`- public function setUp(): void`
	`16`	`+ protected function setUp(): void`
`17`	`17`	`{`
`18`	`18`	`$this->promises = new SyncPromiseAdapter();`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ final class ScopedContextTest extends TestCase`
`24`	`24`	`/** @var array<string, MyScopedContext\|MySharedContext> */`
`25`	`25`	`private array $contexts = [];`
`26`	`26`
`27`		`- public function setUp(): void`
	`27`	`+ protected function setUp(): void`
`28`	`28`	`{`
`29`	`29`	`$this->contexts = [];`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class SyncTest extends TestCase`
`28`	`28`
`29`	`29`	`private SyncPromiseAdapter $promiseAdapter;`
`30`	`30`
`31`		`- public function setUp(): void`
	`31`	`+ protected function setUp(): void`
`32`	`32`	`{`
`33`	`33`	`$this->schema = new Schema([`
`34`	`34`	`'query' => new ObjectType([`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`
`5`	`5`	`final class Human`
`6`	`6`	`{`
`7`		`- /** @var string */`
`8`		`- public $name;`
	`7`	`+ public string $name;`
`9`	`8`
`10`	`9`	`public function __construct(string $name)`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,9 @@`
`4`	`4`
`5`	`5`	`final class NotSpecial`
`6`	`6`	`{`
`7`		`- /** @var string */`
`8`		`- public $value;`
	`7`	`+ public string $value;`
`9`	`8`
`10`		`- /** @param string $value */`
`11`		`- public function __construct($value)`
	`9`	`+ public function __construct(string $value)`
`12`	`10`	`{`
`13`	`11`	`$this->value = $value;`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`
`5`	`5`	`final class NumberHolder`
`6`	`6`	`{`
`7`		`- /** @var float */`
`8`		`- public $theNumber;`
	`7`	`+ public float $theNumber;`
`9`	`8`
`10`	`9`	`public function __construct(float $originalNumber)`
`11`	`10`	`{`