Added stricter types for mocks

This commit is contained in:
Alejandro Celaya
2022-10-24 19:53:13 +02:00
parent aeafb244d9
commit 51f243995a
87 changed files with 156 additions and 152 deletions

View File

@@ -18,8 +18,8 @@ use Shlinkio\Shlink\Core\Visit\RequestTrackerInterface;
class PixelActionTest extends TestCase
{
private PixelAction $action;
private MockObject $urlResolver;
private MockObject $requestTracker;
private MockObject & ShortUrlResolverInterface $urlResolver;
private MockObject & RequestTrackerInterface $requestTracker;
protected function setUp(): void
{

View File

@@ -30,7 +30,7 @@ class QrCodeActionTest extends TestCase
private const WHITE = 0xFFFFFF;
private const BLACK = 0x0;
private MockObject $urlResolver;
private MockObject & ShortUrlResolverInterface $urlResolver;
protected function setUp(): void
{

View File

@@ -23,9 +23,9 @@ class RedirectActionTest extends TestCase
private const LONG_URL = 'https://domain.com/foo/bar?some=thing';
private RedirectAction $action;
private MockObject $urlResolver;
private MockObject $requestTracker;
private MockObject $redirectRespHelper;
private MockObject & ShortUrlResolverInterface $urlResolver;
private MockObject & RequestTrackerInterface $requestTracker;
private MockObject & RedirectResponseHelperInterface $redirectRespHelper;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\Crawling\CrawlingHelperInterface;
class RobotsActionTest extends TestCase
{
private RobotsAction $action;
private MockObject $helper;
private MockObject & CrawlingHelperInterface $helper;
protected function setUp(): void
{

View File

@@ -24,7 +24,7 @@ use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface;
class NotFoundRedirectResolverTest extends TestCase
{
private NotFoundRedirectResolver $resolver;
private MockObject $helper;
private MockObject & RedirectResponseHelperInterface $helper;
protected function setUp(): void
{

View File

@@ -14,7 +14,7 @@ use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlRepositoryInterface;
class CrawlingHelperTest extends TestCase
{
private CrawlingHelper $helper;
private MockObject $em;
private MockObject & EntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -21,7 +21,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class DomainServiceTest extends TestCase
{
private DomainService $domainService;
private MockObject $em;
private MockObject & EntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -22,9 +22,9 @@ class NotFoundRedirectHandlerTest extends TestCase
{
private NotFoundRedirectHandler $middleware;
private NotFoundRedirectOptions $redirectOptions;
private MockObject $resolver;
private MockObject $domainService;
private MockObject $next;
private MockObject & NotFoundRedirectResolverInterface $resolver;
private MockObject & DomainServiceInterface $domainService;
private MockObject & RequestHandlerInterface $next;
private ServerRequestInterface $req;
protected function setUp(): void

View File

@@ -17,8 +17,8 @@ class NotFoundTrackerMiddlewareTest extends TestCase
{
private NotFoundTrackerMiddleware $middleware;
private ServerRequestInterface $request;
private MockObject $handler;
private MockObject $requestTracker;
private MockObject & RequestHandlerInterface $handler;
private MockObject & RequestTrackerInterface $requestTracker;
protected function setUp(): void
{

View File

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Core\ErrorHandler\NotFoundTypeResolverMiddleware;
class NotFoundTypeResolverMiddlewareTest extends TestCase
{
private NotFoundTypeResolverMiddleware $middleware;
private MockObject $handler;
private MockObject & RequestHandlerInterface $handler;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\EventDispatcher\CloseDbConnectionEventListenerDelegator
class CloseDbConnectionEventListenerDelegatorTest extends TestCase
{
private CloseDbConnectionEventListenerDelegator $delegator;
private MockObject $container;
private MockObject & ContainerInterface $container;
protected function setUp(): void
{

View File

@@ -15,7 +15,7 @@ use Throwable;
class CloseDbConnectionEventListenerTest extends TestCase
{
private MockObject $em;
private MockObject & ReopeningEntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -26,11 +26,11 @@ use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
class LocateVisitTest extends TestCase
{
private LocateVisit $locateVisit;
private MockObject $ipLocationResolver;
private MockObject $em;
private MockObject $logger;
private MockObject $eventDispatcher;
private MockObject $dbUpdater;
private MockObject & IpLocationResolverInterface $ipLocationResolver;
private MockObject & EntityManagerInterface $em;
private MockObject & LoggerInterface $logger;
private MockObject & EventDispatcherInterface $eventDispatcher;
private MockObject & DbUpdaterInterface $dbUpdater;
protected function setUp(): void
{

View File

@@ -19,10 +19,10 @@ use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
class NotifyNewShortUrlToMercureTest extends TestCase
{
private NotifyNewShortUrlToMercure $listener;
private MockObject $helper;
private MockObject $updatesGenerator;
private MockObject $em;
private MockObject $logger;
private MockObject & PublishingHelperInterface $helper;
private MockObject & PublishingUpdatesGeneratorInterface $updatesGenerator;
private MockObject & EntityManagerInterface $em;
private MockObject & LoggerInterface $logger;
protected function setUp(): void
{

View File

@@ -22,10 +22,10 @@ use Shlinkio\Shlink\Core\Visit\Model\VisitType;
class NotifyVisitToMercureTest extends TestCase
{
private NotifyVisitToMercure $listener;
private MockObject $helper;
private MockObject $updatesGenerator;
private MockObject $em;
private MockObject $logger;
private MockObject & PublishingHelperInterface $helper;
private MockObject & PublishingUpdatesGeneratorInterface $updatesGenerator;
private MockObject & EntityManagerInterface $em;
private MockObject & LoggerInterface $logger;
protected function setUp(): void
{

View File

@@ -30,9 +30,9 @@ use function Functional\contains;
class NotifyVisitToWebHooksTest extends TestCase
{
private MockObject $httpClient;
private MockObject $em;
private MockObject $logger;
private MockObject & ClientInterface $httpClient;
private MockObject & EntityManagerInterface $em;
private MockObject & LoggerInterface $logger;
protected function setUp(): void
{

View File

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

View File

@@ -31,10 +31,10 @@ use function Functional\noop;
class NotifyVisitToRabbitMqTest extends TestCase
{
private MockObject $helper;
private MockObject $updatesGenerator;
private MockObject $em;
private MockObject $logger;
private MockObject & PublishingHelperInterface $helper;
private MockObject & PublishingUpdatesGeneratorInterface $updatesGenerator;
private MockObject & EntityManagerInterface $em;
private MockObject & LoggerInterface $logger;
protected function setUp(): void
{

View File

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

View File

@@ -19,9 +19,9 @@ use function Functional\map;
class UpdateGeoLiteDbTest extends TestCase
{
private UpdateGeoLiteDb $listener;
private MockObject $dbUpdater;
private MockObject $logger;
private MockObject $eventDispatcher;
private MockObject & GeolocationDbUpdaterInterface $dbUpdater;
private MockObject & LoggerInterface $logger;
private MockObject & EventDispatcherInterface $eventDispatcher;
protected function setUp(): void
{

View File

@@ -32,10 +32,10 @@ use function str_contains;
class ImportedLinksProcessorTest extends TestCase
{
private ImportedLinksProcessor $processor;
private MockObject $em;
private MockObject $shortCodeHelper;
private MockObject $repo;
private MockObject $io;
private MockObject & EntityManagerInterface $em;
private MockObject & ShortCodeUniquenessHelperInterface $shortCodeHelper;
private MockObject & ShortUrlRepositoryInterface $repo;
private MockObject & StyleInterface $io;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\Util\UrlValidatorInterface;
class ShortUrlTitleResolutionHelperTest extends TestCase
{
private ShortUrlTitleResolutionHelper $helper;
private MockObject $urlValidator;
private MockObject & UrlValidatorInterface $urlValidator;
protected function setUp(): void
{

View File

@@ -30,11 +30,11 @@ use function str_starts_with;
class ExtraPathRedirectMiddlewareTest extends TestCase
{
private MockObject $resolver;
private MockObject $requestTracker;
private MockObject $redirectionBuilder;
private MockObject $redirectResponseHelper;
private MockObject $handler;
private MockObject & ShortUrlResolverInterface $resolver;
private MockObject & RequestTrackerInterface $requestTracker;
private MockObject & ShortUrlRedirectionBuilderInterface $redirectionBuilder;
private MockObject & RedirectResponseHelperInterface $redirectResponseHelper;
private MockObject & RequestHandlerInterface $handler;
protected function setUp(): void
{

View File

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class ShortUrlRepositoryAdapterTest extends TestCase
{
private MockObject $repo;
private MockObject & ShortUrlRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -19,7 +19,7 @@ use function count;
class PersistenceShortUrlRelationResolverTest extends TestCase
{
private PersistenceShortUrlRelationResolver $resolver;
private MockObject $em;
private MockObject & EntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\Tag\Repository\TagRepositoryInterface;
class TagsInfoPaginatorAdapterTest extends TestCase
{
private TagsInfoPaginatorAdapter $adapter;
private MockObject $repo;
private MockObject & TagRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\Tag\Repository\TagRepositoryInterface;
class TagsPaginatorAdapterTest extends TestCase
{
private TagsPaginatorAdapter $adapter;
private MockObject $repo;
private MockObject & TagRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -27,8 +27,8 @@ class TagServiceTest extends TestCase
use ApiKeyHelpersTrait;
private TagService $service;
private MockObject $em;
private MockObject $repo;
private MockObject & EntityManagerInterface $em;
private MockObject & TagRepository $repo;
protected function setUp(): void
{

View File

@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Core\Util\DoctrineBatchHelper;
class DoctrineBatchHelperTest extends TestCase
{
private DoctrineBatchHelper $helper;
private MockObject $em;
private MockObject & EntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -20,7 +20,7 @@ use Shlinkio\Shlink\Core\Util\UrlValidator;
class UrlValidatorTest extends TestCase
{
private MockObject $httpClient;
private MockObject & ClientInterface $httpClient;
protected function setUp(): void
{

View File

@@ -30,8 +30,8 @@ use function sprintf;
class VisitLocatorTest extends TestCase
{
private VisitLocator $visitService;
private MockObject $em;
private MockObject $repo;
private MockObject & EntityManager $em;
private MockObject & VisitRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -18,7 +18,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class NonOrphanVisitsPaginatorAdapterTest extends TestCase
{
private NonOrphanVisitsPaginatorAdapter $adapter;
private MockObject $repo;
private MockObject & VisitRepositoryInterface $repo;
private VisitsParams $params;
private ApiKey $apiKey;

View File

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Core\Visit\Repository\VisitRepositoryInterface;
class OrphanVisitsPaginatorAdapterTest extends TestCase
{
private OrphanVisitsPaginatorAdapter $adapter;
private MockObject $repo;
private MockObject & VisitRepositoryInterface $repo;
private VisitsParams $params;
protected function setUp(): void

View File

@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class ShortUrlVisitsPaginatorAdapterTest extends TestCase
{
private MockObject $repo;
private MockObject & VisitRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -16,7 +16,7 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
class VisitsForTagPaginatorAdapterTest extends TestCase
{
private MockObject $repo;
private MockObject & VisitRepositoryInterface $repo;
protected function setUp(): void
{

View File

@@ -23,8 +23,8 @@ class RequestTrackerTest extends TestCase
private const LONG_URL = 'https://domain.com/foo/bar?some=thing';
private RequestTracker $requestTracker;
private MockObject $notFoundType;
private MockObject $visitsTracker;
private MockObject & VisitsTrackerInterface $visitsTracker;
private MockObject & NotFoundType $notFoundType;
private ServerRequestInterface $request;
protected function setUp(): void

View File

@@ -38,7 +38,7 @@ class VisitsStatsHelperTest extends TestCase
use ApiKeyHelpersTrait;
private VisitsStatsHelper $helper;
private MockObject $em;
private MockObject & EntityManagerInterface $em;
protected function setUp(): void
{

View File

@@ -17,8 +17,8 @@ use Shlinkio\Shlink\Core\Visit\VisitsTracker;
class VisitsTrackerTest extends TestCase
{
private MockObject $em;
private MockObject $eventDispatcher;
private MockObject & EntityManager $em;
private MockObject & EventDispatcherInterface $eventDispatcher;
protected function setUp(): void
{