Merge pull request #1167 from duncanmcclean/phpunit-attributes

Adopt PHPUnit attributes
rebing · Feb 24, 2025 · 3e5091a · 3e5091a
2 parents 8a9de2d + aacc582
commit 3e5091a
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ CHANGELOG
 ## Added
 - Support for Laravel 12 [\#1164 / duncanmcclean](https://github.com/rebing/graphql-laravel/pull/1164)
 
+## Changed
+- Adopted PHPUnit attributes in the test suite [#1167 / duncanmcclean](https://github.com/rebing/graphql-laravel/pull/1167)
+
 2024-11-22, 9.7.0
 -----------------
 

diff --git a/tests/Database/EmptyQueryTest.php b/tests/Database/EmptyQueryTest.php
@@ -5,14 +5,15 @@
 
 use Laragraph\Utils\BadRequestGraphQLException;
 use Orchestra\Testbench\Attributes\WithConfig;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Tests\TestCaseDatabase;
 
 class EmptyQueryTest extends TestCaseDatabase
 {
     /**
-     * @dataProvider dataForEmptyQuery
      * @param list<mixed> $parameters
      */
+    #[DataProvider('dataForEmptyQuery')]
     public function testEmptyQuery(array $parameters, string $expectedError): void
     {
         $response = $this->call('GET', '/graphql', $parameters);

diff --git a/tests/Unit/Console/EnumMakeCommandTest.php b/tests/Unit/Console/EnumMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\EnumMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class EnumMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/ExecutionMiddlewareMakeCommandTest.php b/tests/Unit/Console/ExecutionMiddlewareMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\ExecutionMiddlewareMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class ExecutionMiddlewareMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/InputMakeCommandTest.php b/tests/Unit/Console/InputMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\InputMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class InputMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/InterfaceMakeCommandTest.php b/tests/Unit/Console/InterfaceMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\InterfaceMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class InterfaceMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/MiddlewareMakeCommandTest.php b/tests/Unit/Console/MiddlewareMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\MiddlewareMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class MiddlewareMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/MutationMakeCommandTest.php b/tests/Unit/Console/MutationMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\MutationMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class MutationMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/QueryMakeCommandTest.php b/tests/Unit/Console/QueryMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\QueryMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class QueryMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/ScalarMakeCommandTest.php b/tests/Unit/Console/ScalarMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\ScalarMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class ScalarMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/SchemaConfigMakeCommandTest.php b/tests/Unit/Console/SchemaConfigMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\SchemaConfigMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class SchemaConfigMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/TypeMakeCommandTest.php b/tests/Unit/Console/TypeMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\TypeMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class TypeMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/Console/UnionMakeCommandTest.php b/tests/Unit/Console/UnionMakeCommandTest.php
@@ -3,6 +3,7 @@
 declare(strict_types = 1);
 namespace Rebing\GraphQL\Tests\Unit\Console;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rebing\GraphQL\Console\UnionMakeCommand;
 use Rebing\GraphQL\Tests\Support\Traits\MakeCommandAssertionTrait;
 use Rebing\GraphQL\Tests\TestCase;
@@ -11,9 +12,7 @@ class UnionMakeCommandTest extends TestCase
 {
     use MakeCommandAssertionTrait;
 
-    /**
-     * @dataProvider dataForMakeCommand
-     */
+    #[DataProvider('dataForMakeCommand')]
     public function testCommand(
         string $inputName,
         string $expectedFilename,

diff --git a/tests/Unit/GraphQLTest.php b/tests/Unit/GraphQLTest.php
@@ -11,6 +11,7 @@
 use GraphQL\Type\Schema;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Traits\Macroable;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use Rebing\GraphQL\Error\ValidationError;
 use Rebing\GraphQL\Exception\SchemaNotFound;
 use Rebing\GraphQL\Exception\TypeNotFound;
@@ -45,9 +46,7 @@ public function testSchemaWithName(): void
         self::assertArrayHasKey('Example', $schema->getTypeMap());
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    #[DoesNotPerformAssertions]
     public function testSchemaIsValidWithInputFieldAliases(): void
     {
         $schema = GraphQL::buildSchemaFromConfig([