Added more stricter types for mocks

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

@@ -24,8 +24,8 @@ class GetDomainVisitsCommandTest extends TestCase
     use CliTestUtilsTrait;
 
     private CommandTester $commandTester;
-    private MockObject $visitsHelper;
+    private MockObject & VisitsStatsHelperInterface $visitsHelper;
-    private MockObject $stringifier;
+    private MockObject & ShortUrlStringifierInterface $stringifier;
 
     protected function setUp(): void
     {

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

@@ -30,7 +30,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
     use CliTestUtilsTrait;
 
     private CommandTester $commandTester;
-    private MockObject $visitsHelper;
+    private MockObject & VisitsStatsHelperInterface $visitsHelper;
 
     protected function setUp(): void
     {

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

@@ -24,8 +24,8 @@ class GetTagVisitsCommandTest extends TestCase
     use CliTestUtilsTrait;
 
     private CommandTester $commandTester;
-    private MockObject $visitsHelper;
+    private MockObject & VisitsStatsHelperInterface $visitsHelper;
-    private MockObject $stringifier;
+    private MockObject & ShortUrlStringifierInterface $stringifier;
 
     protected function setUp(): void
     {

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

@@ -24,8 +24,8 @@ class GetNonOrphanVisitsCommandTest extends TestCase
     use CliTestUtilsTrait;
 
     private CommandTester $commandTester;
-    private MockObject $visitsHelper;
+    private MockObject & VisitsStatsHelperInterface $visitsHelper;
-    private MockObject $stringifier;
+    private MockObject & ShortUrlStringifierInterface $stringifier;
 
     protected function setUp(): void
     {

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

@@ -22,7 +22,7 @@ class GetOrphanVisitsCommandTest extends TestCase
     use CliTestUtilsTrait;
 
     private CommandTester $commandTester;
-    private MockObject $visitsHelper;
+    private MockObject & VisitsStatsHelperInterface $visitsHelper;
 
     protected function setUp(): void
     {

module/CLI/test/GeoLite/GeolocationDbUpdaterTest.php

@@ -23,9 +23,9 @@ use function range;
 
 class GeolocationDbUpdaterTest extends TestCase
 {
-    private MockObject $dbUpdater;
+    private MockObject & DbUpdaterInterface $dbUpdater;
-    private MockObject $geoLiteDbReader;
+    private MockObject & Reader $geoLiteDbReader;
-    private MockObject $lock;
+    private MockObject & Lock\LockInterface $lock;
 
     protected function setUp(): void
     {

module/Core/test/EventDispatcher/LocateUnlocatedVisitsTest.php

@@ -17,8 +17,8 @@ use Shlinkio\Shlink\IpGeolocation\Model\Location;
 class LocateUnlocatedVisitsTest extends TestCase
 {
     private LocateUnlocatedVisits $listener;
-    private MockObject $locator;
+    private MockObject & VisitLocatorInterface $locator;
-    private MockObject $visitToLocation;
+    private MockObject & VisitToLocationHelperInterface $visitToLocation;
 
     protected function setUp(): void
     {

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

@@ -22,10 +22,10 @@ use Throwable;
 
 class NotifyVisitToRedisTest extends TestCase
 {
-    private MockObject $helper;
+    private MockObject & PublishingHelperInterface $helper;
-    private MockObject $updatesGenerator;
+    private MockObject & PublishingUpdatesGeneratorInterface $updatesGenerator;
-    private MockObject $em;
+    private MockObject & EntityManagerInterface $em;
-    private MockObject $logger;
+    private MockObject & LoggerInterface $logger;
 
     protected function setUp(): void
     {

module/Core/test/ShortUrl/DeleteShortUrlServiceTest.php

@@ -23,8 +23,8 @@ use function sprintf;
 
 class DeleteShortUrlServiceTest extends TestCase
 {
-    private MockObject $em;
+    private MockObject & EntityManagerInterface $em;
-    private MockObject $urlResolver;
+    private MockObject & ShortUrlResolverInterface $urlResolver;
     private string $shortCode;
 
     protected function setUp(): void

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

@@ -16,8 +16,8 @@ use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlRepository;
 class ShortCodeUniquenessHelperTest extends TestCase
 {
     private ShortCodeUniquenessHelper $helper;
-    private MockObject $em;
+    private MockObject & EntityManagerInterface $em;
-    private MockObject $shortUrl;
+    private MockObject & ShortUrl $shortUrl;
 
     protected function setUp(): void
     {

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

@@ -19,7 +19,7 @@ use function Functional\const_function;
 
 class TrimTrailingSlashMiddlewareTest extends TestCase
 {
-    private MockObject $requestHandler;
+    private MockObject & RequestHandlerInterface $requestHandler;
 
     protected function setUp(): void
     {

module/Core/test/ShortUrl/ShortUrlResolverTest.php

@@ -28,8 +28,8 @@ class ShortUrlResolverTest extends TestCase
     use ApiKeyHelpersTrait;
 
     private ShortUrlResolver $urlResolver;
-    private MockObject $em;
+    private MockObject & EntityManagerInterface $em;
-    private MockObject $repo;
+    private MockObject & ShortUrlRepositoryInterface $repo;
 
     protected function setUp(): void
     {

module/Core/test/ShortUrl/ShortUrlServiceTest.php

@@ -27,9 +27,9 @@ class ShortUrlServiceTest extends TestCase
     use ApiKeyHelpersTrait;
 
     private ShortUrlService $service;
-    private MockObject $em;
+    private MockObject & EntityManagerInterface $em;
-    private MockObject $urlResolver;
+    private MockObject & ShortUrlResolverInterface $urlResolver;
-    private MockObject $titleResolutionHelper;
+    private MockObject & ShortUrlTitleResolutionHelperInterface $titleResolutionHelper;
 
     protected function setUp(): void
     {

module/Core/test/ShortUrl/UrlShortenerTest.php

@@ -21,9 +21,9 @@ use Shlinkio\Shlink\Core\ShortUrl\UrlShortener;
 class UrlShortenerTest extends TestCase
 {
     private UrlShortener $urlShortener;
-    private MockObject $em;
+    private MockObject & EntityManager $em;
-    private MockObject $titleResolutionHelper;
+    private MockObject & ShortUrlTitleResolutionHelperInterface $titleResolutionHelper;
-    private MockObject $shortCodeHelper;
+    private MockObject & ShortCodeUniquenessHelperInterface $shortCodeHelper;
 
     protected function setUp(): void
     {

module/Core/test/Visit/Geolocation/VisitToLocationHelperTest.php

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 class VisitToLocationHelperTest extends TestCase
 {
     private VisitToLocationHelper $helper;
-    private MockObject $ipLocationResolver;
+    private MockObject & IpLocationResolverInterface $ipLocationResolver;
 
     protected function setUp(): void
     {

module/Rest/test/ApiKey/InitialApiKeyDelegatorTest.php

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
 class InitialApiKeyDelegatorTest extends TestCase
 {
     private InitialApiKeyDelegator $delegator;
-    private MockObject $container;
+    private MockObject & ContainerInterface $container;
 
     protected function setUp(): void
     {

module/Rest/test/Middleware/AuthenticationMiddlewareTest.php

@@ -28,8 +28,8 @@ use function Laminas\Stratigility\middleware;
 class AuthenticationMiddlewareTest extends TestCase
 {
     private AuthenticationMiddleware $middleware;
-    private MockObject $apiKeyService;
+    private MockObject & ApiKeyServiceInterface $apiKeyService;
-    private MockObject $handler;
+    private MockObject & RequestHandlerInterface $handler;
 
     protected function setUp(): void
     {

module/Rest/test/Middleware/ErrorHandler/BackwardsCompatibleProblemDetailsHandlerTest.php

@@ -23,6 +23,7 @@ class BackwardsCompatibleProblemDetailsHandlerTest extends TestCase
     }
 
     /**
+     * @param class-string<Throwable> $expectedException
      * @test
      * @dataProvider provideExceptions
      */