Migrate from PHPUnit annotations to native attributes

module/CLI/test-cli/Command/GenerateApiKeyTest.php

@@ -4,13 +4,14 @@ declare(strict_types=1);
 
 namespace ShlinkioCliTest\Shlink\CLI\Command;
 
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\TestUtils\CliTest\CliTestCase;
 
 class GenerateApiKeyTest extends CliTestCase
 {
-    /** @test */
+    #[Test]
     public function outputIsCorrect(): void
     {
         [$output, $exitCode] = $this->exec([GenerateKeyCommand::NAME]);

module/CLI/test-cli/Command/ListApiKeysTest.php

@@ -5,16 +5,15 @@ declare(strict_types=1);
 namespace ShlinkioCliTest\Shlink\CLI\Command;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\TestUtils\CliTest\CliTestCase;
 
 class ListApiKeysTest extends CliTestCase
 {
-    /**
+    #[Test, DataProvider('provideFlags')]
-     * @test
-     * @dataProvider provideFlags
-     */
     public function generatesExpectedOutput(array $flags, string $expectedOutput): void
     {
         [$output, $exitCode] = $this->exec([ListKeysCommand::NAME, ...$flags]);

module/CLI/test-cli/Command/ListShortUrlsTest.php

@@ -4,15 +4,14 @@ declare(strict_types=1);
 
 namespace ShlinkioCliTest\Shlink\CLI\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
 use Shlinkio\Shlink\TestUtils\CliTest\CliTestCase;
 
 class ListShortUrlsTest extends CliTestCase
 {
-    /**
+    #[Test, DataProvider('provideFlagsAndOutput')]
-     * @test
-     * @dataProvider provideFlagsAndOutput
-     */
     public function generatesExpectedOutput(array $flags, string $expectedOutput): void
     {
         [$output] = $this->exec([ListShortUrlsCommand::NAME, ...$flags], ['no']);

module/CLI/test/ApiKey/RoleResolverTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\ApiKey;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\ApiKey\RoleResolver;
@@ -27,10 +29,7 @@ class RoleResolverTest extends TestCase
         $this->resolver = new RoleResolver($this->domainService, 'default.com');
     }
 
-    /**
+    #[Test, DataProvider('provideRoles')]
-     * @test
-     * @dataProvider provideRoles
-     */
     public function properRolesAreResolvedBasedOnInput(
         callable $createInput,
         array $expectedRoles,
@@ -99,7 +98,7 @@ class RoleResolverTest extends TestCase
         ];
     }
 
-    /** @test */
+    #[Test]
     public function exceptionIsThrownWhenTryingToAddDomainOnlyLinkedToDefaultDomain(): void
     {
         $input = $this->createStub(InputInterface::class);

module/CLI/test/Command/Api/DisableKeyCommandTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
@@ -25,7 +26,7 @@ class DisableKeyCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new DisableKeyCommand($this->apiKeyService));
     }
 
-    /** @test */
+    #[Test]
     public function providedApiKeyIsDisabled(): void
     {
         $apiKey = 'abcd1234';
@@ -39,7 +40,7 @@ class DisableKeyCommandTest extends TestCase
         self::assertStringContainsString('API key "abcd1234" properly disabled', $output);
     }
 
-    /** @test */
+    #[Test]
     public function errorIsReturnedIfServiceThrowsException(): void
     {
         $apiKey = 'abcd1234';

module/CLI/test/Command/Api/GenerateKeyCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\ApiKey\RoleResolverInterface;
@@ -32,7 +33,7 @@ class GenerateKeyCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function noExpirationDateIsDefinedIfNotProvided(): void
     {
         $this->apiKeyService->expects($this->once())->method('create')->with(
@@ -46,7 +47,7 @@ class GenerateKeyCommandTest extends TestCase
         self::assertStringContainsString('Generated API key: ', $output);
     }
 
-    /** @test */
+    #[Test]
     public function expirationDateIsDefinedIfProvided(): void
     {
         $this->apiKeyService->expects($this->once())->method('create')->with(
@@ -59,7 +60,7 @@ class GenerateKeyCommandTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function nameIsDefinedIfProvided(): void
     {
         $this->apiKeyService->expects($this->once())->method('create')->with(

module/CLI/test/Command/Api/ListKeysCommandTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
@@ -29,10 +31,7 @@ class ListKeysCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new ListKeysCommand($this->apiKeyService));
     }
 
-    /**
+    #[Test, DataProvider('provideKeysAndOutputs')]
-     * @test
-     * @dataProvider provideKeysAndOutputs
-     */
     public function returnsExpectedOutput(array $keys, bool $enabledOnly, string $expected): void
     {
         $this->apiKeyService->expects($this->once())->method('listKeys')->with($enabledOnly)->willReturn($keys);

module/CLI/test/Command/Db/CreateDatabaseCommandTest.php

@@ -9,6 +9,8 @@ use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Db\CreateDatabaseCommand;
@@ -63,7 +65,7 @@ class CreateDatabaseCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function successMessageIsPrintedIfDatabaseAlreadyExists(): void
     {
         $shlinkDatabase = 'shlink_database';
@@ -81,7 +83,7 @@ class CreateDatabaseCommandTest extends TestCase
         self::assertStringContainsString('Database already exists. Run "db:migrate" command', $output);
     }
 
-    /** @test */
+    #[Test]
     public function databaseIsCreatedIfItDoesNotExist(): void
     {
         $shlinkDatabase = 'shlink_database';
@@ -96,10 +98,7 @@ class CreateDatabaseCommandTest extends TestCase
         $this->commandTester->execute([]);
     }
 
-    /**
+    #[Test, DataProvider('provideEmptyDatabase')]
-     * @test
-     * @dataProvider provideEmptyDatabase
-     */
     public function tablesAreCreatedIfDatabaseIsEmpty(array $tables): void
     {
         $shlinkDatabase = 'shlink_database';
@@ -130,7 +129,7 @@ class CreateDatabaseCommandTest extends TestCase
         yield 'migrations table' => [[MIGRATIONS_TABLE]];
     }
 
-    /** @test */
+    #[Test]
     public function databaseCheckIsSkippedForSqlite(): void
     {
         $this->driver->method('getDatabasePlatform')->willReturn($this->createMock(SqlitePlatform::class));

module/CLI/test/Command/Db/MigrateDatabaseCommandTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Db;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Db\MigrateDatabaseCommand;
@@ -38,7 +39,7 @@ class MigrateDatabaseCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function migrationsCommandIsRunWithProperVerbosity(): void
     {
         $this->processHelper->expects($this->once())->method('run')->with($this->isInstanceOf(OutputInterface::class), [

module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Domain;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Domain\DomainRedirectsCommand;
@@ -30,10 +32,7 @@ class DomainRedirectsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new DomainRedirectsCommand($this->domainService));
     }
 
-    /**
+    #[Test, DataProvider('provideDomains')]
-     * @test
-     * @dataProvider provideDomains
-     */
     public function onlyPlainQuestionsAreAskedForNewDomainsAndDomainsWithNoRedirects(?Domain $domain): void
     {
         $domainAuthority = 'my-domain.com';
@@ -66,7 +65,7 @@ class DomainRedirectsCommandTest extends TestCase
         yield 'domain without redirects' => [Domain::withAuthority('')];
     }
 
-    /** @test */
+    #[Test]
     public function offersNewOptionsForDomainsWithExistingRedirects(): void
     {
         $domainAuthority = 'example.com';
@@ -95,7 +94,7 @@ class DomainRedirectsCommandTest extends TestCase
         self::assertEquals(3, substr_count($output, 'Remove redirect'));
     }
 
-    /** @test */
+    #[Test]
     public function authorityIsRequestedWhenNotProvidedAndNoOtherDomainsExist(): void
     {
         $domainAuthority = 'example.com';
@@ -117,7 +116,7 @@ class DomainRedirectsCommandTest extends TestCase
         self::assertStringContainsString('Domain authority for which you want to set specific redirects', $output);
     }
 
-    /** @test */
+    #[Test]
     public function oneOfTheExistingDomainsCanBeSelected(): void
     {
         $domainAuthority = 'existing-two.com';
@@ -146,7 +145,7 @@ class DomainRedirectsCommandTest extends TestCase
         self::assertStringContainsString($domainAuthority, $output);
     }
 
-    /** @test */
+    #[Test]
     public function aNewDomainCanBeCreatedEvenIfOthersAlreadyExist(): void
     {
         $domainAuthority = 'new-domain.com';

module/CLI/test/Command/Domain/GetDomainVisitsCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Domain;
 
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Domain\GetDomainVisitsCommand;
@@ -37,7 +38,7 @@ class GetDomainVisitsCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();

module/CLI/test/Command/Domain/ListDomainsCommandTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Domain;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Domain\ListDomainsCommand;
@@ -29,10 +31,7 @@ class ListDomainsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new ListDomainsCommand($this->domainService));
     }
 
-    /**
+    #[Test, DataProvider('provideInputsAndOutputs')]
-     * @test
-     * @dataProvider provideInputsAndOutputs
-     */
     public function allDomainsAreProperlyPrinted(array $input, string $expectedOutput): void
     {
         $bazDomain = Domain::withAuthority('baz.com');

module/CLI/test/Command/ShortUrl/CreateShortUrlCommandTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\CreateShortUrlCommand;
@@ -45,7 +47,7 @@ class CreateShortUrlCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function properShortCodeIsCreatedIfLongUrlIsCorrect(): void
     {
         $shortUrl = ShortUrl::createFake();
@@ -64,7 +66,7 @@ class CreateShortUrlCommandTest extends TestCase
         self::assertStringContainsString('stringified_short_url', $output);
     }
 
-    /** @test */
+    #[Test]
     public function exceptionWhileParsingLongUrlOutputsError(): void
     {
         $url = 'http://domain.com/invalid';
@@ -80,7 +82,7 @@ class CreateShortUrlCommandTest extends TestCase
         self::assertStringContainsString('Provided URL http://domain.com/invalid is invalid.', $output);
     }
 
-    /** @test */
+    #[Test]
     public function providingNonUniqueSlugOutputsError(): void
     {
         $this->urlShortener->expects($this->once())->method('shorten')->withAnyParameters()->willThrowException(
@@ -95,7 +97,7 @@ class CreateShortUrlCommandTest extends TestCase
         self::assertStringContainsString('Provided slug "my-slug" is already in use', $output);
     }
 
-    /** @test */
+    #[Test]
     public function properlyProcessesProvidedTags(): void
     {
         $shortUrl = ShortUrl::createFake();
@@ -119,10 +121,7 @@ class CreateShortUrlCommandTest extends TestCase
         self::assertStringContainsString('stringified_short_url', $output);
     }
 
-    /**
+    #[Test, DataProvider('provideDomains')]
-     * @test
-     * @dataProvider provideDomains
-     */
     public function properlyProcessesProvidedDomain(array $input, ?string $expectedDomain): void
     {
         $this->urlShortener->expects($this->once())->method('shorten')->with(
@@ -147,10 +146,7 @@ class CreateShortUrlCommandTest extends TestCase
         yield 'default domain' => [['--domain' => self::DEFAULT_DOMAIN], null];
     }
 
-    /**
+    #[Test, DataProvider('provideFlags')]
-     * @test
-     * @dataProvider provideFlags
-     */
     public function urlValidationHasExpectedValueBasedOnProvidedFlags(array $options, ?bool $expectedValidateUrl): void
     {
         $shortUrl = ShortUrl::createFake();

module/CLI/test/Command/ShortUrl/DeleteShortUrlCommandTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\DeleteShortUrlCommand;
@@ -30,7 +32,7 @@ class DeleteShortUrlCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new DeleteShortUrlCommand($this->service));
     }
 
-    /** @test */
+    #[Test]
     public function successMessageIsPrintedIfUrlIsProperlyDeleted(): void
     {
         $shortCode = 'abc123';
@@ -48,7 +50,7 @@ class DeleteShortUrlCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function invalidShortCodePrintsMessage(): void
     {
         $shortCode = 'abc123';
@@ -64,10 +66,7 @@ class DeleteShortUrlCommandTest extends TestCase
         self::assertStringContainsString(sprintf('No URL found with short code "%s"', $shortCode), $output);
     }
 
-    /**
+    #[Test, DataProvider('provideRetryDeleteAnswers')]
-     * @test
-     * @dataProvider provideRetryDeleteAnswers
-     */
     public function deleteIsRetriedWhenThresholdIsReachedAndQuestionIsAccepted(
         array $retryAnswer,
         int $expectedDeleteCalls,
@@ -105,7 +104,7 @@ class DeleteShortUrlCommandTest extends TestCase
         yield 'answering default to retry' => [[PHP_EOL], 1, 'Short URL was not deleted.'];
     }
 
-    /** @test */
+    #[Test]
     public function deleteIsNotRetriedWhenThresholdIsReachedAndQuestionIsDeclined(): void
     {
         $shortCode = 'abc123';

module/CLI/test/Command/ShortUrl/GetShortUrlVisitsCommandTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use Cake\Chronos\Chronos;
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GetShortUrlVisitsCommand;
@@ -39,7 +40,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function noDateFlagsTriesToListWithoutDateRange(): void
     {
         $shortCode = 'abc123';
@@ -51,7 +52,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
         $this->commandTester->execute(['shortCode' => $shortCode]);
     }
 
-    /** @test */
+    #[Test]
     public function providingDateFlagsTheListGetsFiltered(): void
     {
         $shortCode = 'abc123';
@@ -69,7 +70,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function providingInvalidDatesPrintsWarning(): void
     {
         $shortCode = 'abc123';
@@ -91,7 +92,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function outputIsProperlyGenerated(): void
     {
         $visit = Visit::forValidShortUrl(ShortUrl::createFake(), new Visitor('bar', 'foo', '', ''))->locate(

module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use Cake\Chronos\Chronos;
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
@@ -41,7 +43,7 @@ class ListShortUrlsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command);
     }
 
-    /** @test */
+    #[Test]
     public function loadingMorePagesCallsListMoreTimes(): void
     {
         // The paginator will return more than one page
@@ -63,7 +65,7 @@ class ListShortUrlsCommandTest extends TestCase
         self::assertStringNotContainsString('Continue with page 5?', $output);
     }
 
-    /** @test */
+    #[Test]
     public function havingMorePagesButAnsweringNoCallsListJustOnce(): void
     {
         // The paginator will return more than one page
@@ -89,7 +91,7 @@ class ListShortUrlsCommandTest extends TestCase
         self::assertStringNotContainsString('Continue with page 3?', $output);
     }
 
-    /** @test */
+    #[Test]
     public function passingPageWillMakeListStartOnThatPage(): void
     {
         $page = 5;
@@ -101,10 +103,7 @@ class ListShortUrlsCommandTest extends TestCase
         $this->commandTester->execute(['--page' => $page]);
     }
 
-    /**
+    #[Test, DataProvider('provideOptionalFlags')]
-     * @test
-     * @dataProvider provideOptionalFlags
-     */
     public function provideOptionalFlagsMakesNewColumnsToBeIncluded(
         array $input,
         array $expectedContents,
@@ -174,10 +173,7 @@ class ListShortUrlsCommandTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideArgs')]
-     * @test
-     * @dataProvider provideArgs
-     */
     public function serviceIsInvokedWithProvidedArgs(
         array $commandArgs,
         ?int $page,
@@ -241,10 +237,7 @@ class ListShortUrlsCommandTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideOrderBy')]
-     * @test
-     * @dataProvider provideOrderBy
-     */
     public function orderByIsProperlyComputed(array $commandArgs, ?string $expectedOrderBy): void
     {
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(ShortUrlsParams::fromRawData([
@@ -264,7 +257,7 @@ class ListShortUrlsCommandTest extends TestCase
         yield [['--order-by' => 'title-DESC'], 'title-DESC'];
     }
 
-    /** @test */
+    #[Test]
     public function requestingAllElementsWillSetItemsPerPage(): void
     {
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(ShortUrlsParams::fromRawData([

module/CLI/test/Command/ShortUrl/ResolveUrlCommandTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ResolveUrlCommand;
@@ -31,7 +32,7 @@ class ResolveUrlCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new ResolveUrlCommand($this->urlResolver));
     }
 
-    /** @test */
+    #[Test]
     public function correctShortCodeResolvesUrl(): void
     {
         $shortCode = 'abc123';
@@ -46,7 +47,7 @@ class ResolveUrlCommandTest extends TestCase
         self::assertEquals('Long URL: ' . $expectedUrl . PHP_EOL, $output);
     }
 
-    /** @test */
+    #[Test]
     public function incorrectShortCodeOutputsErrorMessage(): void
     {
         $identifier = ShortUrlIdentifier::fromShortCodeAndDomain('abc123');

module/CLI/test/Command/Tag/DeleteTagsCommandTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Tag\DeleteTagsCommand;
@@ -24,7 +25,7 @@ class DeleteTagsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new DeleteTagsCommand($this->tagService));
     }
 
-    /** @test */
+    #[Test]
     public function errorIsReturnedWhenNoTagsAreProvided(): void
     {
         $this->commandTester->execute([]);
@@ -33,7 +34,7 @@ class DeleteTagsCommandTest extends TestCase
         self::assertStringContainsString('You have to provide at least one tag name', $output);
     }
 
-    /** @test */
+    #[Test]
     public function serviceIsInvokedOnSuccess(): void
     {
         $tagNames = ['foo', 'bar'];

module/CLI/test/Command/Tag/GetTagVisitsCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Tag\GetTagVisitsCommand;
@@ -37,7 +38,7 @@ class GetTagVisitsCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();

module/CLI/test/Command/Tag/ListTagsCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Tag\ListTagsCommand;
@@ -27,7 +28,7 @@ class ListTagsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new ListTagsCommand($this->tagService));
     }
 
-    /** @test */
+    #[Test]
     public function noTagsPrintsEmptyMessage(): void
     {
         $this->tagService->expects($this->once())->method('tagsInfo')->withAnyParameters()->willReturn(
@@ -40,7 +41,7 @@ class ListTagsCommandTest extends TestCase
         self::assertStringContainsString('No tags found', $output);
     }
 
-    /** @test */
+    #[Test]
     public function listOfTagsIsPrinted(): void
     {
         $this->tagService->expects($this->once())->method('tagsInfo')->withAnyParameters()->willReturn(

module/CLI/test/Command/Tag/RenameTagCommandTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Tag\RenameTagCommand;
@@ -27,7 +28,7 @@ class RenameTagCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new RenameTagCommand($this->tagService));
     }
 
-    /** @test */
+    #[Test]
     public function errorIsPrintedIfExceptionIsThrown(): void
     {
         $oldName = 'foo';
@@ -45,7 +46,7 @@ class RenameTagCommandTest extends TestCase
         self::assertStringContainsString('Tag with name "foo" could not be found', $output);
     }
 
-    /** @test */
+    #[Test]
     public function successIsPrintedIfNoErrorOccurs(): void
     {
         $oldName = 'foo';

module/CLI/test/Command/Visit/DownloadGeoLiteDbCommandTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Visit\DownloadGeoLiteDbCommand;
@@ -29,10 +31,7 @@ class DownloadGeoLiteDbCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new DownloadGeoLiteDbCommand($this->dbUpdater));
     }
 
-    /**
+    #[Test, DataProvider('provideFailureParams')]
-     * @test
-     * @dataProvider provideFailureParams
-     */
     public function showsProperMessageWhenGeoLiteUpdateFails(
         bool $olderDbExists,
         string $expectedMessage,
@@ -75,10 +74,7 @@ class DownloadGeoLiteDbCommandTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideSuccessParams')]
-     * @test
-     * @dataProvider provideSuccessParams
-     */
     public function printsExpectedMessageWhenNoErrorOccurs(callable $checkUpdateBehavior, string $expectedMessage): void
     {
         $this->dbUpdater->expects($this->once())->method('checkDbUpdate')->withAnyParameters()->willReturnCallback(

module/CLI/test/Command/Visit/GetNonOrphanVisitsCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Visit\GetNonOrphanVisitsCommand;
@@ -37,7 +38,7 @@ class GetNonOrphanVisitsCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();

module/CLI/test/Command/Visit/GetOrphanVisitsCommandTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Visit\GetOrphanVisitsCommand;
@@ -30,7 +31,7 @@ class GetOrphanVisitsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand(new GetOrphanVisitsCommand($this->visitsHelper));
     }
 
-    /** @test */
+    #[Test]
     public function outputIsProperlyGenerated(): void
     {
         $visit = Visit::forBasePath(new Visitor('bar', 'foo', '', ''))->locate(

module/CLI/test/Command/Visit/LocateVisitsCommandTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Visit\DownloadGeoLiteDbCommand;
@@ -55,10 +57,7 @@ class LocateVisitsCommandTest extends TestCase
         $this->commandTester = $this->testerForCommand($command, $this->downloadDbCommand);
     }
 
-    /**
+    #[Test, DataProvider('provideArgs')]
-     * @test
-     * @dataProvider provideArgs
-     */
     public function expectedSetOfVisitsIsProcessedBasedOnArgs(
         int $expectedUnlocatedCalls,
         int $expectedEmptyCalls,
@@ -107,10 +106,7 @@ class LocateVisitsCommandTest extends TestCase
         yield 'all' => [0, 0, 1, true, ['--retry' => true, '--all' => true]];
     }
 
-    /**
+    #[Test, DataProvider('provideIgnoredAddresses')]
-     * @test
-     * @dataProvider provideIgnoredAddresses
-     */
     public function localhostAndEmptyAddressesAreIgnored(IpCannotBeLocatedException $e, string $message): void
     {
         $visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::emptyInstance());
@@ -137,7 +133,7 @@ class LocateVisitsCommandTest extends TestCase
         yield 'localhost address' => [IpCannotBeLocatedException::forLocalhost(), 'Ignored localhost address'];
     }
 
-    /** @test */
+    #[Test]
     public function errorWhileLocatingIpIsDisplayed(): void
     {
         $visit = Visit::forValidShortUrl(ShortUrl::createFake(), new Visitor('', '', '1.2.3.4', ''));
@@ -168,7 +164,7 @@ class LocateVisitsCommandTest extends TestCase
         };
     }
 
-    /** @test */
+    #[Test]
     public function noActionIsPerformedIfLockIsAcquired(): void
     {
         $this->lock->method('acquire')->with($this->isFalse())->willReturn(false);
@@ -186,7 +182,7 @@ class LocateVisitsCommandTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function showsProperMessageWhenGeoLiteUpdateFails(): void
     {
         $this->lock->method('acquire')->with($this->isFalse())->willReturn(true);
@@ -199,7 +195,7 @@ class LocateVisitsCommandTest extends TestCase
         self::assertStringContainsString('It is not possible to locate visits without a GeoLite2 db file.', $output);
     }
 
-    /** @test */
+    #[Test]
     public function providingAllFlagOnItsOwnDisplaysNotice(): void
     {
         $this->lock->method('acquire')->with($this->isFalse())->willReturn(true);
@@ -211,10 +207,7 @@ class LocateVisitsCommandTest extends TestCase
         self::assertStringContainsString('The --all flag has no effect on its own', $output);
     }
 
-    /**
+    #[Test, DataProvider('provideAbortInputs')]
-     * @test
-     * @dataProvider provideAbortInputs
-     */
     public function processingAllCancelsCommandIfUserDoesNotActivelyAgreeToConfirmation(array $inputs): void
     {
         $this->downloadDbCommand->method('run')->withAnyParameters()->willReturn(ExitCodes::EXIT_SUCCESS);

module/CLI/test/ConfigProviderTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI;
 
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\ConfigProvider;
 
@@ -17,7 +18,7 @@ class ConfigProviderTest extends TestCase
         $this->configProvider = new ConfigProvider();
     }
 
-    /** @test */
+    #[Test]
     public function configIsProperlyReturned(): void
     {
         $config = ($this->configProvider)();

module/CLI/test/Exception/GeolocationDbUpdateFailedExceptionTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Exception;
 
 use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
@@ -12,10 +14,7 @@ use Throwable;
 
 class GeolocationDbUpdateFailedExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('providePrev')]
-     * @test
-     * @dataProvider providePrev
-     */
     public function withOlderDbBuildsException(?Throwable $prev): void
     {
         $e = GeolocationDbUpdateFailedException::withOlderDb($prev);
@@ -29,10 +28,7 @@ class GeolocationDbUpdateFailedExceptionTest extends TestCase
         self::assertEquals($prev, $e->getPrevious());
     }
 
-    /**
+    #[Test, DataProvider('providePrev')]
-     * @test
-     * @dataProvider providePrev
-     */
     public function withoutOlderDbBuildsException(?Throwable $prev): void
     {
         $e = GeolocationDbUpdateFailedException::withoutOlderDb($prev);
@@ -53,7 +49,7 @@ class GeolocationDbUpdateFailedExceptionTest extends TestCase
         yield 'Exception' => [new Exception('prev')];
     }
 
-    /** @test */
+    #[Test]
     public function withInvalidEpochInOldDbBuildsException(): void
     {
         $e = GeolocationDbUpdateFailedException::withInvalidEpochInOldDb('foobar');

module/CLI/test/Exception/InvalidRoleConfigExceptionTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Exception;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Exception\InvalidRoleConfigException;
 use Shlinkio\Shlink\Rest\ApiKey\Role;
@@ -12,7 +13,7 @@ use function sprintf;
 
 class InvalidRoleConfigExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function forDomainOnlyWithDefaultDomainGeneratesExpectedException(): void
     {
         $e = InvalidRoleConfigException::forDomainOnlyWithDefaultDomain();

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Factory;
 
 use Laminas\ServiceManager\ServiceManager;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
@@ -21,7 +22,7 @@ class ApplicationFactoryTest extends TestCase
         $this->factory = new ApplicationFactory();
     }
 
-    /** @test */
+    #[Test]
     public function allCommandsWhichAreServicesAreAdded(): void
     {
         $sm = $this->createServiceManager([

module/CLI/test/GeoLite/GeolocationDbUpdaterTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\CLI\GeoLite;
 use Cake\Chronos\Chronos;
 use GeoIp2\Database\Reader;
 use MaxMind\Db\Reader\Metadata;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
@@ -35,7 +37,7 @@ class GeolocationDbUpdaterTest extends TestCase
         $this->lock->method('acquire')->with($this->isTrue())->willReturn(true);
     }
 
-    /** @test */
+    #[Test]
     public function exceptionIsThrownWhenOlderDbDoesNotExistAndDownloadFails(): void
     {
         $mustBeUpdated = fn () => self::assertTrue(true);
@@ -58,10 +60,7 @@ class GeolocationDbUpdaterTest extends TestCase
         }
     }
 
-    /**
+    #[Test, DataProvider('provideBigDays')]
-     * @test
-     * @dataProvider provideBigDays
-     */
     public function exceptionIsThrownWhenOlderDbIsTooOldAndDownloadFails(int $days): void
     {
         $prev = new DbUpdateException('');
@@ -92,10 +91,7 @@ class GeolocationDbUpdaterTest extends TestCase
         yield [100];
     }
 
-    /**
+    #[Test, DataProvider('provideSmallDays')]
-     * @test
-     * @dataProvider provideSmallDays
-     */
     public function databaseIsNotUpdatedIfItIsNewEnough(string|int $buildEpoch): void
     {
         $this->dbUpdater->expects($this->once())->method('databaseFileExists')->willReturn(true);
@@ -119,7 +115,7 @@ class GeolocationDbUpdaterTest extends TestCase
         return map(range(0, 34), $generateParamsWithTimestamp);
     }
 
-    /** @test */
+    #[Test]
     public function exceptionIsThrownWhenCheckingExistingDatabaseWithInvalidBuildEpoch(): void
     {
         $this->dbUpdater->expects($this->once())->method('databaseFileExists')->willReturn(true);
@@ -151,10 +147,7 @@ class GeolocationDbUpdaterTest extends TestCase
         ]);
     }
 
-    /**
+    #[Test, DataProvider('provideTrackingOptions')]
-     * @test
-     * @dataProvider provideTrackingOptions
-     */
     public function downloadDbIsSkippedIfTrackingIsDisabled(TrackingOptions $options): void
     {
         $result = $this->geolocationDbUpdater($options)->checkDbUpdate();

module/CLI/test/Util/ProcessRunnerTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Util;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Util\ProcessRunner;
@@ -34,7 +35,7 @@ class ProcessRunnerTest extends TestCase
         $this->runner = new ProcessRunner($this->helper, fn () => $this->process);
     }
 
-    /** @test */
+    #[Test]
     public function noMessagesAreWrittenWhenOutputIsNotVerbose(): void
     {
         $this->output->expects($this->exactly(2))->method('isVeryVerbose')->with()->willReturn(false);
@@ -50,7 +51,7 @@ class ProcessRunnerTest extends TestCase
         $this->runner->run($this->output, []);
     }
 
-    /** @test */
+    #[Test]
     public function someMessagesAreWrittenWhenOutputIsVerbose(): void
     {
         $this->output->expects($this->exactly(2))->method('isVeryVerbose')->with()->willReturn(true);
@@ -66,7 +67,7 @@ class ProcessRunnerTest extends TestCase
         $this->runner->run($this->output, []);
     }
 
-    /** @test */
+    #[Test]
     public function wrapsCallbackWhenOutputIsDebug(): void
     {
         $this->output->expects($this->exactly(2))->method('isVeryVerbose')->with()->willReturn(false);

module/CLI/test/Util/ShlinkTableTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Util;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
@@ -23,7 +24,7 @@ class ShlinkTableTest extends TestCase
         $this->shlinkTable = ShlinkTable::fromBaseTable($this->baseTable);
     }
 
-    /** @test */
+    #[Test]
     public function renderMakesTableToBeRenderedWithProvidedInfo(): void
     {
         $headers = [];
@@ -43,7 +44,7 @@ class ShlinkTableTest extends TestCase
         $this->shlinkTable->render($headers, $rows, $footerTitle, $headerTitle);
     }
 
-    /** @test */
+    #[Test]
     public function newTableIsCreatedForFactoryMethod(): void
     {
         $instance = ShlinkTable::default($this->createMock(OutputInterface::class));

module/Core/test-api/Action/RedirectTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioApiTest\Shlink\Core\Action;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\TestUtils\ApiTest\ApiTestCase;
 
 use const ShlinkioTest\Shlink\ANDROID_USER_AGENT;
@@ -12,10 +14,7 @@ use const ShlinkioTest\Shlink\IOS_USER_AGENT;
 
 class RedirectTest extends ApiTestCase
 {
-    /**
+    #[Test, DataProvider('provideUserAgents')]
-     * @test
-     * @dataProvider provideUserAgents
-     */
     public function properRedirectHappensBasedOnUserAgent(?string $userAgent, string $expectedRedirect): void
     {
         $response = $this->callShortUrl('def456', $userAgent);

module/Core/test-db/Domain/Repository/DomainRepositoryTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioDbTest\Shlink\Core\Domain\Repository;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Domain\Repository\DomainRepository;
@@ -26,7 +27,7 @@ class DomainRepositoryTest extends DatabaseTestCase
         $this->repo = $this->getEntityManager()->getRepository(Domain::class);
     }
 
-    /** @test */
+    #[Test]
     public function expectedDomainsAreFoundWhenNoApiKeyIsInvolved(): void
     {
         $fooDomain = Domain::withAuthority('foo.com');
@@ -61,7 +62,7 @@ class DomainRepositoryTest extends DatabaseTestCase
         self::assertTrue($this->repo->domainExists('detached.com'));
     }
 
-    /** @test */
+    #[Test]
     public function expectedDomainsAreFoundWhenApiKeyIsProvided(): void
     {
         $authorApiKey = ApiKey::fromMeta(ApiKeyMeta::withRoles(RoleDefinition::forAuthoredShortUrls()));

module/Core/test-db/ShortUrl/Repository/CrawlableShortCodesQueryTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioDbTest\Shlink\Core\ShortUrl\Repository;
 
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Repository\CrawlableShortCodesQuery;
@@ -19,7 +20,7 @@ class CrawlableShortCodesQueryTest extends DatabaseTestCase
         $this->query = new CrawlableShortCodesQuery($em, $em->getClassMetadata(ShortUrl::class));
     }
 
-    /** @test */
+    #[Test]
     public function invokingQueryReturnsExpectedResult(): void
     {
         $createShortUrl = fn (bool $crawlable) => ShortUrl::create(

module/Core/test-db/ShortUrl/Repository/ShortUrlListRepositoryTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioDbTest\Shlink\Core\ShortUrl\Repository;
 
 use Cake\Chronos\Chronos;
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\Test;
 use ReflectionObject;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Model\Ordering;
@@ -37,7 +38,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         $this->relationResolver = new PersistenceShortUrlRelationResolver($em);
     }
 
-    /** @test */
+    #[Test]
     public function countListReturnsProperNumberOfResults(): void
     {
         $count = 5;
@@ -49,7 +50,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         self::assertEquals($count, $this->repo->countList(new ShortUrlsCountFiltering()));
     }
 
-    /** @test */
+    #[Test]
     public function findListProperlyFiltersResult(): void
     {
         $foo = ShortUrl::create(
@@ -143,7 +144,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findListProperlyMapsFieldNamesToColumnNamesWhenOrdering(): void
     {
         $urls = ['a', 'z', 'c', 'b'];
@@ -164,7 +165,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         self::assertEquals('z', $result[3]->getLongUrl());
     }
 
-    /** @test */
+    #[Test]
     public function findListReturnsOnlyThoseWithMatchingTags(): void
     {
         $shortUrl1 = ShortUrl::create(ShortUrlCreation::fromRawData([
@@ -273,7 +274,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findListReturnsOnlyThoseWithMatchingDomains(): void
     {
         $shortUrl1 = ShortUrl::create(ShortUrlCreation::fromRawData([
@@ -309,7 +310,7 @@ class ShortUrlListRepositoryTest extends DatabaseTestCase
         self::assertCount(0, $this->repo->findList($buildFiltering('no results')));
     }
 
-    /** @test */
+    #[Test]
     public function findListReturnsOnlyThoseWithoutExcludedUrls(): void
     {
         $shortUrl1 = ShortUrl::create(ShortUrlCreation::fromRawData([

module/Core/test-db/ShortUrl/Repository/ShortUrlRepositoryTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioDbTest\Shlink\Core\ShortUrl\Repository;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
@@ -30,7 +31,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         $this->relationResolver = new PersistenceShortUrlRelationResolver($this->getEntityManager());
     }
 
-    /** @test */
+    #[Test]
     public function findOneWithDomainFallbackReturnsProperData(): void
     {
         $regularOne = ShortUrl::create(ShortUrlCreation::fromRawData(['customSlug' => 'Foo', 'longUrl' => 'foo']));
@@ -97,7 +98,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function shortCodeIsInUseLooksForShortUrlInProperSetOfTables(): void
     {
         $shortUrlWithoutDomain = ShortUrl::create(
@@ -126,7 +127,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findOneLooksForShortUrlInProperSetOfTables(): void
     {
         $shortUrlWithoutDomain = ShortUrl::create(
@@ -153,7 +154,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findOneMatchingReturnsNullForNonExistingShortUrls(): void
     {
         self::assertNull($this->repo->findOneMatching(ShortUrlCreation::fromRawData(['longUrl' => 'foobar'])));
@@ -168,7 +169,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         ])));
     }
 
-    /** @test */
+    #[Test]
     public function findOneMatchingAppliesProperConditions(): void
     {
         $start = Chronos::parse('2020-03-05 20:18:30');
@@ -237,7 +238,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function findOneMatchingReturnsOldestOneWhenThereAreMultipleMatches(): void
     {
         $start = Chronos::parse('2020-03-05 20:18:30');
@@ -265,7 +266,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         self::assertNotSame($shortUrl3, $result);
     }
 
-    /** @test */
+    #[Test]
     public function findOneMatchingAppliesProvidedApiKeyConditions(): void
     {
         $start = Chronos::parse('2020-03-05 20:18:30');
@@ -391,7 +392,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function importedShortUrlsAreFoundWhenExpected(): void
     {
         $buildImported = static fn (string $shortCode, ?String $domain = null) =>

module/Core/test-db/Tag/Paginator/Adapter/TagsPaginatorAdapterTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioDbTest\Shlink\Core\Tag\Paginator\Adapter;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\Tag\Entity\Tag;
 use Shlinkio\Shlink\Core\Tag\Model\TagsParams;
 use Shlinkio\Shlink\Core\Tag\Paginator\Adapter\TagsPaginatorAdapter;
@@ -24,9 +26,8 @@ class TagsPaginatorAdapterTest extends DatabaseTestCase
     /**
      * @param int<0, max> $offset
      * @param int<0, max> $length
-     * @test
-     * @dataProvider provideFilters
      */
+    #[Test, DataProvider('provideFilters')]
     public function expectedListOfTagsIsReturned(
         ?string $searchTerm,
         ?string $orderBy,

module/Core/test-db/Tag/Repository/TagRepositoryTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioDbTest\Shlink\Core\Tag\Repository;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Model\Ordering;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
@@ -34,13 +36,13 @@ class TagRepositoryTest extends DatabaseTestCase
         $this->relationResolver = new PersistenceShortUrlRelationResolver($this->getEntityManager());
     }
 
-    /** @test */
+    #[Test]
     public function deleteByNameDoesNothingWhenEmptyListIsProvided(): void
     {
         self::assertEquals(0, $this->repo->deleteByName([]));
     }
 
-    /** @test */
+    #[Test]
     public function allTagsWhichMatchNameAreDeleted(): void
     {
         $names = ['foo', 'bar', 'baz'];
@@ -54,10 +56,7 @@ class TagRepositoryTest extends DatabaseTestCase
         self::assertEquals(2, $this->repo->deleteByName($toDelete));
     }
 
-    /**
+    #[Test, DataProvider('provideFilters')]
-     * @test
-     * @dataProvider provideFilters
-     */
     public function properTagsInfoIsReturned(?TagsListFiltering $filtering, array $expectedList): void
     {
         $names = ['foo', 'bar', 'baz', 'another'];
@@ -221,7 +220,7 @@ class TagRepositoryTest extends DatabaseTestCase
         ]];
     }
 
-    /** @test */
+    #[Test]
     public function tagExistsReturnsExpectedResultBasedOnApiKey(): void
     {
         $domain = Domain::withAuthority('foo.com');

module/Core/test-db/Visit/Repository/VisitLocationRepositoryTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioDbTest\Shlink\Core\Visit\Repository;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Visit\Entity\Visit;
 use Shlinkio\Shlink\Core\Visit\Entity\VisitLocation;
@@ -25,10 +27,7 @@ class VisitLocationRepositoryTest extends DatabaseTestCase
         $this->repo = new VisitLocationRepository($em, $em->getClassMetadata(Visit::class));
     }
 
-    /**
+    #[Test, DataProvider('provideBlockSize')]
-     * @test
-     * @dataProvider provideBlockSize
-     */
     public function findVisitsReturnsProperVisits(int $blockSize): void
     {
         $shortUrl = ShortUrl::createFake();

module/Core/test-db/Visit/Repository/VisitRepositoryTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioDbTest\Shlink\Core\Visit\Repository;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\Test;
 use ReflectionObject;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
@@ -40,7 +41,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         $this->relationResolver = new PersistenceShortUrlRelationResolver($this->getEntityManager());
     }
 
-    /** @test */
+    #[Test]
     public function findVisitsByShortCodeReturnsProperData(): void
     {
         [$shortCode, $domain] = $this->createShortUrlsAndVisits();
@@ -89,7 +90,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function countVisitsByShortCodeReturnsProperData(): void
     {
         [$shortCode, $domain] = $this->createShortUrlsAndVisits();
@@ -126,7 +127,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findVisitsByShortCodeReturnsProperDataWhenUsingAPiKeys(): void
     {
         $adminApiKey = ApiKey::create();
@@ -158,7 +159,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findVisitsByTagReturnsProperData(): void
     {
         $foo = 'foo';
@@ -183,7 +184,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         )));
     }
 
-    /** @test */
+    #[Test]
     public function countVisitsByTagReturnsProperData(): void
     {
         $foo = 'foo';
@@ -205,7 +206,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         )));
     }
 
-    /** @test */
+    #[Test]
     public function findVisitsByDomainReturnsProperData(): void
     {
         $this->createShortUrlsAndVisits('s.test');
@@ -229,7 +230,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         )));
     }
 
-    /** @test */
+    #[Test]
     public function countVisitsByDomainReturnsProperData(): void
     {
         $this->createShortUrlsAndVisits('s.test');
@@ -253,7 +254,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         )));
     }
 
-    /** @test */
+    #[Test]
     public function countVisitsReturnsExpectedResultBasedOnApiKey(): void
     {
         $domain = Domain::withAuthority('foo.com');
@@ -316,7 +317,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         self::assertEquals(3, $this->repo->countOrphanVisits(new VisitsCountFiltering(null, true)));
     }
 
-    /** @test */
+    #[Test]
     public function findOrphanVisitsReturnsExpectedResult(): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData(['longUrl' => 'longUrl']));
@@ -365,7 +366,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         )));
     }
 
-    /** @test */
+    #[Test]
     public function countOrphanVisitsReturnsExpectedResult(): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData(['longUrl' => 'longUrl']));
@@ -402,7 +403,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         ));
     }
 
-    /** @test */
+    #[Test]
     public function findNonOrphanVisitsReturnsExpectedResult(): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData(['longUrl' => '1']));
@@ -445,7 +446,7 @@ class VisitRepositoryTest extends DatabaseTestCase
         self::assertCount(5, $this->repo->findNonOrphanVisits(new VisitsListFiltering(null, false, null, 5, 5)));
     }
 
-    /** @test */
+    #[Test]
     public function findMostRecentOrphanVisitReturnsExpectedVisit(): void
     {
         $this->assertNull($this->repo->findMostRecentOrphanVisit());

module/Core/test/Action/PixelActionTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Action;
 
 use Laminas\Diactoros\ServerRequest;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -29,7 +30,7 @@ class PixelActionTest extends TestCase
         $this->action = new PixelAction($this->urlResolver, $this->requestTracker);
     }
 
-    /** @test */
+    #[Test]
     public function imageIsReturned(): void
     {
         $shortCode = 'abc123';

module/Core/test/Action/QrCodeActionTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\Action;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequest;
 use Laminas\Diactoros\ServerRequestFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -37,7 +39,7 @@ class QrCodeActionTest extends TestCase
         $this->urlResolver = $this->createMock(ShortUrlResolverInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function aNotFoundShortCodeWillDelegateIntoNextMiddleware(): void
     {
         $shortCode = 'abc123';
@@ -50,7 +52,7 @@ class QrCodeActionTest extends TestCase
         $this->action()->process((new ServerRequest())->withAttribute('shortCode', $shortCode), $delegate);
     }
 
-    /** @test */
+    #[Test]
     public function aCorrectRequestReturnsTheQrCodeResponse(): void
     {
         $shortCode = 'abc123';
@@ -66,10 +68,7 @@ class QrCodeActionTest extends TestCase
         self::assertEquals(200, $resp->getStatusCode());
     }
 
-    /**
+    #[Test, DataProvider('provideQueries')]
-     * @test
-     * @dataProvider provideQueries
-     */
     public function imageIsReturnedWithExpectedContentTypeBasedOnProvidedFormat(
         string $defaultFormat,
         array $query,
@@ -99,10 +98,7 @@ class QrCodeActionTest extends TestCase
         yield 'unsupported format, svg default' => ['svg', ['format' => 'jpg'], 'image/svg+xml'];
     }
 
-    /**
+    #[Test, DataProvider('provideRequestsWithSize')]
-     * @test
-     * @dataProvider provideRequestsWithSize
-     */
     public function imageIsReturnedWithExpectedSize(
         QrCodeOptions $defaultOptions,
         ServerRequestInterface $req,
@@ -188,10 +184,7 @@ class QrCodeActionTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideRoundBlockSize')]
-     * @test
-     * @dataProvider provideRoundBlockSize
-     */
     public function imageCanRemoveExtraMarginWhenBlockRoundIsDisabled(
         QrCodeOptions $defaultOptions,
         ?string $roundBlockSize,

module/Core/test/Action/RedirectActionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Action;
 
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequest;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -44,7 +45,7 @@ class RedirectActionTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function redirectionIsPerformedToLongUrl(): void
     {
         $shortCode = 'abc123';
@@ -64,7 +65,7 @@ class RedirectActionTest extends TestCase
         self::assertSame($expectedResp, $response);
     }
 
-    /** @test */
+    #[Test]
     public function nextMiddlewareIsInvokedIfLongUrlIsNotFound(): void
     {
         $shortCode = 'abc123';

module/Core/test/Action/RobotsActionTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Action;
 
 use Laminas\Diactoros\ServerRequestFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Action\RobotsAction;
@@ -21,10 +23,7 @@ class RobotsActionTest extends TestCase
         $this->action = new RobotsAction($this->helper);
     }
 
-    /**
+    #[Test, DataProvider('provideShortCodes')]
-     * @test
-     * @dataProvider provideShortCodes
-     */
     public function buildsRobotsLinesFromCrawlableShortCodes(array $shortCodes, string $expected): void
     {
         $this->helper

module/Core/test/Config/EmptyNotFoundRedirectConfigTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Config;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\EmptyNotFoundRedirectConfig;
 
@@ -16,7 +17,7 @@ class EmptyNotFoundRedirectConfigTest extends TestCase
         $this->redirectsConfig = new EmptyNotFoundRedirectConfig();
     }
 
-    /** @test */
+    #[Test]
     public function allMethodsReturnHardcodedValues(): void
     {
         self::assertNull($this->redirectsConfig->invalidShortUrlRedirect());

module/Core/test/Config/EnvVarsTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Config;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\EnvVars;
 
@@ -23,10 +25,7 @@ class EnvVarsTest extends TestCase
         putenv(EnvVars::DB_NAME->value . '=');
     }
 
-    /**
+    #[Test, DataProvider('provideExistingEnvVars')]
-     * @test
-     * @dataProvider provideExistingEnvVars
-     */
     public function existsInEnvReturnsExpectedValue(EnvVars $envVar, bool $exists): void
     {
         self::assertEquals($exists, $envVar->existsInEnv());
@@ -40,10 +39,7 @@ class EnvVarsTest extends TestCase
         yield 'DEFAULT_REGULAR_404_REDIRECT' => [EnvVars::DEFAULT_REGULAR_404_REDIRECT, false];
     }
 
-    /**
+    #[Test, DataProvider('provideEnvVarsValues')]
-     * @test
-     * @dataProvider provideEnvVarsValues
-     */
     public function expectedValueIsLoadedFromEnv(EnvVars $envVar, mixed $expected, mixed $default): void
     {
         self::assertEquals($expected, $envVar->loadFromEnv($default));

module/Core/test/Config/NotFoundRedirectResolverTest.php

@@ -9,6 +9,8 @@ use Laminas\Diactoros\ServerRequestFactory;
 use Laminas\Diactoros\Uri;
 use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -33,10 +35,7 @@ class NotFoundRedirectResolverTest extends TestCase
         $this->resolver = new NotFoundRedirectResolver($this->helper, new NullLogger());
     }
 
-    /**
+    #[Test, DataProvider('provideRedirects')]
-     * @test
-     * @dataProvider provideRedirects
-     */
     public function expectedRedirectionIsReturnedDependingOnTheCase(
         UriInterface $uri,
         NotFoundType $notFoundType,
@@ -113,7 +112,7 @@ class NotFoundRedirectResolverTest extends TestCase
         ];
     }
 
-    /** @test */
+    #[Test]
     public function noResponseIsReturnedIfNoConditionsMatch(): void
     {
         $notFoundType = self::notFoundType(self::requestForRoute('foo'));

module/Core/test/Config/PostProcessor/BasePathPrefixerTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Config\PostProcessor;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\PostProcessor\BasePathPrefixer;
 
@@ -16,10 +18,7 @@ class BasePathPrefixerTest extends TestCase
         $this->prefixer = new BasePathPrefixer();
     }
 
-    /**
+    #[Test, DataProvider('provideConfig')]
-     * @test
-     * @dataProvider provideConfig
-     */
     public function parsesConfigAsExpected(
         array $originalConfig,
         array $expectedRoutes,

module/Core/test/Config/PostProcessor/MultiSegmentSlugProcessorTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Config\PostProcessor;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\PostProcessor\MultiSegmentSlugProcessor;
 
@@ -16,10 +18,7 @@ class MultiSegmentSlugProcessorTest extends TestCase
         $this->processor = new MultiSegmentSlugProcessor();
     }
 
-    /**
+    #[Test, DataProvider('provideConfigs')]
-     * @test
-     * @dataProvider provideConfigs
-     */
     public function parsesRoutesAsExpected(array $config, array $expectedRoutes): void
     {
         self::assertEquals($expectedRoutes, ($this->processor)($config)['routes'] ?? []);

module/Core/test/Config/PostProcessor/ShortUrlMethodsProcessorTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Config\PostProcessor;
 
 use Mezzio\Router\Route;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
 use Shlinkio\Shlink\Core\Config\PostProcessor\ShortUrlMethodsProcessor;
@@ -18,10 +20,7 @@ class ShortUrlMethodsProcessorTest extends TestCase
         $this->processor = new ShortUrlMethodsProcessor();
     }
 
-    /**
+    #[Test, DataProvider('provideConfigs')]
-     * @test
-     * @dataProvider provideConfigs
-     */
     public function onlyFirstRouteIdentifiedAsRedirectIsEditedWithProperAllowedMethods(
         array $config,
         ?array $expectedRoutes,

module/Core/test/ConfigProviderTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core;
 
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\ConfigProvider;
 
@@ -17,7 +18,7 @@ class ConfigProviderTest extends TestCase
         $this->configProvider = new ConfigProvider();
     }
 
-    /** @test */
+    #[Test]
     public function properConfigIsReturned(): void
     {
         $config = ($this->configProvider)();

module/Core/test/Crawling/CrawlingHelperTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Crawling;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Crawling\CrawlingHelper;
@@ -20,7 +21,7 @@ class CrawlingHelperTest extends TestCase
         $this->helper = new CrawlingHelper($this->query);
     }
 
-    /** @test */
+    #[Test]
     public function listCrawlableShortCodesDelegatesIntoRepository(): void
     {
         $this->query->expects($this->once())->method('__invoke')->willReturn([]);

module/Core/test/Domain/DomainServiceTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Domain;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\EmptyNotFoundRedirectConfig;
@@ -29,10 +31,7 @@ class DomainServiceTest extends TestCase
         $this->domainService = new DomainService($this->em, 'default.com');
     }
 
-    /**
+    #[Test, DataProvider('provideExcludedDomains')]
-     * @test
-     * @dataProvider provideExcludedDomains
-     */
     public function listDomainsDelegatesIntoRepository(array $domains, array $expectedResult, ?ApiKey $apiKey): void
     {
         $repo = $this->createMock(DomainRepositoryInterface::class);
@@ -102,7 +101,7 @@ class DomainServiceTest extends TestCase
         ];
     }
 
-    /** @test */
+    #[Test]
     public function getDomainThrowsExceptionWhenDomainIsNotFound(): void
     {
         $this->em->expects($this->once())->method('find')->with(Domain::class, '123')->willReturn(null);
@@ -112,7 +111,7 @@ class DomainServiceTest extends TestCase
         $this->domainService->getDomain('123');
     }
 
-    /** @test */
+    #[Test]
     public function getDomainReturnsEntityWhenFound(): void
     {
         $domain = Domain::withAuthority('');
@@ -123,10 +122,7 @@ class DomainServiceTest extends TestCase
         self::assertSame($domain, $result);
     }
 
-    /**
+    #[Test, DataProvider('provideFoundDomains')]
-     * @test
-     * @dataProvider provideFoundDomains
-     */
     public function getOrCreateAlwaysPersistsDomain(?Domain $foundDomain, ?ApiKey $apiKey): void
     {
         $authority = 'example.com';
@@ -145,7 +141,7 @@ class DomainServiceTest extends TestCase
         }
     }
 
-    /** @test */
+    #[Test]
     public function getOrCreateThrowsExceptionForApiKeysWithDomainRole(): void
     {
         $authority = 'example.com';
@@ -163,10 +159,7 @@ class DomainServiceTest extends TestCase
         $this->domainService->getOrCreate($authority, $apiKey);
     }
 
-    /**
+    #[Test, DataProvider('provideFoundDomains')]
-     * @test
-     * @dataProvider provideFoundDomains
-     */
     public function configureNotFoundRedirectsConfiguresFetchedDomain(?Domain $foundDomain, ?ApiKey $apiKey): void
     {
         $authority = 'example.com';

module/Core/test/ErrorHandler/NotFoundRedirectHandlerTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\ErrorHandler;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -43,10 +45,7 @@ class NotFoundRedirectHandlerTest extends TestCase
         );
     }
 
-    /**
+    #[Test, DataProvider('provideNonRedirectScenarios')]
-     * @test
-     * @dataProvider provideNonRedirectScenarios
-     */
     public function nextIsCalledWhenNoRedirectIsResolved(callable $setUp): void
     {
         $expectedResp = new Response();
@@ -95,7 +94,7 @@ class NotFoundRedirectHandlerTest extends TestCase
         }];
     }
 
-    /** @test */
+    #[Test]
     public function globalRedirectIsUsedIfDomainRedirectIsNotFound(): void
     {
         $expectedResp = new Response();
@@ -113,7 +112,7 @@ class NotFoundRedirectHandlerTest extends TestCase
         self::assertSame($expectedResp, $result);
     }
 
-    /** @test */
+    #[Test]
     public function domainRedirectIsUsedIfFound(): void
     {
         $expectedResp = new Response();

module/Core/test/ErrorHandler/NotFoundTemplateHandlerTest.php

@@ -9,6 +9,8 @@ use Laminas\Diactoros\ServerRequestFactory;
 use Laminas\Diactoros\Uri;
 use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
@@ -32,10 +34,7 @@ class NotFoundTemplateHandlerTest extends TestCase
         $this->handler = new NotFoundTemplateHandler($readFile);
     }
 
-    /**
+    #[Test, DataProvider('provideTemplates')]
-     * @test
-     * @dataProvider provideTemplates
-     */
     public function properErrorTemplateIsRendered(ServerRequestInterface $request, string $expectedTemplate): void
     {
         $resp = $this->handler->handle($request->withHeader('Accept', 'text/html'));

module/Core/test/ErrorHandler/NotFoundTrackerMiddlewareTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ErrorHandler;
 
 use Laminas\Diactoros\ServerRequestFactory;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -32,7 +33,7 @@ class NotFoundTrackerMiddlewareTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function delegatesIntoRequestTracker(): void
     {
         $this->handler->expects($this->once())->method('handle')->with($this->request);

module/Core/test/ErrorHandler/NotFoundTypeResolverMiddlewareTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Core\ErrorHandler;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -25,7 +26,7 @@ class NotFoundTypeResolverMiddlewareTest extends TestCase
         $this->handler = $this->createMock(RequestHandlerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function notFoundTypeIsAddedToRequest(): void
     {
         $request = ServerRequestFactory::fromGlobals();

module/Core/test/EventDispatcher/CloseDbConnectionEventListenerDelegatorTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
@@ -21,7 +22,7 @@ class CloseDbConnectionEventListenerDelegatorTest extends TestCase
         $this->delegator = new CloseDbConnectionEventListenerDelegator();
     }
 
-    /** @test */
+    #[Test]
     public function properDependenciesArePassed(): void
     {
         $callbackInvoked = false;

module/Core/test/EventDispatcher/CloseDbConnectionEventListenerTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
 use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -22,10 +24,7 @@ class CloseDbConnectionEventListenerTest extends TestCase
         $this->em = $this->createMock(ReopeningEntityManagerInterface::class);
     }
 
-    /**
+    #[Test, DataProvider('provideWrapped')]
-     * @test
-     * @dataProvider provideWrapped
-     */
     public function connectionIsOpenedBeforeAndClosedAfter(callable $wrapped, bool &$wrappedWasCalled): void
     {
         $conn = $this->createMock(Connection::class);

module/Core/test/EventDispatcher/LocateUnlocatedVisitsTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\GeoLiteDbCreated;
@@ -28,14 +29,14 @@ class LocateUnlocatedVisitsTest extends TestCase
         $this->listener = new LocateUnlocatedVisits($this->locator, $this->visitToLocation);
     }
 
-    /** @test */
+    #[Test]
     public function locatorIsCalledWhenInvoked(): void
     {
         $this->locator->expects($this->once())->method('locateUnlocatedVisits')->with($this->listener);
         ($this->listener)(new GeoLiteDbCreated());
     }
 
-    /** @test */
+    #[Test]
     public function visitToLocationHelperIsCalledToGeolocateVisits(): void
     {
         $visit = Visit::forBasePath(Visitor::emptyInstance());

module/Core/test/EventDispatcher/LocateVisitTest.php

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
 use Doctrine\ORM\EntityManagerInterface;
 use OutOfRangeException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -49,7 +51,7 @@ class LocateVisitTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function invalidVisitLogsWarning(): void
     {
         $event = new UrlVisited('123');
@@ -65,7 +67,7 @@ class LocateVisitTest extends TestCase
         ($this->locateVisit)($event);
     }
 
-    /** @test */
+    #[Test]
     public function nonExistingGeoLiteDbLogsWarning(): void
     {
         $event = new UrlVisited('123');
@@ -84,7 +86,7 @@ class LocateVisitTest extends TestCase
         ($this->locateVisit)($event);
     }
 
-    /** @test */
+    #[Test]
     public function invalidAddressLogsWarning(): void
     {
         $event = new UrlVisited('123');
@@ -105,7 +107,7 @@ class LocateVisitTest extends TestCase
         ($this->locateVisit)($event);
     }
 
-    /** @test */
+    #[Test]
     public function unhandledExceptionLogsError(): void
     {
         $event = new UrlVisited('123');
@@ -126,10 +128,7 @@ class LocateVisitTest extends TestCase
         ($this->locateVisit)($event);
     }
 
-    /**
+    #[Test, DataProvider('provideNonLocatableVisits')]
-     * @test
-     * @dataProvider provideNonLocatableVisits
-     */
     public function nonLocatableVisitsResolveToEmptyLocations(Visit $visit): void
     {
         $event = new UrlVisited('123');
@@ -155,10 +154,7 @@ class LocateVisitTest extends TestCase
         yield 'localhost' => [Visit::forValidShortUrl($shortUrl, new Visitor('', '', IpAddress::LOCALHOST, ''))];
     }
 
-    /**
+    #[Test, DataProvider('provideIpAddresses')]
-     * @test
-     * @dataProvider provideIpAddresses
-     */
     public function locatableVisitsResolveToLocation(Visit $visit, ?string $originalIpAddress): void
     {
         $ipAddr = $originalIpAddress ?? $visit->getRemoteAddr();

module/Core/test/EventDispatcher/Mercure/NotifyNewShortUrlToMercureTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher\Mercure;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -39,7 +40,7 @@ class NotifyNewShortUrlToMercureTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function messageIsLoggedWhenShortUrlIsNotFound(): void
     {
         $this->em->expects($this->once())->method('find')->with(ShortUrl::class, '123')->willReturn(null);
@@ -54,7 +55,7 @@ class NotifyNewShortUrlToMercureTest extends TestCase
         ($this->listener)(new ShortUrlCreated('123'));
     }
 
-    /** @test */
+    #[Test]
     public function expectedNotificationIsPublished(): void
     {
         $shortUrl = ShortUrl::withLongUrl('longUrl');
@@ -71,7 +72,7 @@ class NotifyNewShortUrlToMercureTest extends TestCase
         ($this->listener)(new ShortUrlCreated('123'));
     }
 
-    /** @test */
+    #[Test]
     public function messageIsPrintedIfPublishingFails(): void
     {
         $shortUrl = ShortUrl::withLongUrl('longUrl');

module/Core/test/EventDispatcher/Mercure/NotifyVisitToMercureTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\EventDispatcher\Mercure;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -37,7 +39,7 @@ class NotifyVisitToMercureTest extends TestCase
         $this->listener = new NotifyVisitToMercure($this->helper, $this->updatesGenerator, $this->em, $this->logger);
     }
 
-    /** @test */
+    #[Test]
     public function notificationsAreNotSentWhenVisitCannotBeFound(): void
     {
         $visitId = '123';
@@ -55,7 +57,7 @@ class NotifyVisitToMercureTest extends TestCase
         ($this->listener)(new VisitLocated($visitId));
     }
 
-    /** @test */
+    #[Test]
     public function notificationsAreSentWhenVisitIsFound(): void
     {
         $visitId = '123';
@@ -75,7 +77,7 @@ class NotifyVisitToMercureTest extends TestCase
         ($this->listener)(new VisitLocated($visitId));
     }
 
-    /** @test */
+    #[Test]
     public function debugIsLoggedWhenExceptionIsThrown(): void
     {
         $visitId = '123';
@@ -99,10 +101,7 @@ class NotifyVisitToMercureTest extends TestCase
         ($this->listener)(new VisitLocated($visitId));
     }
 
-    /**
+    #[Test, DataProvider('provideOrphanVisits')]
-     * @test
-     * @dataProvider provideOrphanVisits
-     */
     public function notificationsAreSentForOrphanVisits(Visit $visit): void
     {
         $visitId = '123';

module/Core/test/EventDispatcher/NotifyVisitToWebHooksTest.php

@@ -12,6 +12,8 @@ use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\RejectedPromise;
 use GuzzleHttp\RequestOptions;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -41,7 +43,7 @@ class NotifyVisitToWebHooksTest extends TestCase
         $this->logger = $this->createMock(LoggerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function emptyWebhooksMakeNoFurtherActions(): void
     {
         $this->em->expects($this->never())->method('find');
@@ -49,7 +51,7 @@ class NotifyVisitToWebHooksTest extends TestCase
         $this->createListener([])(new VisitLocated('1'));
     }
 
-    /** @test */
+    #[Test]
     public function invalidVisitDoesNotPerformAnyRequest(): void
     {
         $this->em->expects($this->once())->method('find')->with(Visit::class, '1')->willReturn(null);
@@ -62,7 +64,7 @@ class NotifyVisitToWebHooksTest extends TestCase
         $this->createListener(['foo', 'bar'])(new VisitLocated('1'));
     }
 
-    /** @test */
+    #[Test]
     public function orphanVisitDoesNotPerformAnyRequestWhenDisabled(): void
     {
         $this->em->expects($this->once())->method('find')->with(Visit::class, '1')->willReturn(
@@ -74,10 +76,7 @@ class NotifyVisitToWebHooksTest extends TestCase
         $this->createListener(['foo', 'bar'], false)(new VisitLocated('1'));
     }
 
-    /**
+    #[Test, DataProvider('provideVisits')]
-     * @test
-     * @dataProvider provideVisits
-     */
     public function expectedRequestsArePerformedToWebhooks(Visit $visit, array $expectedResponseKeys): void
     {
         $webhooks = ['foo', 'invalid', 'bar', 'baz'];

module/Core/test/EventDispatcher/PublishingUpdatesGeneratorTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\UpdatePublishing\Update;
 use Shlinkio\Shlink\Core\EventDispatcher\PublishingUpdatesGenerator;
@@ -30,10 +32,7 @@ class PublishingUpdatesGeneratorTest extends TestCase
         );
     }
 
-    /**
+    #[Test, DataProvider('provideMethod')]
-     * @test
-     * @dataProvider provideMethod
-     */
     public function visitIsProperlySerializedIntoUpdate(string $method, string $expectedTopic, ?string $title): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData([
@@ -83,10 +82,7 @@ class PublishingUpdatesGeneratorTest extends TestCase
         yield 'newShortUrlVisitUpdate' => ['newShortUrlVisitUpdate', 'https://shlink.io/new-visit/foo', null];
     }
 
-    /**
+    #[Test, DataProvider('provideOrphanVisits')]
-     * @test
-     * @dataProvider provideOrphanVisits
-     */
     public function orphanVisitIsProperlySerializedIntoUpdate(Visit $orphanVisit): void
     {
         $update = $this->generator->newOrphanVisitUpdate($orphanVisit);
@@ -114,7 +110,7 @@ class PublishingUpdatesGeneratorTest extends TestCase
         yield VisitType::BASE_URL->value => [Visit::forBasePath($visitor)];
     }
 
-    /** @test */
+    #[Test]
     public function shortUrlIsProperlySerializedIntoUpdate(): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData([

module/Core/test/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMqTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher\RabbitMq;
 use Doctrine\ORM\EntityManagerInterface;
 use DomainException;
 use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -36,7 +38,7 @@ class NotifyNewShortUrlToRabbitMqTest extends TestCase
         $this->logger = $this->createMock(LoggerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function doesNothingWhenTheFeatureIsNotEnabled(): void
     {
         $this->helper->expects($this->never())->method('publishUpdate');
@@ -47,7 +49,7 @@ class NotifyNewShortUrlToRabbitMqTest extends TestCase
         ($this->listener(false))(new ShortUrlCreated('123'));
     }
 
-    /** @test */
+    #[Test]
     public function notificationsAreNotSentWhenShortUrlCannotBeFound(): void
     {
         $shortUrlId = '123';
@@ -62,7 +64,7 @@ class NotifyNewShortUrlToRabbitMqTest extends TestCase
         ($this->listener())(new ShortUrlCreated($shortUrlId));
     }
 
-    /** @test */
+    #[Test]
     public function expectedChannelIsNotified(): void
     {
         $shortUrlId = '123';
@@ -79,10 +81,7 @@ class NotifyNewShortUrlToRabbitMqTest extends TestCase
         ($this->listener())(new ShortUrlCreated($shortUrlId));
     }
 
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function printsDebugMessageInCaseOfError(Throwable $e): void
     {
         $shortUrlId = '123';

module/Core/test/EventDispatcher/RabbitMq/NotifyVisitToRabbitMqTest.php

@@ -8,6 +8,8 @@ use Doctrine\ORM\EntityManagerInterface;
 use DomainException;
 use Exception;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -44,7 +46,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
         $this->logger = $this->createMock(LoggerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function doesNothingWhenTheFeatureIsNotEnabled(): void
     {
         $this->helper->expects($this->never())->method('publishUpdate');
@@ -55,7 +57,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
         ($this->listener(new RabbitMqOptions(enabled: false)))(new VisitLocated('123'));
     }
 
-    /** @test */
+    #[Test]
     public function notificationsAreNotSentWhenVisitCannotBeFound(): void
     {
         $visitId = '123';
@@ -70,10 +72,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
         ($this->listener())(new VisitLocated($visitId));
     }
 
-    /**
+    #[Test, DataProvider('provideVisits')]
-     * @test
-     * @dataProvider provideVisits
-     */
     public function expectedChannelsAreNotifiedBasedOnTheVisitType(Visit $visit, array $expectedChannels): void
     {
         $visitId = '123';
@@ -108,10 +107,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function printsDebugMessageInCaseOfError(Throwable $e): void
     {
         $visitId = '123';
@@ -137,10 +133,7 @@ class NotifyVisitToRabbitMqTest extends TestCase
         yield [new DomainException('DomainException Error')];
     }
 
-    /**
+    #[Test, DataProvider('provideLegacyPayloads')]
-     * @test
-     * @dataProvider provideLegacyPayloads
-     */
     public function expectedPayloadIsPublishedDependingOnConfig(
         bool $legacy,
         Visit $visit,

module/Core/test/EventDispatcher/RedisPubSub/NotifyNewShortUrlToRedisTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher\RedisPubSub;
 use Doctrine\ORM\EntityManagerInterface;
 use DomainException;
 use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -35,7 +37,7 @@ class NotifyNewShortUrlToRedisTest extends TestCase
         $this->logger = $this->createMock(LoggerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function doesNothingWhenTheFeatureIsNotEnabled(): void
     {
         $this->helper->expects($this->never())->method('publishUpdate');
@@ -46,10 +48,7 @@ class NotifyNewShortUrlToRedisTest extends TestCase
         $this->createListener(false)(new ShortUrlCreated('123'));
     }
 
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function printsDebugMessageInCaseOfError(Throwable $e): void
     {
         $shortUrlId = '123';

module/Core/test/EventDispatcher/RedisPubSub/NotifyVisitToRedisTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher\RedisPubSub;
 use Doctrine\ORM\EntityManagerInterface;
 use DomainException;
 use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -35,7 +37,7 @@ class NotifyVisitToRedisTest extends TestCase
         $this->logger = $this->createMock(LoggerInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function doesNothingWhenTheFeatureIsNotEnabled(): void
     {
         $this->helper->expects($this->never())->method('publishUpdate');
@@ -46,10 +48,7 @@ class NotifyVisitToRedisTest extends TestCase
         $this->createListener(false)(new VisitLocated('123'));
     }
 
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function printsDebugMessageInCaseOfError(Throwable $e): void
     {
         $visitId = '123';

module/Core/test/EventDispatcher/UpdateGeoLiteDbTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -32,7 +34,7 @@ class UpdateGeoLiteDbTest extends TestCase
         $this->listener = new UpdateGeoLiteDb($this->dbUpdater, $this->logger, $this->eventDispatcher);
     }
 
-    /** @test */
+    #[Test]
     public function exceptionWhileUpdatingDbLogsError(): void
     {
         $e = new RuntimeException();
@@ -48,10 +50,7 @@ class UpdateGeoLiteDbTest extends TestCase
         ($this->listener)();
     }
 
-    /**
+    #[Test, DataProvider('provideFlags')]
-     * @test
-     * @dataProvider provideFlags
-     */
     public function noticeMessageIsPrintedWhenFirstCallbackIsInvoked(bool $oldDbExists, string $expectedMessage): void
     {
         $this->dbUpdater->expects($this->once())->method('checkDbUpdate')->withAnyParameters()->willReturnCallback(
@@ -73,10 +72,7 @@ class UpdateGeoLiteDbTest extends TestCase
         yield 'not existing old db' => [false, 'Downloading GeoLite2 db file...'];
     }
 
-    /**
+    #[Test, DataProvider('provideDownloaded')]
-     * @test
-     * @dataProvider provideDownloaded
-     */
     public function noticeMessageIsPrintedWhenSecondCallbackIsInvoked(
         int $total,
         int $downloaded,
@@ -113,10 +109,7 @@ class UpdateGeoLiteDbTest extends TestCase
         yield [100, 101, false, 'Finished downloading GeoLite2 db file'];
     }
 
-    /**
+    #[Test, DataProvider('provideGeolocationResults')]
-     * @test
-     * @dataProvider provideGeolocationResults
-     */
     public function dispatchesEventOnlyWhenDbFileHasBeenCreatedForTheFirstTime(
         GeolocationResult $result,
         int $expectedDispatches,

module/Core/test/Exception/DeleteShortUrlExceptionTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\DeleteShortUrlException;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
@@ -15,10 +17,7 @@ use function sprintf;
 
 class DeleteShortUrlExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideThresholds')]
-     * @test
-     * @dataProvider provideThresholds
-     */
     public function fromVisitsThresholdGeneratesMessageProperly(
         int $threshold,
         string $shortCode,
@@ -52,7 +51,7 @@ class DeleteShortUrlExceptionTest extends TestCase
         });
     }
 
-    /** @test */
+    #[Test]
     public function domainIsPartOfAdditionalWhenProvidedInIdentifier(): void
     {
         $e = DeleteShortUrlException::fromVisitsThreshold(

module/Core/test/Exception/DomainNotFoundExceptionTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\DomainNotFoundException;
 
@@ -11,7 +12,7 @@ use function sprintf;
 
 class DomainNotFoundExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function properlyCreatesExceptionFromId(): void
     {
         $id = '123';
@@ -26,7 +27,7 @@ class DomainNotFoundExceptionTest extends TestCase
         self::assertEquals(404, $e->getStatus());
     }
 
-    /** @test */
+    #[Test]
     public function properlyCreatesExceptionFromAuthority(): void
     {
         $authority = 'example.com';

module/Core/test/Exception/ForbiddenTagOperationExceptionTest.php

@@ -4,15 +4,14 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\ForbiddenTagOperationException;
 
 class ForbiddenTagOperationExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function createsExpectedExceptionForDeletion(
         ForbiddenTagOperationException $e,
         string $expectedMessage,

module/Core/test/Exception/InvalidUrlExceptionTest.php

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\Core\Exception;
 
 use Exception;
 use Fig\Http\Message\StatusCodeInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Throwable;
@@ -14,10 +16,7 @@ use function sprintf;
 
 class InvalidUrlExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('providePrevious')]
-     * @test
-     * @dataProvider providePrevious
-     */
     public function properlyCreatesExceptionFromUrl(?Throwable $prev): void
     {
         $url = 'http://the_url.com';

module/Core/test/Exception/IpCannotBeLocatedExceptionTest.php

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\Core\Exception;
 
 use Exception;
 use LogicException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Exception\RuntimeException;
@@ -14,7 +16,7 @@ use Throwable;
 
 class IpCannotBeLocatedExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function forEmptyAddressInitializesException(): void
     {
         $e = IpCannotBeLocatedException::forEmptyAddress();
@@ -26,7 +28,7 @@ class IpCannotBeLocatedExceptionTest extends TestCase
         self::assertEquals(UnlocatableIpType::EMPTY_ADDRESS, $e->type);
     }
 
-    /** @test */
+    #[Test]
     public function forLocalhostInitializesException(): void
     {
         $e = IpCannotBeLocatedException::forLocalhost();
@@ -38,10 +40,7 @@ class IpCannotBeLocatedExceptionTest extends TestCase
         self::assertEquals(UnlocatableIpType::LOCALHOST, $e->type);
     }
 
-    /**
+    #[Test, DataProvider('provideErrors')]
-     * @test
-     * @dataProvider provideErrors
-     */
     public function forErrorInitializesException(Throwable $prev): void
     {
         $e = IpCannotBeLocatedException::forError($prev);

module/Core/test/Exception/MalformedBodyExceptionTest.php

@@ -6,12 +6,13 @@ namespace ShlinkioTest\Shlink\Core\Exception;
 
 use Fig\Http\Message\StatusCodeInterface;
 use JsonException;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\MalformedBodyException;
 
 class MalformedBodyExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function createsExpectedException(): void
     {
         $prev = new JsonException();

module/Core/test/Exception/NonUniqueSlugExceptionTest.php

@@ -4,15 +4,14 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 
 class NonUniqueSlugExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideMessages')]
-     * @test
-     * @dataProvider provideMessages
-     */
     public function properlyCreatesExceptionFromSlug(string $expectedMessage, string $slug, ?string $domain): void
     {
         $expectedAdditional = ['customSlug' => $slug];

module/Core/test/Exception/ShortUrlNotFoundExceptionTest.php

@@ -4,16 +4,15 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
 
 class ShortUrlNotFoundExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideMessages')]
-     * @test
-     * @dataProvider provideMessages
-     */
     public function properlyCreatesExceptionFromNotFoundShortCode(
         string $expectedMessage,
         string $shortCode,

module/Core/test/Exception/TagConflictExceptionTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\TagConflictException;
 use Shlinkio\Shlink\Core\Tag\Model\TagRenaming;
@@ -12,7 +13,7 @@ use function sprintf;
 
 class TagConflictExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function properlyCreatesExceptionForExistingTag(): void
     {
         $oldName = 'foo';

module/Core/test/Exception/TagNotFoundExceptionTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Exception;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\TagNotFoundException;
 
@@ -11,7 +12,7 @@ use function sprintf;
 
 class TagNotFoundExceptionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function properlyCreatesExceptionFromNotFoundTag(): void
     {
         $tag = 'foo';

module/Core/test/Exception/ValidationExceptionTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\Exception;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\InputFilter\InputFilterInterface;
 use LogicException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -17,10 +19,7 @@ use function print_r;
 
 class ValidationExceptionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideExceptions')]
-     * @test
-     * @dataProvider provideExceptions
-     */
     public function createsExceptionFromInputFilter(?Throwable $prev): void
     {
         $invalidData = [

module/Core/test/Functions/FunctionsTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Functions;
 
 use BackedEnum;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\Core\Model\DeviceType;
@@ -18,9 +20,8 @@ class FunctionsTest extends TestCase
 {
     /**
      * @param class-string<BackedEnum> $enum
-     * @test
-     * @dataProvider provideEnums
      */
+    #[Test, DataProvider('provideEnums')]
     public function enumValuesReturnsExpectedValueForEnum(string $enum, array $expectedValues): void
     {
         self::assertEquals($expectedValues, enumValues($enum));

module/Core/test/Importer/ImportedLinksProcessorTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\Importer;
 use Cake\Chronos\Chronos;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -61,7 +63,7 @@ class ImportedLinksProcessorTest extends TestCase
         $this->io = $this->createMock(StyleInterface::class);
     }
 
-    /** @test */
+    #[Test]
     public function newUrlsWithNoErrorsAreAllPersisted(): void
     {
         $urls = [
@@ -84,7 +86,7 @@ class ImportedLinksProcessorTest extends TestCase
         $this->processor->process($this->io, ImportResult::withShortUrls($urls), $this->buildParams());
     }
 
-    /** @test */
+    #[Test]
     public function newUrlsWithErrorsAreSkipped(): void
     {
         $urls = [
@@ -111,7 +113,7 @@ class ImportedLinksProcessorTest extends TestCase
         self::assertEquals(1, $textCalls->skippedCount);
     }
 
-    /** @test */
+    #[Test]
     public function alreadyImportedUrlsAreSkipped(): void
     {
         $urls = [
@@ -137,7 +139,7 @@ class ImportedLinksProcessorTest extends TestCase
         self::assertEquals(3, $textCalls->skippedCount);
     }
 
-    /** @test */
+    #[Test]
     public function nonUniqueShortCodesAreAskedToUser(): void
     {
         $urls = [
@@ -165,10 +167,7 @@ class ImportedLinksProcessorTest extends TestCase
         self::assertEquals(3, $textCalls->skippedCount);
     }
 
-    /**
+    #[Test, DataProvider('provideUrlsWithVisits')]
-     * @test
-     * @dataProvider provideUrlsWithVisits
-     */
     public function properAmountOfVisitsIsImported(
         ImportedShlinkUrl $importedUrl,
         string $expectedOutput,
@@ -230,9 +229,8 @@ class ImportedLinksProcessorTest extends TestCase
 
     /**
      * @param iterable<ImportedShlinkOrphanVisit> $visits
-     * @test
-     * @dataProvider provideOrphanVisits
      */
+    #[Test, DataProvider('provideOrphanVisits')]
     public function properAmountOfOrphanVisitsIsImported(
         bool $importOrphanVisits,
         iterable $visits,

module/Core/test/ShortUrl/DeleteShortUrlServiceTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\ShortUrl;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\DeleteShortUrlException;
@@ -40,7 +41,7 @@ class DeleteShortUrlServiceTest extends TestCase
         $this->urlResolver->method('resolveShortUrl')->willReturn($shortUrl);
     }
 
-    /** @test */
+    #[Test]
     public function deleteByShortCodeThrowsExceptionWhenThresholdIsReached(): void
     {
         $service = $this->createService();
@@ -54,7 +55,7 @@ class DeleteShortUrlServiceTest extends TestCase
         $service->deleteByShortCode(ShortUrlIdentifier::fromShortCodeAndDomain($this->shortCode));
     }
 
-    /** @test */
+    #[Test]
     public function deleteByShortCodeDeletesUrlWhenThresholdIsReachedButExplicitlyIgnored(): void
     {
         $service = $this->createService();
@@ -67,7 +68,7 @@ class DeleteShortUrlServiceTest extends TestCase
         $service->deleteByShortCode(ShortUrlIdentifier::fromShortCodeAndDomain($this->shortCode), true);
     }
 
-    /** @test */
+    #[Test]
     public function deleteByShortCodeDeletesUrlWhenThresholdIsReachedButCheckIsDisabled(): void
     {
         $service = $this->createService(false);
@@ -80,7 +81,7 @@ class DeleteShortUrlServiceTest extends TestCase
         $service->deleteByShortCode(ShortUrlIdentifier::fromShortCodeAndDomain($this->shortCode));
     }
 
-    /** @test */
+    #[Test]
     public function deleteByShortCodeDeletesUrlWhenThresholdIsNotReached(): void
     {
         $service = $this->createService(true, 100);

module/Core/test/ShortUrl/Entity/ShortUrlTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Entity;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\ShortCodeCannotBeRegeneratedException;
 use Shlinkio\Shlink\Core\Model\DeviceType;
@@ -27,10 +29,7 @@ use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
 
 class ShortUrlTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideInvalidShortUrls')]
-     * @test
-     * @dataProvider provideInvalidShortUrls
-     */
     public function regenerateShortCodeThrowsExceptionIfStateIsInvalid(
         ShortUrl $shortUrl,
         string $expectedMessage,
@@ -53,10 +52,7 @@ class ShortUrlTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideValidShortUrls')]
-     * @test
-     * @dataProvider provideValidShortUrls
-     */
     public function regenerateShortCodeProperlyChangesTheValueOnValidShortUrls(
         ShortUrl $shortUrl,
     ): void {
@@ -77,10 +73,7 @@ class ShortUrlTest extends TestCase
         )];
     }
 
-    /**
+    #[Test, DataProvider('provideLengths')]
-     * @test
-     * @dataProvider provideLengths
-     */
     public function shortCodesHaveExpectedLength(?int $length, int $expectedLength): void
     {
         $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData(
@@ -96,7 +89,7 @@ class ShortUrlTest extends TestCase
         yield from map(range(4, 10), fn (int $value) => [$value, $value]);
     }
 
-    /** @test */
+    #[Test]
     public function deviceLongUrlsAreUpdated(): void
     {
         $shortUrl = ShortUrl::withLongUrl('foo');
@@ -138,7 +131,7 @@ class ShortUrlTest extends TestCase
         ], $shortUrl->deviceLongUrls());
     }
 
-    /** @test */
+    #[Test]
     public function generatesLowercaseOnlyShortCodesInLooseMode(): void
     {
         $range = range(1, 1000); // Use a "big" number to reduce false negatives

module/Core/test/ShortUrl/Helper/ShortCodeUniquenessHelperTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Helper;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
@@ -29,10 +31,7 @@ class ShortCodeUniquenessHelperTest extends TestCase
         $this->shortUrl->method('getShortCode')->willReturn('abc123');
     }
 
-    /**
+    #[Test, DataProvider('provideDomains')]
-     * @test
-     * @dataProvider provideDomains
-     */
     public function shortCodeIsRegeneratedIfAlreadyInUse(?Domain $domain, ?string $expectedAuthority): void
     {
         $callIndex = 0;
@@ -61,7 +60,7 @@ class ShortCodeUniquenessHelperTest extends TestCase
         yield 'domain' => [Domain::withAuthority($authority = 's.test'), $authority];
     }
 
-    /** @test */
+    #[Test]
     public function inUseSlugReturnsError(): void
     {
         $repo = $this->createMock(ShortUrlRepository::class);

module/Core/test/ShortUrl/Helper/ShortUrlRedirectionBuilderTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Helper;
 
 use Laminas\Diactoros\ServerRequestFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Core\Model\DeviceType;
@@ -27,10 +29,7 @@ class ShortUrlRedirectionBuilderTest extends TestCase
         $this->redirectionBuilder = new ShortUrlRedirectionBuilder($trackingOptions);
     }
 
-    /**
+    #[Test, DataProvider('provideData')]
-     * @test
-     * @dataProvider provideData
-     */
     public function buildShortUrlRedirectBuildsExpectedUrl(
         string $expectedUrl,
         ServerRequestInterface $request,

module/Core/test/ShortUrl/Helper/ShortUrlStringifierTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
@@ -11,10 +13,7 @@ use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 
 class ShortUrlStringifierTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideConfigAndShortUrls')]
-     * @test
-     * @dataProvider provideConfigAndShortUrls
-     */
     public function generatesExpectedOutputBasedOnConfigAndShortUrl(
         array $config,
         string $basePath,

module/Core/test/ShortUrl/Helper/ShortUrlTitleResolutionHelperTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlTitleResolutionHelper;
@@ -21,10 +23,7 @@ class ShortUrlTitleResolutionHelperTest extends TestCase
         $this->helper = new ShortUrlTitleResolutionHelper($this->urlValidator);
     }
 
-    /**
+    #[Test, DataProvider('provideTitles')]
-     * @test
-     * @dataProvider provideTitles
-     */
     public function urlIsProperlyShortened(?string $title, int $validateWithTitleCallsNum, int $validateCallsNum): void
     {
         $longUrl = 'http://foobar.com/12345/hello?foo=bar';

module/Core/test/ShortUrl/Middleware/ExtraPathRedirectMiddlewareTest.php

@@ -9,6 +9,8 @@ use Laminas\Diactoros\ServerRequestFactory;
 use Laminas\Diactoros\Uri;
 use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -46,10 +48,7 @@ class ExtraPathRedirectMiddlewareTest extends TestCase
         $this->handler->method('handle')->willReturn(new RedirectResponse(''));
     }
 
-    /**
+    #[Test, DataProvider('provideNonRedirectingRequests')]
-     * @test
-     * @dataProvider provideNonRedirectingRequests
-     */
     public function handlerIsCalledWhenConfigPreventsRedirectWithExtraPath(
         bool $appendExtraPath,
         bool $multiSegmentEnabled,
@@ -101,10 +100,7 @@ class ExtraPathRedirectMiddlewareTest extends TestCase
         ];
     }
 
-    /**
+    #[Test, DataProvider('provideResolves')]
-     * @test
-     * @dataProvider provideResolves
-     */
     public function handlerIsCalledWhenNoShortUrlIsFoundAfterExpectedAmountOfIterations(
         bool $multiSegmentEnabled,
         int $expectedResolveCalls,
@@ -127,10 +123,7 @@ class ExtraPathRedirectMiddlewareTest extends TestCase
         $this->middleware($options)->process($request, $this->handler);
     }
 
-    /**
+    #[Test, DataProvider('provideResolves')]
-     * @test
-     * @dataProvider provideResolves
-     */
     public function visitIsTrackedAndRedirectIsReturnedWhenShortUrlIsFoundAfterExpectedAmountOfIterations(
         bool $multiSegmentEnabled,
         int $expectedResolveCalls,

module/Core/test/ShortUrl/Middleware/TrimTrailingSlashMiddlewareTest.php

@@ -7,6 +7,8 @@ namespace ShlinkioTest\Shlink\Core\ShortUrl\Middleware;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -26,10 +28,7 @@ class TrimTrailingSlashMiddlewareTest extends TestCase
         $this->requestHandler = $this->createMock(RequestHandlerInterface::class);
     }
 
-    /**
+    #[Test, DataProvider('provideRequests')]
-     * @test
-     * @dataProvider provideRequests
-     */
     public function returnsExpectedResponse(
         bool $trailingSlashEnabled,
         ServerRequestInterface $inputRequest,

module/Core/test/ShortUrl/Model/ShortUrlCreationTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Model;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
 use Shlinkio\Shlink\Core\Model\DeviceType;
@@ -20,11 +22,7 @@ use const STR_PAD_BOTH;
 
 class ShortUrlCreationTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideInvalidData')]
-     * @param array $data
-     * @test
-     * @dataProvider provideInvalidData
-     */
     public function exceptionIsThrownIfProvidedDataIsInvalid(array $data): void
     {
         $this->expectException(ValidationException::class);
@@ -107,10 +105,7 @@ class ShortUrlCreationTest extends TestCase
         ]];
     }
 
-    /**
+    #[Test, DataProvider('provideCustomSlugs')]
-     * @test
-     * @dataProvider provideCustomSlugs
-     */
     public function properlyCreatedInstanceReturnsValues(
         string $customSlug,
         string $expectedSlug,
@@ -161,10 +156,7 @@ class ShortUrlCreationTest extends TestCase
         yield ['гугл', 'гугл'];
     }
 
-    /**
+    #[Test, DataProvider('provideTitles')]
-     * @test
-     * @dataProvider provideTitles
-     */
     public function titleIsCroppedIfTooLong(?string $title, ?string $expectedTitle): void
     {
         $creation = ShortUrlCreation::fromRawData([
@@ -187,10 +179,7 @@ class ShortUrlCreationTest extends TestCase
         yield [str_pad('', 800, 'e'), str_pad('', 512, 'e')];
     }
 
-    /**
+    #[Test, DataProvider('provideDomains')]
-     * @test
-     * @dataProvider provideDomains
-     */
     public function emptyDomainIsDiscarded(?string $domain, ?string $expectedDomain): void
     {
         $creation = ShortUrlCreation::fromRawData([

module/Core/test/ShortUrl/Model/ShortUrlEditionTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Model;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Model\DeviceType;
 use Shlinkio\Shlink\Core\ShortUrl\Model\DeviceLongUrlPair;
@@ -12,10 +14,7 @@ use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlInputFilter;
 
 class ShortUrlEditionTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideDeviceLongUrls')]
-     * @test
-     * @dataProvider provideDeviceLongUrls
-     */
     public function expectedDeviceLongUrlsAreResolved(
         ?array $deviceLongUrls,
         array $expectedDeviceLongUrls,

module/Core/test/ShortUrl/Model/ShortUrlModeTest.php

@@ -4,15 +4,14 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Model;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
 
 class ShortUrlModeTest extends TestCase
 {
-    /**
+    #[Test, DataProvider('provideModes')]
-     * @test
-     * @dataProvider provideModes
-     */
     public function deprecatedValuesAreProperlyParsed(string $mode, ?ShortUrlMode $expected): void
     {
         self::assertSame($expected, ShortUrlMode::tryDeprecated($mode));

module/Core/test/ShortUrl/Model/Validation/DeviceLongUrlsValidatorTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Model\Validation;
 
 use Laminas\Validator\NotEmpty;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Model\DeviceType;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\DeviceLongUrlsValidator;
@@ -19,10 +21,7 @@ class DeviceLongUrlsValidatorTest extends TestCase
         $this->validator = new DeviceLongUrlsValidator(new NotEmpty());
     }
 
-    /**
+    #[Test, DataProvider('provideNonArrayValues')]
-     * @test
-     * @dataProvider provideNonArrayValues
-     */
     public function nonArrayValuesAreNotValid(mixed $invalidValue): void
     {
         self::assertFalse($this->validator->isValid($invalidValue));
@@ -39,7 +38,7 @@ class DeviceLongUrlsValidatorTest extends TestCase
         yield 'null' => [null];
     }
 
-    /** @test */
+    #[Test]
     public function unrecognizedKeysAreNotValid(): void
     {
         self::assertFalse($this->validator->isValid(['foo' => 'bar']));
@@ -49,7 +48,7 @@ class DeviceLongUrlsValidatorTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function everyUrlMustMatchLongUrlValidator(): void
     {
         self::assertFalse($this->validator->isValid([DeviceType::ANDROID->value => '']));
@@ -59,7 +58,7 @@ class DeviceLongUrlsValidatorTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function validValuesResultInValidResult(): void
     {
         self::assertTrue($this->validator->isValid([

module/Core/test/ShortUrl/Paginator/Adapter/ShortUrlRepositoryAdapterTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Paginator\Adapter;
 
 use Cake\Chronos\Chronos;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlsParams;
@@ -24,10 +26,7 @@ class ShortUrlRepositoryAdapterTest extends TestCase
         $this->repo = $this->createMock(ShortUrlListRepositoryInterface::class);
     }
 
-    /**
+    #[Test, DataProvider('provideFilteringArgs')]
-     * @test
-     * @dataProvider provideFilteringArgs
-     */
     public function getItemsFallsBackToFindList(
         ?string $searchTerm = null,
         array $tags = [],
@@ -53,10 +52,7 @@ class ShortUrlRepositoryAdapterTest extends TestCase
         $adapter->getSlice(5, 10);
     }
 
-    /**
+    #[Test, DataProvider('provideFilteringArgs')]
-     * @test
-     * @dataProvider provideFilteringArgs
-     */
     public function countFallsBackToCountList(
         ?string $searchTerm = null,
         array $tags = [],

module/Core/test/ShortUrl/Resolver/PersistenceShortUrlRelationResolverTest.php

@@ -6,6 +6,8 @@ namespace ShlinkioTest\Shlink\Core\ShortUrl\Resolver;
 
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
@@ -29,17 +31,14 @@ class PersistenceShortUrlRelationResolverTest extends TestCase
         $this->resolver = new PersistenceShortUrlRelationResolver($this->em);
     }
 
-    /** @test */
+    #[Test]
     public function returnsEmptyWhenNoDomainIsProvided(): void
     {
         $this->em->expects($this->never())->method('getRepository')->with(Domain::class);
         self::assertNull($this->resolver->resolveDomain(null));
     }
 
-    /**
+    #[Test, DataProvider('provideFoundDomains')]
-     * @test
-     * @dataProvider provideFoundDomains
-     */
     public function findsOrCreatesDomainWhenValueIsProvided(?Domain $foundDomain, string $authority): void
     {
         $repo = $this->createMock(DomainRepositoryInterface::class);
@@ -63,10 +62,7 @@ class PersistenceShortUrlRelationResolverTest extends TestCase
         yield 'found domain' => [Domain::withAuthority($authority), $authority];
     }
 
-    /**
+    #[Test, DataProvider('provideTags')]
-     * @test
-     * @dataProvider provideTags
-     */
     public function findsAndPersistsTagsWrappedIntoCollection(array $tags, array $expectedTags): void
     {
         $expectedPersistedTags = count($expectedTags);
@@ -95,7 +91,7 @@ class PersistenceShortUrlRelationResolverTest extends TestCase
         yield 'duplicated tags' => [['foo', 'bar', 'bar'], [new Tag('foo'), new Tag('bar')]];
     }
 
-    /** @test */
+    #[Test]
     public function returnsEmptyCollectionWhenProvidingEmptyListOfTags(): void
     {
         $this->em->expects($this->never())->method('getRepository')->with(Tag::class);
@@ -106,7 +102,7 @@ class PersistenceShortUrlRelationResolverTest extends TestCase
         self::assertEmpty($result);
     }
 
-    /** @test */
+    #[Test]
     public function newDomainsAreMemoizedUntilStateIsCleared(): void
     {
         $repo = $this->createMock(DomainRepositoryInterface::class);
@@ -125,7 +121,7 @@ class PersistenceShortUrlRelationResolverTest extends TestCase
         self::assertNotSame($domain1, $domain3);
     }
 
-    /** @test */
+    #[Test]
     public function newTagsAreMemoizedUntilStateIsCleared(): void
     {
         $tagRepo = $this->createMock(TagRepositoryInterface::class);

module/Core/test/ShortUrl/Resolver/SimpleShortUrlRelationResolverTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl\Resolver;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\ShortUrl\Resolver\SimpleShortUrlRelationResolver;
@@ -18,10 +20,7 @@ class SimpleShortUrlRelationResolverTest extends TestCase
         $this->resolver = new SimpleShortUrlRelationResolver();
     }
 
-    /**
+    #[Test, DataProvider('provideDomains')]
-     * @test
-     * @dataProvider provideDomains
-     */
     public function resolvesExpectedDomain(?string $domain): void
     {
         $result = $this->resolver->resolveDomain($domain);
@@ -40,7 +39,7 @@ class SimpleShortUrlRelationResolverTest extends TestCase
         yield 'non-empty domain' => ['domain.com'];
     }
 
-    /** @test */
+    #[Test]
     public function tagsAreWrappedInEntityCollection(): void
     {
         $tags = ['foo', 'bar', 'baz'];

module/Core/test/ShortUrl/ShortUrlListServiceTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\ShortUrl;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
@@ -29,10 +31,7 @@ class ShortUrlListServiceTest extends TestCase
         $this->service = new ShortUrlListService($this->repo, new UrlShortenerOptions());
     }
 
-    /**
+    #[Test, DataProvider('provideAdminApiKeys')]
-     * @test
-     * @dataProvider provideAdminApiKeys
-     */
     public function listedUrlsAreReturnedFromEntityManager(?ApiKey $apiKey): void
     {
         $list = [