Updated dependencies

composer.json

@@ -66,12 +66,13 @@
         "devster/ubench": "^2.0",
         "dms/phpunit-arraysubset-asserts": "^0.2.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.17.7",
+        "infection/infection": "^0.20.0",
-        "phpstan/phpstan": "^0.12.50",
+        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/php-code-coverage": "^8.0",
+        "phpstan/phpstan": "^0.12.52",
-        "phpunit/phpunit": "~9.0.1",
+        "phpunit/php-code-coverage": "^9.2",
+        "phpunit/phpunit": "^9.4",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.1.0",
+        "shlinkio/php-coding-standard": "~2.1.1",
         "shlinkio/shlink-test-utils": "^1.5",
         "symfony/var-dumper": "^5.1"
     },

config/test/test_config.global.php

@@ -12,6 +12,8 @@ use Laminas\Stdlib\Glob;
 use PDO;
 use PHPUnit\Runner\Version;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Driver\Selector;
+use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\Report\PHP;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml;
 
@@ -25,10 +27,11 @@ use const ShlinkioTest\Shlink\SWOOLE_TESTING_PORT;
 
 $isApiTest = env('TEST_ENV') === 'api';
 if ($isApiTest) {
-    $coverage = new CodeCoverage();
+    $filter = new Filter();
     foreach (Glob::glob(__DIR__ . '/../../module/*/src') as $item) {
-        $coverage->filter()->addDirectoryToWhitelist($item);
+        $filter->includeDirectory($item);
     }
+    $coverage = new CodeCoverage((new Selector())->forLineCoverage($filter), $filter);
 }
 
 $buildDbConnection = function (): array {

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
@@ -14,6 +15,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class DisableKeyCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $apiKeyService;
 

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

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\Api;
 use Cake\Chronos\Chronos;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
@@ -16,6 +17,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class GenerateKeyCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $apiKeyService;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
@@ -14,6 +15,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class ListKeysCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $apiKeyService;
 

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

@@ -9,6 +9,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Db\CreateDatabaseCommand;
 use Symfony\Component\Console\Application;
@@ -22,10 +23,11 @@ use Symfony\Component\Process\Process;
 
 class CreateDatabaseCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $processHelper;
     private ObjectProphecy $regularConn;
-    private ObjectProphecy $noDbNameConn;
     private ObjectProphecy $schemaManager;
     private ObjectProphecy $databasePlatform;
 
@@ -48,15 +50,15 @@ class CreateDatabaseCommandTest extends TestCase
         $this->regularConn = $this->prophesize(Connection::class);
         $this->regularConn->getSchemaManager()->willReturn($this->schemaManager->reveal());
         $this->regularConn->getDatabasePlatform()->willReturn($this->databasePlatform->reveal());
-        $this->noDbNameConn = $this->prophesize(Connection::class);
+        $noDbNameConn = $this->prophesize(Connection::class);
-        $this->noDbNameConn->getSchemaManager()->willReturn($this->schemaManager->reveal());
+        $noDbNameConn->getSchemaManager()->willReturn($this->schemaManager->reveal());
 
         $command = new CreateDatabaseCommand(
             $locker->reveal(),
             $this->processHelper->reveal(),
             $phpExecutableFinder->reveal(),
             $this->regularConn->reveal(),
-            $this->noDbNameConn->reveal(),
+            $noDbNameConn->reveal(),
         );
         $app = new Application();
         $app->add($command);

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

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\Db;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Db\MigrateDatabaseCommand;
 use Symfony\Component\Console\Application;
@@ -19,6 +20,8 @@ use Symfony\Component\Process\Process;
 
 class MigrateDatabaseCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $processHelper;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Domain;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Domain\ListDomainsCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
@@ -15,6 +16,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class ListDomainsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $domainService;
 

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

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\DeleteShortUrlCommand;
 use Shlinkio\Shlink\Core\Exception;
@@ -21,6 +22,8 @@ use const PHP_EOL;
 
 class DeleteShortUrlCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $service;
 

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

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
@@ -20,6 +21,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class GenerateShortUrlCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private const DOMAIN_CONFIG = [
         'schema' => 'http',
         'hostname' => 'foo.com',

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

@@ -9,6 +9,7 @@ use Laminas\Paginator\Adapter\ArrayAdapter;
 use Laminas\Paginator\Paginator;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
 use Shlinkio\Shlink\Common\Util\DateRange;
@@ -27,6 +28,8 @@ use function sprintf;
 
 class GetVisitsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $visitsTracker;
 

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

@@ -9,6 +9,7 @@ use Laminas\Paginator\Adapter\ArrayAdapter;
 use Laminas\Paginator\Paginator;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -21,6 +22,8 @@ use function explode;
 
 class ListShortUrlsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $shortUrlService;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ResolveUrlCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -20,6 +21,8 @@ use const PHP_EOL;
 
 class ResolveUrlCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $urlResolver;
 

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

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Tag\CreateTagCommand;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
@@ -14,6 +15,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class CreateTagCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $tagService;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Tag\DeleteTagsCommand;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
@@ -13,6 +14,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class DeleteTagsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $tagService;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Tag\ListTagsCommand;
 use Shlinkio\Shlink\Core\Entity\Tag;
@@ -15,6 +16,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class ListTagsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $tagService;
 

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Tag\RenameTagCommand;
 use Shlinkio\Shlink\Core\Entity\Tag;
@@ -15,6 +16,8 @@ use Symfony\Component\Console\Tester\CommandTester;
 
 class RenameTagCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $tagService;
 

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

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\LocateVisitsCommand;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
@@ -32,10 +33,11 @@ use const PHP_EOL;
 
 class LocateVisitsCommandTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CommandTester $commandTester;
     private ObjectProphecy $visitService;
     private ObjectProphecy $ipResolver;
-    private ObjectProphecy $locker;
     private ObjectProphecy $lock;
     private ObjectProphecy $dbUpdater;
 
@@ -45,17 +47,17 @@ class LocateVisitsCommandTest extends TestCase
         $this->ipResolver = $this->prophesize(IpLocationResolverInterface::class);
         $this->dbUpdater = $this->prophesize(GeolocationDbUpdaterInterface::class);
 
-        $this->locker = $this->prophesize(Lock\LockFactory::class);
+        $locker = $this->prophesize(Lock\LockFactory::class);
         $this->lock = $this->prophesize(Lock\LockInterface::class);
         $this->lock->acquire(false)->willReturn(true);
         $this->lock->release()->will(function (): void {
         });
-        $this->locker->createLock(Argument::type('string'), 90.0, false)->willReturn($this->lock->reveal());
+        $locker->createLock(Argument::type('string'), 90.0, false)->willReturn($this->lock->reveal());
 
         $command = new LocateVisitsCommand(
             $this->visitService->reveal(),
             $this->ipResolver->reveal(),
-            $this->locker->reveal(),
+            $locker->reveal(),
             $this->dbUpdater->reveal(),
         );
         $app = new Application();

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\CLI\Factory;
 use Laminas\ServiceManager\ServiceManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
@@ -15,6 +16,8 @@ use Symfony\Component\Console\Command\Command;
 
 class ApplicationFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ApplicationFactory $factory;
 
     public function setUp(): void

module/CLI/test/Util/GeolocationDbUpdaterTest.php

@@ -9,6 +9,7 @@ use GeoIp2\Database\Reader;
 use MaxMind\Db\Reader\Metadata;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
@@ -22,28 +23,28 @@ use function range;
 
 class GeolocationDbUpdaterTest extends TestCase
 {
+    use ProphecyTrait;
+
     private GeolocationDbUpdater $geolocationDbUpdater;
     private ObjectProphecy $dbUpdater;
     private ObjectProphecy $geoLiteDbReader;
-    private ObjectProphecy $locker;
-    private ObjectProphecy $lock;
 
     public function setUp(): void
     {
         $this->dbUpdater = $this->prophesize(DbUpdaterInterface::class);
         $this->geoLiteDbReader = $this->prophesize(Reader::class);
 
-        $this->locker = $this->prophesize(Lock\LockFactory::class);
+        $locker = $this->prophesize(Lock\LockFactory::class);
-        $this->lock = $this->prophesize(Lock\LockInterface::class);
+        $lock = $this->prophesize(Lock\LockInterface::class);
-        $this->lock->acquire(true)->willReturn(true);
+        $lock->acquire(true)->willReturn(true);
-        $this->lock->release()->will(function (): void {
+        $lock->release()->will(function (): void {
         });
-        $this->locker->createLock(Argument::type('string'))->willReturn($this->lock->reveal());
+        $locker->createLock(Argument::type('string'))->willReturn($lock->reveal());
 
         $this->geolocationDbUpdater = new GeolocationDbUpdater(
             $this->dbUpdater->reveal(),
             $this->geoLiteDbReader->reveal(),
-            $this->locker->reveal(),
+            $locker->reveal(),
         );
     }
 

module/CLI/test/Util/ShlinkTableTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Util;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use ReflectionObject;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
@@ -15,6 +16,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class ShlinkTableTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ShlinkTable $shlinkTable;
     private ObjectProphecy $baseTable;
 

module/Core/test/Action/PixelActionTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Core\Action;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Common\Response\PixelResponse;
@@ -19,6 +20,8 @@ use Shlinkio\Shlink\Core\Service\VisitsTracker;
 
 class PixelActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private PixelAction $action;
     private ObjectProphecy $urlResolver;
     private ObjectProphecy $visitTracker;

module/Core/test/Action/QrCodeActionTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\ServerRequest;
 use Mezzio\Router\RouterInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Common\Response\QrCodeResponse;
@@ -20,6 +21,8 @@ use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface;
 
 class QrCodeActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private QrCodeAction $action;
     private ObjectProphecy $urlResolver;
 

module/Core/test/Action/RedirectActionTest.php

@@ -10,6 +10,7 @@ use Laminas\Diactoros\ServerRequest;
 use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
@@ -24,6 +25,8 @@ use function array_key_exists;
 
 class RedirectActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private RedirectAction $action;
     private ObjectProphecy $urlResolver;
     private ObjectProphecy $visitTracker;

module/Core/test/Domain/DomainServiceTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Domain;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Domain\DomainService;
 use Shlinkio\Shlink\Core\Domain\Repository\DomainRepositoryInterface;
@@ -13,6 +14,8 @@ use Shlinkio\Shlink\Core\Entity\Domain;
 
 class DomainServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DomainService $domainService;
     private ObjectProphecy $em;
 

module/Core/test/Domain/Resolver/PersistenceDomainResolverTest.php

@@ -7,12 +7,15 @@ namespace ShlinkioTest\Shlink\Core\Domain\Resolver;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Domain\Resolver\PersistenceDomainResolver;
 use Shlinkio\Shlink\Core\Entity\Domain;
 
 class PersistenceDomainResolverTest extends TestCase
 {
+    use ProphecyTrait;
+
     private PersistenceDomainResolver $domainResolver;
     private ObjectProphecy $em;
 

module/Core/test/ErrorHandler/NotFoundRedirectHandlerTest.php

@@ -10,6 +10,7 @@ use Laminas\Diactoros\Uri;
 use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -19,6 +20,8 @@ use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 
 class NotFoundRedirectHandlerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private NotFoundRedirectHandler $middleware;
     private NotFoundRedirectOptions $redirectOptions;
 

module/Core/test/ErrorHandler/NotFoundTemplateHandlerTest.php

@@ -10,6 +10,7 @@ use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
 use Mezzio\Template\TemplateRendererInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -17,6 +18,8 @@ use Shlinkio\Shlink\Core\ErrorHandler\NotFoundTemplateHandler;
 
 class NotFoundTemplateHandlerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private NotFoundTemplateHandler $handler;
     private ObjectProphecy $renderer;
 

module/Core/test/EventDispatcher/CloseDbConnectionEventListenerDelegatorTest.php

@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\EventDispatcher;
+namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Shlinkio\Shlink\Common\Doctrine\ReopeningEntityManagerInterface;
@@ -12,6 +13,8 @@ use Shlinkio\Shlink\Core\EventDispatcher\CloseDbConnectionEventListenerDelegator
 
 class CloseDbConnectionEventListenerDelegatorTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CloseDbConnectionEventListenerDelegator $delegator;
     private ObjectProphecy $container;
 

module/Core/test/EventDispatcher/CloseDbConnectionEventListenerTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use RuntimeException;
 use Shlinkio\Shlink\Common\Doctrine\ReopeningEntityManagerInterface;
@@ -15,6 +16,8 @@ use Throwable;
 
 class CloseDbConnectionEventListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy $em;
 
     public function setUp(): void

module/Core/test/EventDispatcher/LocateShortUrlVisitTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
@@ -26,6 +27,8 @@ use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 
 class LocateShortUrlVisitTest extends TestCase
 {
+    use ProphecyTrait;
+
     private LocateShortUrlVisit $locateVisit;
     private ObjectProphecy $ipLocationResolver;
     private ObjectProphecy $em;

module/Core/test/EventDispatcher/NotifyVisitToMercureTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
@@ -21,6 +22,8 @@ use Symfony\Component\Mercure\Update;
 
 class NotifyVisitToMercureTest extends TestCase
 {
+    use ProphecyTrait;
+
     private NotifyVisitToMercure $listener;
     private ObjectProphecy $publisher;
     private ObjectProphecy $updatesGenerator;

module/Core/test/EventDispatcher/NotifyVisitToWebHooksTest.php

@@ -14,6 +14,7 @@ use GuzzleHttp\RequestOptions;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -28,6 +29,8 @@ use function Functional\contains;
 
 class NotifyVisitToWebHooksTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy $httpClient;
     private ObjectProphecy $em;
     private ObjectProphecy $logger;

module/Core/test/Exception/ValidationExceptionTest.php

@@ -8,6 +8,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Laminas\InputFilter\InputFilterInterface;
 use LogicException;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use RuntimeException;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
 use Throwable;
@@ -17,6 +18,8 @@ use function print_r;
 
 class ValidationExceptionTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      * @dataProvider provideExceptions

module/Core/test/Importer/ImportedLinksProcessorTest.php

@@ -8,6 +8,7 @@ use Cake\Chronos\Chronos;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Domain\Resolver\SimpleDomainResolver;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -25,6 +26,8 @@ use function str_contains;
 
 class ImportedLinksProcessorTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ImportedLinksProcessor $processor;
     private ObjectProphecy $em;
     private ObjectProphecy $shortCodeHelper;

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

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Paginator\Adapter;
 
 use Cake\Chronos\Chronos;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\Paginator\Adapter\ShortUrlRepositoryAdapter;
@@ -13,6 +14,8 @@ use Shlinkio\Shlink\Core\Repository\ShortUrlRepositoryInterface;
 
 class ShortUrlRepositoryAdapterTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy $repo;
 
     public function setUp(): void

module/Core/test/Paginator/Adapter/VisitsForTagPaginatorAdapterTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Paginator\Adapter;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
@@ -13,6 +14,8 @@ use Shlinkio\Shlink\Core\Repository\VisitRepositoryInterface;
 
 class VisitsForTagPaginatorAdapterTest extends TestCase
 {
+    use ProphecyTrait;
+
     private VisitsForTagPaginatorAdapter $adapter;
     private ObjectProphecy $repo;
 

module/Core/test/Paginator/Adapter/VisitsPaginatorAdapterTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Core\Paginator\Adapter;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
@@ -14,6 +15,8 @@ use Shlinkio\Shlink\Core\Repository\VisitRepositoryInterface;
 
 class VisitsPaginatorAdapterTest extends TestCase
 {
+    use ProphecyTrait;
+
     private VisitsPaginatorAdapter $adapter;
     private ObjectProphecy $repo;
 

module/Core/test/Service/ShortUrl/DeleteShortUrlServiceTest.php

@@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -24,6 +25,8 @@ use function sprintf;
 
 class DeleteShortUrlServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy $em;
     private ObjectProphecy $urlResolver;
     private string $shortCode;

module/Core/test/Service/ShortUrl/ShortCodeHelperTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Service\ShortUrl;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Domain;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -14,6 +15,8 @@ use Shlinkio\Shlink\Core\Service\ShortUrl\ShortCodeHelper;
 
 class ShortCodeHelperTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ShortCodeHelper $helper;
     private ObjectProphecy $em;
     private ObjectProphecy $shortUrl;

module/Core/test/Service/ShortUrl/ShortUrlResolverTest.php

@@ -8,6 +8,7 @@ use Cake\Chronos\Chronos;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -23,6 +24,8 @@ use function range;
 
 class ShortUrlResolverTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ShortUrlResolver $urlResolver;
     private ObjectProphecy $em;
 

module/Core/test/Service/ShortUrlServiceTest.php

@@ -9,6 +9,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Tag;
@@ -24,6 +25,8 @@ use function count;
 
 class ShortUrlServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ShortUrlService $service;
     private ObjectProphecy $em;
     private ObjectProphecy $urlResolver;

module/Core/test/Service/Tag/TagServiceTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Core\Service\Tag;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Exception\TagConflictException;
@@ -17,6 +18,8 @@ use Shlinkio\Shlink\Core\Tag\TagService;
 
 class TagServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     private TagService $service;
     private ObjectProphecy $em;
     private ObjectProphecy $repo;

module/Core/test/Service/UrlShortenerTest.php

@@ -11,6 +11,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Domain\Resolver\SimpleDomainResolver;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -24,6 +25,8 @@ use Shlinkio\Shlink\Core\Util\UrlValidatorInterface;
 
 class UrlShortenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private UrlShortener $urlShortener;
     private ObjectProphecy $em;
     private ObjectProphecy $urlValidator;

module/Core/test/Service/VisitsTrackerTest.php

@@ -8,6 +8,7 @@ use Doctrine\ORM\EntityManager;
 use Laminas\Stdlib\ArrayUtils;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Shlinkio\Shlink\Common\Util\DateRange;
@@ -30,6 +31,8 @@ use function range;
 
 class VisitsTrackerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private VisitsTracker $visitsTracker;
     private ObjectProphecy $em;
     private ObjectProphecy $eventDispatcher;

module/Core/test/Util/DoctrineBatchHelperTest.php

@@ -6,12 +6,15 @@ namespace ShlinkioTest\Shlink\Core\Util;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use RuntimeException;
 use Shlinkio\Shlink\Core\Util\DoctrineBatchHelper;
 
 class DoctrineBatchHelperTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DoctrineBatchHelper $helper;
     private ObjectProphecy $em;
 

module/Core/test/Util/UrlValidatorTest.php

@@ -11,6 +11,7 @@ use GuzzleHttp\RequestOptions;
 use Laminas\Diactoros\Response;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
@@ -18,6 +19,8 @@ use Shlinkio\Shlink\Core\Util\UrlValidator;
 
 class UrlValidatorTest extends TestCase
 {
+    use ProphecyTrait;
+
     private UrlValidator $urlValidator;
     private ObjectProphecy $httpClient;
     private UrlShortenerOptions $options;

module/Core/test/Visit/VisitLocatorTest.php

@@ -9,6 +9,7 @@ use Exception;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -31,6 +32,8 @@ use function sprintf;
 
 class VisitLocatorTest extends TestCase
 {
+    use ProphecyTrait;
+
     private VisitLocator $visitService;
     private ObjectProphecy $em;
     private ObjectProphecy $repo;

module/Core/test/Visit/VisitsStatsHelperTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Visit;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
@@ -17,6 +18,8 @@ use function range;
 
 class VisitsStatsHelperTest extends TestCase
 {
+    use ProphecyTrait;
+
     private VisitsStatsHelper $helper;
     private ObjectProphecy $em;
 

module/Rest/test/Action/Domain/ListDomainsActionTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\Domain;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Entity\Domain;
@@ -14,6 +15,8 @@ use Shlinkio\Shlink\Rest\Action\Domain\ListDomainsAction;
 
 class ListDomainsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ListDomainsAction $action;
     private ObjectProphecy $domainService;
 

module/Rest/test/Action/HealthActionTest.php

@@ -10,12 +10,15 @@ use Exception;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Rest\Action\HealthAction;
 
 class HealthActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private HealthAction $action;
     private ObjectProphecy $conn;
 

module/Rest/test/Action/MercureInfoActionTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use RuntimeException;
 use Shlinkio\Shlink\Common\Mercure\JwtProviderInterface;
@@ -17,6 +18,8 @@ use Shlinkio\Shlink\Rest\Exception\MercureException;
 
 class MercureInfoActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy $provider;
 
     public function setUp(): void

module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\ServerRequest;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -20,6 +21,8 @@ use function strpos;
 
 class CreateShortUrlActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private const DOMAIN_CONFIG = [
         'schema' => 'http',
         'hostname' => 'foo.com',

module/Rest/test/Action/ShortUrl/DeleteShortUrlActionTest.php

@@ -7,12 +7,15 @@ namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
 use Shlinkio\Shlink\Rest\Action\ShortUrl\DeleteShortUrlAction;
 
 class DeleteShortUrlActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DeleteShortUrlAction $action;
     private ObjectProphecy $service;
 

module/Rest/test/Action/ShortUrl/EditShortUrlActionTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -15,6 +16,8 @@ use Shlinkio\Shlink\Rest\Action\ShortUrl\EditShortUrlAction;
 
 class EditShortUrlActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private EditShortUrlAction $action;
     private ObjectProphecy $shortUrlService;
 

module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -15,6 +16,8 @@ use Shlinkio\Shlink\Rest\Action\ShortUrl\EditShortUrlTagsAction;
 
 class EditShortUrlTagsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private EditShortUrlTagsAction $action;
     private ObjectProphecy $shortUrlService;
 

module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php

@@ -10,27 +10,27 @@ use Laminas\Diactoros\ServerRequest;
 use Laminas\Paginator\Adapter\ArrayAdapter;
 use Laminas\Paginator\Paginator;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Rest\Action\ShortUrl\ListShortUrlsAction;
 
 class ListShortUrlsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ListShortUrlsAction $action;
     private ObjectProphecy $service;
-    private ObjectProphecy $logger;
 
     public function setUp(): void
     {
         $this->service = $this->prophesize(ShortUrlService::class);
-        $this->logger = $this->prophesize(LoggerInterface::class);
 
         $this->action = new ListShortUrlsAction($this->service->reveal(), [
             'hostname' => 'doma.in',
             'schema' => 'https',
-        ], $this->logger->reveal());
+        ]);
     }
 
     /**

module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
@@ -16,6 +17,8 @@ use function strpos;
 
 class ResolveShortUrlActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ResolveShortUrlAction $action;
     private ObjectProphecy $urlResolver;
 

module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php

@@ -8,6 +8,7 @@ use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -18,6 +19,8 @@ use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 
 class SingleStepCreateShortUrlActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private SingleStepCreateShortUrlAction $action;
     private ObjectProphecy $urlShortener;
     private ObjectProphecy $apiKeyService;

module/Rest/test/Action/Tag/CreateTagsActionTest.php

@@ -7,12 +7,15 @@ namespace ShlinkioTest\Shlink\Rest\Action\Tag;
 use Doctrine\Common\Collections\ArrayCollection;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
 use Shlinkio\Shlink\Rest\Action\Tag\CreateTagsAction;
 
 class CreateTagsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CreateTagsAction $action;
     private ObjectProphecy $tagService;
 

module/Rest/test/Action/Tag/DeleteTagsActionTest.php

@@ -6,12 +6,15 @@ namespace ShlinkioTest\Shlink\Rest\Action\Tag;
 
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
 use Shlinkio\Shlink\Rest\Action\Tag\DeleteTagsAction;
 
 class DeleteTagsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DeleteTagsAction $action;
     private ObjectProphecy $tagService;
 

module/Rest/test/Action/Tag/ListTagsActionTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\Tag;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Tag\Model\TagInfo;
@@ -15,6 +16,8 @@ use Shlinkio\Shlink\Rest\Action\Tag\ListTagsAction;
 
 class ListTagsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ListTagsAction $action;
     private ObjectProphecy $tagService;
 

module/Rest/test/Action/Tag/UpdateTagActionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\Tag;
 
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
@@ -14,6 +15,8 @@ use Shlinkio\Shlink\Rest\Action\Tag\UpdateTagAction;
 
 class UpdateTagActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private UpdateTagAction $action;
     private ObjectProphecy $tagService;
 

module/Rest/test/Action/Visit/GlobalVisitsActionTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Action\Visit;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Visit\Model\VisitsStats;
 use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
@@ -14,6 +15,8 @@ use Shlinkio\Shlink\Rest\Action\Visit\GlobalVisitsAction;
 
 class GlobalVisitsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private GlobalVisitsAction $action;
     private ObjectProphecy $helper;
 

module/Rest/test/Action/Visit/ShortUrlVisitsActionTest.php

@@ -10,6 +10,7 @@ use Laminas\Paginator\Adapter\ArrayAdapter;
 use Laminas\Paginator\Paginator;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
@@ -19,6 +20,8 @@ use Shlinkio\Shlink\Rest\Action\Visit\ShortUrlVisitsAction;
 
 class ShortUrlVisitsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ShortUrlVisitsAction $action;
     private ObjectProphecy $visitsTracker;
 

module/Rest/test/Action/Visit/TagVisitsActionTest.php

@@ -9,6 +9,7 @@ use Laminas\Paginator\Adapter\ArrayAdapter;
 use Laminas\Paginator\Paginator;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Service\VisitsTracker;
@@ -16,6 +17,8 @@ use Shlinkio\Shlink\Rest\Action\Visit\TagVisitsAction;
 
 class TagVisitsActionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private TagVisitsAction $action;
     private ObjectProphecy $visitsTracker;
 

module/Rest/test/Authentication/AuthenticationPluginManagerFactoryTest.php

@@ -6,12 +6,15 @@ namespace ShlinkioTest\Shlink\Rest\Authentication;
 
 use Laminas\ServiceManager\ServiceManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Shlinkio\Shlink\Rest\Authentication\AuthenticationPluginManager;
 use Shlinkio\Shlink\Rest\Authentication\AuthenticationPluginManagerFactory;
 use Shlinkio\Shlink\Rest\Authentication\Plugin\AuthenticationPluginInterface;
 
 class AuthenticationPluginManagerFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     private AuthenticationPluginManagerFactory $factory;
 
     public function setUp(): void

module/Rest/test/Authentication/Plugin/ApiKeyHeaderPluginTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Authentication\Plugin;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Rest\Authentication\Plugin\ApiKeyHeaderPlugin;
@@ -15,6 +16,8 @@ use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 
 class ApiKeyHeaderPluginTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ApiKeyHeaderPlugin $plugin;
     private ObjectProphecy $apiKeyService;
 

module/Rest/test/Authentication/RequestToAuthPluginTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Rest\Authentication;
 
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Rest\Authentication\AuthenticationPluginManagerInterface;
 use Shlinkio\Shlink\Rest\Authentication\Plugin\ApiKeyHeaderPlugin;
@@ -18,6 +19,8 @@ use function sprintf;
 
 class RequestToAuthPluginTest extends TestCase
 {
+    use ProphecyTrait;
+
     private RequestToHttpAuthPlugin $requestToPlugin;
     private ObjectProphecy $pluginManager;
 

module/Rest/test/Middleware/AuthenticationMiddlewareTest.php

@@ -11,12 +11,12 @@ use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Rest\Action\HealthAction;
 use Shlinkio\Shlink\Rest\Authentication\Plugin\AuthenticationPluginInterface;
 use Shlinkio\Shlink\Rest\Authentication\RequestToHttpAuthPluginInterface;
@@ -26,20 +26,15 @@ use function Laminas\Stratigility\middleware;
 
 class AuthenticationMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private AuthenticationMiddleware $middleware;
     private ObjectProphecy $requestToPlugin;
-    private ObjectProphecy $logger;
 
     public function setUp(): void
     {
         $this->requestToPlugin = $this->prophesize(RequestToHttpAuthPluginInterface::class);
-        $this->logger = $this->prophesize(LoggerInterface::class);
+        $this->middleware = new AuthenticationMiddleware($this->requestToPlugin->reveal(), [HealthAction::class]);
-
-        $this->middleware = new AuthenticationMiddleware(
-            $this->requestToPlugin->reveal(),
-            [HealthAction::class],
-            $this->logger->reveal(),
-        );
     }
 
     /**

module/Rest/test/Middleware/BodyParserMiddlewareTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\ServerRequest;
 use Laminas\Diactoros\Stream;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ProphecyInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -18,6 +19,8 @@ use function array_shift;
 
 class BodyParserMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private BodyParserMiddleware $middleware;
 
     public function setUp(): void

module/Rest/test/Middleware/CrossDomainMiddlewareTest.php

@@ -10,6 +10,7 @@ use Mezzio\Router\Route;
 use Mezzio\Router\RouteResult;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Authentication;
@@ -19,6 +20,8 @@ use function Laminas\Stratigility\middleware;
 
 class CrossDomainMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CrossDomainMiddleware $middleware;
     private ObjectProphecy $handler;
 

module/Rest/test/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddlewareTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -16,6 +17,8 @@ use Shlinkio\Shlink\Rest\Middleware\ShortUrl\CreateShortUrlContentNegotiationMid
 
 class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private CreateShortUrlContentNegotiationMiddleware $middleware;
     private ObjectProphecy $requestHandler;
 

module/Rest/test/Middleware/ShortUrl/DefaultShortCodesLengthMiddlewareTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -17,6 +18,8 @@ use Shlinkio\Shlink\Rest\Middleware\ShortUrl\DefaultShortCodesLengthMiddleware;
 
 class DefaultShortCodesLengthMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DefaultShortCodesLengthMiddleware $middleware;
     private ObjectProphecy $handler;
 

module/Rest/test/Middleware/ShortUrl/DropDefaultDomainFromRequestMiddlewareTest.php

@@ -9,6 +9,7 @@ use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -16,6 +17,8 @@ use Shlinkio\Shlink\Rest\Middleware\ShortUrl\DropDefaultDomainFromRequestMiddlew
 
 class DropDefaultDomainFromRequestMiddlewareTest extends TestCase
 {
+    use ProphecyTrait;
+
     private DropDefaultDomainFromRequestMiddleware $middleware;
     private ObjectProphecy $next;
 

module/Rest/test/Service/ApiKeyServiceTest.php

@@ -9,6 +9,7 @@ use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
@@ -16,6 +17,8 @@ use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 
 class ApiKeyServiceTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ApiKeyService $service;
     private ObjectProphecy $em;