From 36be44e7b5f2ce35f0177d17efe40100f8fd6530 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 8 Feb 2021 19:50:17 +0100 Subject: [PATCH] Moved VisitsTracker service to Visit namespace --- module/Core/config/dependencies.config.php | 8 ++++---- module/Core/src/Action/AbstractTrackingAction.php | 2 +- module/Core/src/Action/RedirectAction.php | 2 +- module/Core/src/{Service => Visit}/VisitsTracker.php | 2 +- .../src/{Service => Visit}/VisitsTrackerInterface.php | 2 +- module/Core/test/Action/PixelActionTest.php | 2 +- module/Core/test/Action/RedirectActionTest.php | 2 +- module/Core/test/{Service => Visit}/VisitsTrackerTest.php | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename module/Core/src/{Service => Visit}/VisitsTracker.php (96%) rename module/Core/src/{Service => Visit}/VisitsTrackerInterface.php (84%) rename module/Core/test/{Service => Visit}/VisitsTrackerTest.php (93%) diff --git a/module/Core/config/dependencies.config.php b/module/Core/config/dependencies.config.php index e742ad43..0f182b1b 100644 --- a/module/Core/config/dependencies.config.php +++ b/module/Core/config/dependencies.config.php @@ -24,7 +24,7 @@ return [ Options\UrlShortenerOptions::class => ConfigAbstractFactory::class, Service\UrlShortener::class => ConfigAbstractFactory::class, - Service\VisitsTracker::class => ConfigAbstractFactory::class, + Visit\VisitsTracker::class => ConfigAbstractFactory::class, Service\ShortUrlService::class => ConfigAbstractFactory::class, Visit\VisitLocator::class => ConfigAbstractFactory::class, Visit\VisitsStatsHelper::class => ConfigAbstractFactory::class, @@ -75,7 +75,7 @@ return [ ShortUrl\Resolver\PersistenceShortUrlRelationResolver::class, Service\ShortUrl\ShortCodeHelper::class, ], - Service\VisitsTracker::class => [ + Visit\VisitsTracker::class => [ 'em', EventDispatcherInterface::class, 'config.url_shortener.anonymize_remote_addr', @@ -104,14 +104,14 @@ return [ Action\RedirectAction::class => [ Service\ShortUrl\ShortUrlResolver::class, - Service\VisitsTracker::class, + Visit\VisitsTracker::class, Options\AppOptions::class, Util\RedirectResponseHelper::class, 'Logger_Shlink', ], Action\PixelAction::class => [ Service\ShortUrl\ShortUrlResolver::class, - Service\VisitsTracker::class, + Visit\VisitsTracker::class, Options\AppOptions::class, 'Logger_Shlink', ], diff --git a/module/Core/src/Action/AbstractTrackingAction.php b/module/Core/src/Action/AbstractTrackingAction.php index 86eb197b..b6a119b2 100644 --- a/module/Core/src/Action/AbstractTrackingAction.php +++ b/module/Core/src/Action/AbstractTrackingAction.php @@ -20,7 +20,7 @@ use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier; use Shlinkio\Shlink\Core\Model\Visitor; use Shlinkio\Shlink\Core\Options\AppOptions; use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface; -use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; +use Shlinkio\Shlink\Core\Visit\VisitsTrackerInterface; use function array_key_exists; use function array_merge; diff --git a/module/Core/src/Action/RedirectAction.php b/module/Core/src/Action/RedirectAction.php index 0fc6232d..d346456b 100644 --- a/module/Core/src/Action/RedirectAction.php +++ b/module/Core/src/Action/RedirectAction.php @@ -11,8 +11,8 @@ use Psr\Http\Server\RequestHandlerInterface; use Psr\Log\LoggerInterface; use Shlinkio\Shlink\Core\Options; use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface; -use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface; +use Shlinkio\Shlink\Core\Visit\VisitsTrackerInterface; class RedirectAction extends AbstractTrackingAction implements StatusCodeInterface { diff --git a/module/Core/src/Service/VisitsTracker.php b/module/Core/src/Visit/VisitsTracker.php similarity index 96% rename from module/Core/src/Service/VisitsTracker.php rename to module/Core/src/Visit/VisitsTracker.php index daf4aa24..e4a9f304 100644 --- a/module/Core/src/Service/VisitsTracker.php +++ b/module/Core/src/Visit/VisitsTracker.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Shlinkio\Shlink\Core\Service; +namespace Shlinkio\Shlink\Core\Visit; use Doctrine\ORM; use Psr\EventDispatcher\EventDispatcherInterface; diff --git a/module/Core/src/Service/VisitsTrackerInterface.php b/module/Core/src/Visit/VisitsTrackerInterface.php similarity index 84% rename from module/Core/src/Service/VisitsTrackerInterface.php rename to module/Core/src/Visit/VisitsTrackerInterface.php index c468cf0e..75f92434 100644 --- a/module/Core/src/Service/VisitsTrackerInterface.php +++ b/module/Core/src/Visit/VisitsTrackerInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Shlinkio\Shlink\Core\Service; +namespace Shlinkio\Shlink\Core\Visit; use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Model\Visitor; diff --git a/module/Core/test/Action/PixelActionTest.php b/module/Core/test/Action/PixelActionTest.php index cae74926..065cc2c4 100644 --- a/module/Core/test/Action/PixelActionTest.php +++ b/module/Core/test/Action/PixelActionTest.php @@ -16,7 +16,7 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier; use Shlinkio\Shlink\Core\Options\AppOptions; use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface; -use Shlinkio\Shlink\Core\Service\VisitsTracker; +use Shlinkio\Shlink\Core\Visit\VisitsTracker; class PixelActionTest extends TestCase { diff --git a/module/Core/test/Action/RedirectActionTest.php b/module/Core/test/Action/RedirectActionTest.php index 411d9a50..f869e2c4 100644 --- a/module/Core/test/Action/RedirectActionTest.php +++ b/module/Core/test/Action/RedirectActionTest.php @@ -19,8 +19,8 @@ use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException; use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier; use Shlinkio\Shlink\Core\Options; use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface; -use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface; use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface; +use Shlinkio\Shlink\Core\Visit\VisitsTrackerInterface; use function array_key_exists; diff --git a/module/Core/test/Service/VisitsTrackerTest.php b/module/Core/test/Visit/VisitsTrackerTest.php similarity index 93% rename from module/Core/test/Service/VisitsTrackerTest.php rename to module/Core/test/Visit/VisitsTrackerTest.php index 4807dc41..a7ca98c3 100644 --- a/module/Core/test/Service/VisitsTrackerTest.php +++ b/module/Core/test/Visit/VisitsTrackerTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace ShlinkioTest\Shlink\Core\Service; +namespace ShlinkioTest\Shlink\Core\Visit; use Doctrine\ORM\EntityManager; use PHPUnit\Framework\TestCase; @@ -14,7 +14,7 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl; use Shlinkio\Shlink\Core\Entity\Visit; use Shlinkio\Shlink\Core\EventDispatcher\Event\ShortUrlVisited; use Shlinkio\Shlink\Core\Model\Visitor; -use Shlinkio\Shlink\Core\Service\VisitsTracker; +use Shlinkio\Shlink\Core\Visit\VisitsTracker; class VisitsTrackerTest extends TestCase {