OXDEV-9641 Fix deprecations

hkreuter · hkreuter · commit 85cc072de5b2 · 2026-02-22T20:25:26.000+01:00
diff --git a/tests/Integration/Infrastructure/LegacyTest.php b/tests/Integration/Infrastructure/LegacyTest.php
@@ -16,6 +16,7 @@
 use OxidEsales\GraphQL\Base\Exception\InvalidLogin;
 use OxidEsales\GraphQL\Base\Infrastructure\Legacy;
 use OxidEsales\GraphQL\Base\Tests\Integration\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class LegacyTest extends TestCase
 {
@@ -50,9 +51,7 @@ public function testInvalidLogin(): void
         );
     }
 
-    /**
-     * @dataProvider loginResponseTestDataProvider
-     */
+    #[DataProvider('loginResponseTestDataProvider')]
     public function testLoginResponseIsAnonymousOnLoginMissing(
         ?string $login,
         ?string $password,
diff --git a/tests/Integration/Infrastructure/RepositoryTest.php b/tests/Integration/Infrastructure/RepositoryTest.php
@@ -14,11 +14,10 @@
 use OxidEsales\GraphQL\Base\DataType\Pagination\Pagination;
 use OxidEsales\GraphQL\Base\DataType\Sorting\Sorting as BaseSorting;
 use OxidEsales\GraphQL\Base\Infrastructure\Repository;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers OxidEsales\GraphQL\Base\Infrastructure\Repository
- */
+#[CoversClass(\OxidEsales\GraphQL\Base\Infrastructure\Repository::class)]
 final class RepositoryTest extends TestCase
 {
     public function testFatalErrorOnWrongClassById(): void
diff --git a/tests/Integration/TestCase.php b/tests/Integration/TestCase.php
@@ -213,7 +213,6 @@ protected function uploadFile(
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
         $response = curl_exec($ch);
-        curl_close($ch);
 
         return json_decode($response, true) ?: [];
     }
diff --git a/tests/Unit/DataType/Filter/BoolFilterTest.php b/tests/Unit/DataType/Filter/BoolFilterTest.php
@@ -13,6 +13,7 @@
 use InvalidArgumentException;
 use OxidEsales\GraphQL\Base\DataType\Filter\BoolFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class BoolFilterTest extends DataTypeTestCase
 {
@@ -21,9 +22,7 @@ public function testReturnsTrueOnEmptyInitialization(): void
         $this->assertTrue((new BoolFilter())->equals());
     }
 
-    /**
-     * @dataProvider boolDataProvider
-     */
+    #[DataProvider('boolDataProvider')]
     public function testReturnsGivenEqualValue(bool $userInput, bool $returnValue): void
     {
         $this->assertSame(
@@ -49,9 +48,7 @@ public function testAddQueryPartWithNoFrom(): void
         $filter->addToQuery($queryBuilder, 'db_field');
     }
 
-    /**
-     * @dataProvider addQueryPartProvider
-     */
+    #[DataProvider('addQueryPartProvider')]
     public function testAddQueryPart(bool $filterValue): void
     {
         $queryBuilder = $this->createQueryBuilderMock();
diff --git a/tests/Unit/DataType/Filter/DateFilterTest.php b/tests/Unit/DataType/Filter/DateFilterTest.php
@@ -18,6 +18,7 @@
 use OutOfBoundsException;
 use OxidEsales\GraphQL\Base\DataType\Filter\DateFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DateFilterTest extends DataTypeTestCase
 {
@@ -48,9 +49,7 @@ public static function invalidBetweens(): array
         ];
     }
 
-    /**
-     * @dataProvider invalidBetweens
-     */
+    #[DataProvider('invalidBetweens')]
     public function testThrowsExceptionOnInvalidBetween(
         array $between
     ): void {
@@ -180,7 +179,7 @@ public function testAddQueryPartWithAlias(): void
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);
     }
 
-    /** @dataProvider matchesDataProvider */
+    #[DataProvider('matchesDataProvider')]
     public function testMatches(
         DateTimeInterface $trueCase,
         mixed $falseCase,
diff --git a/tests/Unit/DataType/Filter/FloatFilterTest.php b/tests/Unit/DataType/Filter/FloatFilterTest.php
@@ -14,6 +14,7 @@
 use InvalidArgumentException;
 use OxidEsales\GraphQL\Base\DataType\Filter\FloatFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class FloatFilterTest extends DataTypeTestCase
 {
@@ -110,9 +111,7 @@ public static function invalidBetweens(): array
         ];
     }
 
-    /**
-     * @dataProvider invalidBetweens
-     */
+    #[DataProvider('invalidBetweens')]
     public function testThrowsExceptionOnInvalidBetween(
         array $between
     ): void {
@@ -227,7 +226,7 @@ public function testAddQueryPartWithAlias(): void
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);
     }
 
-    /** @dataProvider matchesDataProvider */
+    #[DataProvider('matchesDataProvider')]
     public function testMatches(
         float $trueCase,
         mixed $falseCase,
diff --git a/tests/Unit/DataType/Filter/IDFilterTest.php b/tests/Unit/DataType/Filter/IDFilterTest.php
@@ -15,6 +15,7 @@
 use InvalidArgumentException;
 use OxidEsales\GraphQL\Base\DataType\Filter\IDFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 class IDFilterTest extends DataTypeTestCase
@@ -79,7 +80,7 @@ public function testAddQueryPartWithAlias(): void
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field', (string)$where);
     }
 
-    /** @dataProvider matchesDataProvider */
+    #[DataProvider('matchesDataProvider')]
     public function testMatches(mixed $value, IDFilter $filter, bool $result): void
     {
         $this->assertSame(
diff --git a/tests/Unit/DataType/Filter/IntegerFilterTest.php b/tests/Unit/DataType/Filter/IntegerFilterTest.php
@@ -14,6 +14,7 @@
 use InvalidArgumentException;
 use OxidEsales\GraphQL\Base\DataType\Filter\IntegerFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class IntegerFilterTest extends DataTypeTestCase
 {
@@ -110,9 +111,7 @@ public static function invalidBetweens(): array
         ];
     }
 
-    /**
-     * @dataProvider invalidBetweens
-     */
+    #[DataProvider('invalidBetweens')]
     public function testThrowsExceptionOnInvalidBetween(
         array $between
     ): void {
@@ -191,7 +190,7 @@ public function testAddQueryPartWithAlias(): void
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);
     }
 
-    /** @dataProvider matchesDataProvider */
+    #[DataProvider('matchesDataProvider')]
     public function testMatches(
         int $trueCase,
         mixed $falseCase,
diff --git a/tests/Unit/DataType/Filter/StringFilterTest.php b/tests/Unit/DataType/Filter/StringFilterTest.php
@@ -14,6 +14,7 @@
 use InvalidArgumentException;
 use OxidEsales\GraphQL\Base\DataType\Filter\StringFilter;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class StringFilterTest extends DataTypeTestCase
 {
@@ -145,7 +146,7 @@ public function testAddQueryPartWithAlias(): void
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);
     }
 
-    /** @dataProvider matchesDataProvider */
+    #[DataProvider('matchesDataProvider')]
     public function testMatches(
         string $trueCase,
         mixed $falseCase,
diff --git a/tests/Unit/DataType/Pagination/PaginationTest.php b/tests/Unit/DataType/Pagination/PaginationTest.php
@@ -11,6 +11,7 @@
 
 use OxidEsales\GraphQL\Base\DataType\Pagination\Pagination;
 use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class PaginationTest extends DataTypeTestCase
 {
@@ -55,12 +56,7 @@ public function testDefaultNamedConstructor(): void
         );
     }
 
-    /**
-     * @dataProvider paginationDataProvider
-     *
-     * @param mixed $offset
-     * @param mixed $limit
-     */
+    #[DataProvider('paginationDataProvider')]
     public function testInvalidValuesOnPaginationFilter($offset, $limit): void
     {
         $this->expectExceptionMessage('PaginationFilter fields must be positive.');
@@ -80,9 +76,7 @@ public static function paginationDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider addPaginationToQueryProvider
-     */
+    #[DataProvider('addPaginationToQueryProvider')]
     public function testAddPaginationToQuery(int $offset, ?int $limit): void
     {
         $queryBuilder = $this->createQueryBuilderMock();
diff --git a/tests/Unit/Framework/RequestReaderTest.php b/tests/Unit/Framework/RequestReaderTest.php
@@ -17,6 +17,7 @@
 use OxidEsales\GraphQL\Base\Infrastructure\Legacy;
 use OxidEsales\GraphQL\Base\Service\TokenValidator;
 use OxidEsales\GraphQL\Base\Tests\Unit\BaseTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class RequestReaderTest extends BaseTestCase
 {
@@ -51,11 +52,7 @@ public function testGetAuthTokenWithWrongFormattedHeader(): void
         }
     }
 
-    /**
-     * @dataProvider headerNamesDataProvider
-     *
-     * @param mixed $headerName
-     */
+    #[DataProvider('headerNamesDataProvider')]
     public function testGetAuthTokenWithCorrectFormattedHeaderButInvalidJWT($headerName): void
     {
         $requestReader = new RequestReader(
@@ -76,11 +73,7 @@ public static function headerNamesDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider headerNamesDataProvider
-     *
-     * @param mixed $headerName
-     */
+    #[DataProvider('headerNamesDataProvider')]
     public function testGetAuthTokenWithCorrectFormatCallsTokenValidation($headerName): void
     {
         $tokenValidator = $this->createPartialMock(TokenValidator::class, ['validateToken']);
diff --git a/tests/Unit/Service/AuthenticationTest.php b/tests/Unit/Service/AuthenticationTest.php
@@ -19,6 +19,7 @@
 use OxidEsales\GraphQL\Base\Service\JwtConfigurationBuilder;
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
 use OxidEsales\GraphQL\Base\Tests\Unit\BaseTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
@@ -74,9 +75,7 @@ public function testIsLoggedWithNullToken(): void
         $this->assertFalse($authenticationService->isLogged());
     }
 
-    /**
-     * @dataProvider providerValidCredentials
-     */
+    #[DataProvider('providerValidCredentials')]
     public function testIsLoggedWithValidToken(string $username, string $password): void
     {
         $token = $this->createToken($username, $password);
@@ -109,12 +108,7 @@ public static function providerInvalidCredentials(): array
         ];
     }
 
-    /**
-     * @dataProvider providerValidCredentials
-     *
-     * @param mixed $username
-     * @param mixed $password
-     */
+    #[DataProvider('providerValidCredentials')]
     public function testGetUser($username, $password): void
     {
         $token = $this->createToken($username, $password);
@@ -123,12 +117,7 @@ public function testGetUser($username, $password): void
         $this->assertInstanceOf(User::class, $authenticationService->getUser());
     }
 
-    /**
-     * @dataProvider providerInvalidCredentials
-     *
-     * @param mixed $username
-     * @param mixed $password
-     */
+    #[DataProvider('providerInvalidCredentials')]
     public function testGetUserNameWithInvalidCredentials($username, $password): void
     {
         $this->expectException(InvalidLogin::class);
@@ -149,12 +138,7 @@ public function testGetUserNameWithInvalidCredentials($username, $password): voi
         $this->assertEmpty($authenticationService->getUser()->email());
     }
 
-    /**
-     * @dataProvider providerValidCredentials
-     *
-     * @param mixed $username
-     * @param mixed $password
-     */
+    #[DataProvider('providerValidCredentials')]
     public function testGetUserNameWithValidCredentials($username, $password): void
     {
         $token = $this->createToken($username, $password);
@@ -258,9 +242,7 @@ public function testIsUserAnonymous(): void
         $this->assertTrue($authenticationService->getUser()->isAnonymous());
     }
 
-    /**
-     * @dataProvider providerValidCredentials
-     */
+    #[DataProvider('providerValidCredentials')]
     public function testLoggedUserIsNotAnonymous(string $username, string $password): void
     {
         $token = $this->createToken($username, $password);
@@ -276,9 +258,7 @@ public function testIsAnonymousWithNullToken(): void
         $this->assertFalse($authenticationService->getUser()->isAnonymous());
     }
 
-    /**
-     * @dataProvider providerInvalidCredentials
-     */
+    #[DataProvider('providerInvalidCredentials')]
     public function testIsAnonymousWithWrongCredentials(string $username, string $password): void
     {
         $this->expectException(InvalidLogin::class);
diff --git a/tests/Unit/Service/ModuleConfigurationTest.php b/tests/Unit/Service/ModuleConfigurationTest.php
@@ -12,6 +12,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Facade\ModuleSettingServiceInterface;
 use OxidEsales\GraphQL\Base\Exception\MissingSignatureKey;
 use OxidEsales\GraphQL\Base\Service\ModuleConfiguration;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\String\UnicodeString;
 
@@ -50,11 +51,7 @@ public static function shortSignatureKeyProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider shortSignatureKeyProvider
-     *
-     * @param string $signature
-     */
+    #[DataProvider('shortSignatureKeyProvider')]
     public function testGetShortSignatureKey(string $signature): void
     {
         $moduleSettingBridgeMock = $this->getMockBuilder(ModuleSettingServiceInterface::class)->getMock();

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,6 @@ protected function uploadFile(`
`213`	`213`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);`
`214`	`214`
`215`	`215`	`$response = curl_exec($ch);`
`216`		`- curl_close($ch);`
`217`	`216`
`218`	`217`	`return json_decode($response, true) ?: [];`
`219`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use InvalidArgumentException;`
`14`	`14`	`use OxidEsales\GraphQL\Base\DataType\Filter\BoolFilter;`
`15`	`15`	`use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;`
	`16`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`16`	`17`
`17`	`18`	`class BoolFilterTest extends DataTypeTestCase`
`18`	`19`	`{`
`@@ -21,9 +22,7 @@ public function testReturnsTrueOnEmptyInitialization(): void`
`21`	`22`	`$this->assertTrue((new BoolFilter())->equals());`
`22`	`23`	`}`
`23`	`24`
`24`		`- /**`
`25`		`- * @dataProvider boolDataProvider`
`26`		`- */`
	`25`	`+ #[DataProvider('boolDataProvider')]`
`27`	`26`	`public function testReturnsGivenEqualValue(bool $userInput, bool $returnValue): void`
`28`	`27`	`{`
`29`	`28`	`$this->assertSame(`
`@@ -49,9 +48,7 @@ public function testAddQueryPartWithNoFrom(): void`
`49`	`48`	`$filter->addToQuery($queryBuilder, 'db_field');`
`50`	`49`	`}`
`51`	`50`
`52`		`- /**`
`53`		`- * @dataProvider addQueryPartProvider`
`54`		`- */`
	`51`	`+ #[DataProvider('addQueryPartProvider')]`
`55`	`52`	`public function testAddQueryPart(bool $filterValue): void`
`56`	`53`	`{`
`57`	`54`	`$queryBuilder = $this->createQueryBuilderMock();`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use InvalidArgumentException;`
`16`	`16`	`use OxidEsales\GraphQL\Base\DataType\Filter\IDFilter;`
`17`	`17`	`use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;`
	`18`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`18`	`19`	`use TheCodingMachine\GraphQLite\Types\ID;`
`19`	`20`
`20`	`21`	`class IDFilterTest extends DataTypeTestCase`
`@@ -79,7 +80,7 @@ public function testAddQueryPartWithAlias(): void`
`79`	`80`	`$this->assertEquals('db_table_alias.DB_FIELD = :db_field', (string)$where);`
`80`	`81`	`}`
`81`	`82`
`82`		`- /** @dataProvider matchesDataProvider */`
	`83`	`+ #[DataProvider('matchesDataProvider')]`
`83`	`84`	`public function testMatches(mixed $value, IDFilter $filter, bool $result): void`
`84`	`85`	`{`
`85`	`86`	`$this->assertSame(`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use InvalidArgumentException;`
`15`	`15`	`use OxidEsales\GraphQL\Base\DataType\Filter\StringFilter;`
`16`	`16`	`use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;`
	`17`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`17`	`18`
`18`	`19`	`class StringFilterTest extends DataTypeTestCase`
`19`	`20`	`{`
`@@ -145,7 +146,7 @@ public function testAddQueryPartWithAlias(): void`
`145`	`146`	`$this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);`
`146`	`147`	`}`
`147`	`148`
`148`		`- /** @dataProvider matchesDataProvider */`
	`149`	`+ #[DataProvider('matchesDataProvider')]`
`149`	`150`	`public function testMatches(`
`150`	`151`	`string $trueCase,`
`151`	`152`	`mixed $falseCase,`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`use OxidEsales\GraphQL\Base\DataType\Pagination\Pagination;`
`13`	`13`	`use OxidEsales\GraphQL\Base\Tests\Unit\DataType\DataTypeTestCase;`
	`14`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`14`	`15`
`15`	`16`	`class PaginationTest extends DataTypeTestCase`
`16`	`17`	`{`
`@@ -55,12 +56,7 @@ public function testDefaultNamedConstructor(): void`
`55`	`56`	`);`
`56`	`57`	`}`
`57`	`58`
`58`		`- /**`
`59`		`- * @dataProvider paginationDataProvider`
`60`		`- *`
`61`		`- * @param mixed $offset`
`62`		`- * @param mixed $limit`
`63`		`- */`
	`59`	`+ #[DataProvider('paginationDataProvider')]`
`64`	`60`	`public function testInvalidValuesOnPaginationFilter($offset, $limit): void`
`65`	`61`	`{`
`66`	`62`	`$this->expectExceptionMessage('PaginationFilter fields must be positive.');`
`@@ -80,9 +76,7 @@ public static function paginationDataProvider(): array`
`80`	`76`	`];`
`81`	`77`	`}`
`82`	`78`
`83`		`- /**`
`84`		`- * @dataProvider addPaginationToQueryProvider`
`85`		`- */`
	`79`	`+ #[DataProvider('addPaginationToQueryProvider')]`
`86`	`80`	`public function testAddPaginationToQuery(int $offset, ?int $limit): void`
`87`	`81`	`{`
`88`	`82`	`$queryBuilder = $this->createQueryBuilderMock();`