diff --git a/module/CLI/config/cli.config.php b/module/CLI/config/cli.config.php index 84969d1a..2edbae99 100644 --- a/module/CLI/config/cli.config.php +++ b/module/CLI/config/cli.config.php @@ -14,7 +14,7 @@ return [ Command\ShortUrl\GeneratePreviewCommand::NAME => Command\ShortUrl\GeneratePreviewCommand::class, Command\ShortUrl\DeleteShortUrlCommand::NAME => Command\ShortUrl\DeleteShortUrlCommand::class, - Command\Visit\ProcessVisitsCommand::NAME => Command\Visit\ProcessVisitsCommand::class, + Command\Visit\LocateVisitsCommand::NAME => Command\Visit\LocateVisitsCommand::class, Command\Visit\UpdateDbCommand::NAME => Command\Visit\UpdateDbCommand::class, Command\Config\GenerateCharsetCommand::NAME => Command\Config\GenerateCharsetCommand::class, diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php index 7c34f580..294b7f83 100644 --- a/module/CLI/config/dependencies.config.php +++ b/module/CLI/config/dependencies.config.php @@ -26,7 +26,7 @@ return [ Command\ShortUrl\GeneratePreviewCommand::class => ConfigAbstractFactory::class, Command\ShortUrl\DeleteShortUrlCommand::class => ConfigAbstractFactory::class, - Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class, + Command\Visit\LocateVisitsCommand::class => ConfigAbstractFactory::class, Command\Visit\UpdateDbCommand::class => ConfigAbstractFactory::class, Command\Config\GenerateCharsetCommand::class => InvokableFactory::class, @@ -51,7 +51,7 @@ return [ Command\ShortUrl\GeneratePreviewCommand::class => [Service\ShortUrlService::class, PreviewGenerator::class], Command\ShortUrl\DeleteShortUrlCommand::class => [Service\ShortUrl\DeleteShortUrlService::class], - Command\Visit\ProcessVisitsCommand::class => [ + Command\Visit\LocateVisitsCommand::class => [ Service\VisitService::class, IpLocationResolverInterface::class, Lock\Factory::class, diff --git a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php b/module/CLI/src/Command/Visit/LocateVisitsCommand.php similarity index 94% rename from module/CLI/src/Command/Visit/ProcessVisitsCommand.php rename to module/CLI/src/Command/Visit/LocateVisitsCommand.php index e3db15d0..6f34625b 100644 --- a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php +++ b/module/CLI/src/Command/Visit/LocateVisitsCommand.php @@ -20,9 +20,10 @@ use Symfony\Component\Lock\Factory as Locker; use function sprintf; -class ProcessVisitsCommand extends Command +class LocateVisitsCommand extends Command { - public const NAME = 'visit:process'; + public const NAME = 'visit:locate'; + public const ALIASES = ['visit:process']; /** @var VisitServiceInterface */ private $visitService; @@ -48,7 +49,8 @@ class ProcessVisitsCommand extends Command { $this ->setName(self::NAME) - ->setDescription('Processes visits where location is not set yet'); + ->setAliases(self::ALIASES) + ->setDescription('Resolves visits origin locations.'); } protected function execute(InputInterface $input, OutputInterface $output): ?int diff --git a/module/CLI/src/Command/Visit/UpdateDbCommand.php b/module/CLI/src/Command/Visit/UpdateDbCommand.php index af032e96..3882b2c6 100644 --- a/module/CLI/src/Command/Visit/UpdateDbCommand.php +++ b/module/CLI/src/Command/Visit/UpdateDbCommand.php @@ -15,6 +15,7 @@ use Symfony\Component\Console\Style\SymfonyStyle; use function sprintf; +/** @deprecated */ class UpdateDbCommand extends Command { public const NAME = 'visit:update-db'; @@ -32,7 +33,7 @@ class UpdateDbCommand extends Command { $this ->setName(self::NAME) - ->setDescription('Updates the GeoLite2 database file used to geolocate IP addresses') + ->setDescription('[DEPRECATED] Updates the GeoLite2 database file used to geolocate IP addresses') ->setHelp( 'The GeoLite2 database is updated first Tuesday every month, so this command should be ideally run ' . 'every first Wednesday' diff --git a/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php b/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php similarity index 97% rename from module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php rename to module/CLI/test/Command/Visit/LocateVisitsCommandTest.php index a28a880a..af536383 100644 --- a/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php +++ b/module/CLI/test/Command/Visit/LocateVisitsCommandTest.php @@ -6,7 +6,7 @@ namespace ShlinkioTest\Shlink\CLI\Command\Visit; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\Prophecy\ObjectProphecy; -use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand; +use Shlinkio\Shlink\CLI\Command\Visit\LocateVisitsCommand; use Shlinkio\Shlink\Common\Exception\WrongIpException; use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver; use Shlinkio\Shlink\Common\IpGeolocation\Model\Location; @@ -24,7 +24,7 @@ use Symfony\Component\Lock; use function array_shift; use function sprintf; -class ProcessVisitsCommandTest extends TestCase +class LocateVisitsCommandTest extends TestCase { /** @var CommandTester */ private $commandTester; @@ -49,7 +49,7 @@ class ProcessVisitsCommandTest extends TestCase }); $this->locker->createLock(Argument::type('string'))->willReturn($this->lock->reveal()); - $command = new ProcessVisitsCommand( + $command = new LocateVisitsCommand( $this->visitService->reveal(), $this->ipResolver->reveal(), $this->locker->reveal() @@ -176,7 +176,7 @@ class ProcessVisitsCommandTest extends TestCase $output = $this->commandTester->getDisplay(); $this->assertStringContainsString( - sprintf('There is already an instance of the "%s" command', ProcessVisitsCommand::NAME), + sprintf('There is already an instance of the "%s" command', LocateVisitsCommand::NAME), $output ); $locateVisits->shouldNotHaveBeenCalled();