Updated references to short code and replaced them to short URL where appropriate

module/CLI/config/cli.config.php

@@ -9,12 +9,12 @@ return [
     'cli' => [
         'locale' => Common\env('CLI_LOCALE', 'en'),
         'commands' => [
-            Command\Shortcode\GenerateShortcodeCommand::NAME => Command\Shortcode\GenerateShortcodeCommand::class,
+            Command\ShortUrl\GenerateShortUrlCommand::NAME => Command\ShortUrl\GenerateShortUrlCommand::class,
-            Command\Shortcode\ResolveUrlCommand::NAME => Command\Shortcode\ResolveUrlCommand::class,
+            Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
-            Command\Shortcode\ListShortcodesCommand::NAME => Command\Shortcode\ListShortcodesCommand::class,
+            Command\ShortUrl\ListShortUrlsCommand::NAME => Command\ShortUrl\ListShortUrlsCommand::class,
-            Command\Shortcode\GetVisitsCommand::NAME => Command\Shortcode\GetVisitsCommand::class,
+            Command\ShortUrl\GetVisitsCommand::NAME => Command\ShortUrl\GetVisitsCommand::class,
-            Command\Shortcode\GeneratePreviewCommand::NAME => Command\Shortcode\GeneratePreviewCommand::class,
+            Command\ShortUrl\GeneratePreviewCommand::NAME => Command\ShortUrl\GeneratePreviewCommand::class,
-            Command\Shortcode\DeleteShortCodeCommand::NAME => Command\Shortcode\DeleteShortCodeCommand::class,
+            Command\ShortUrl\DeleteShortUrlCommand::NAME => Command\ShortUrl\DeleteShortUrlCommand::class,
 
             Command\Visit\ProcessVisitsCommand::NAME => Command\Visit\ProcessVisitsCommand::class,
 

module/CLI/config/dependencies.config.php

@@ -17,12 +17,12 @@ return [
         'factories' => [
             Application::class => ApplicationFactory::class,
 
-            Command\Shortcode\GenerateShortcodeCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GenerateShortUrlCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ResolveUrlCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ListShortcodesCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\ListShortUrlsCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GetVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GetVisitsCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\DeleteShortCodeCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\DeleteShortUrlCommand::class => ConfigAbstractFactory::class,
 
             Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class,
 
@@ -41,24 +41,24 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        Command\Shortcode\GenerateShortcodeCommand::class => [
+        Command\ShortUrl\GenerateShortUrlCommand::class => [
             Service\UrlShortener::class,
             'translator',
             'config.url_shortener.domain',
         ],
-        Command\Shortcode\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
+        Command\ShortUrl\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
-        Command\Shortcode\ListShortcodesCommand::class => [
+        Command\ShortUrl\ListShortUrlsCommand::class => [
             Service\ShortUrlService::class,
             'translator',
             'config.url_shortener.domain',
         ],
-        Command\Shortcode\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
+        Command\ShortUrl\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
-        Command\Shortcode\GeneratePreviewCommand::class => [
+        Command\ShortUrl\GeneratePreviewCommand::class => [
             Service\ShortUrlService::class,
             PreviewGenerator::class,
             'translator',
         ],
-        Command\Shortcode\DeleteShortCodeCommand::class => [
+        Command\ShortUrl\DeleteShortUrlCommand::class => [
             Service\ShortUrl\DeleteShortUrlService::class,
             'translator',
         ],

module/CLI/src/Command/Config/GenerateCharsetCommand.php

@@ -28,7 +28,7 @@ class GenerateCharsetCommand extends Command
     public function configure()
     {
         $this->setName(self::NAME)
-             ->setDescription(sprintf($this->translator->translate(
+             ->setDescription(\sprintf($this->translator->translate(
                  'Generates a character set sample just by shuffling the default one, "%s". '
                  . 'Then it can be set in the SHORTCODE_CHARS environment variable'
              ), UrlShortener::DEFAULT_CHARS));

module/CLI/src/Command/ShortUrl/DeleteShortUrlCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Core\Exception;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
@@ -13,10 +13,10 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class DeleteShortCodeCommand extends Command
+class DeleteShortUrlCommand extends Command
 {
-    public const NAME = 'short-code:delete';
+    public const NAME = 'short-url:delete';
-    private const ALIASES = [];
+    private const ALIASES = ['short-code:delete'];
 
     /**
      * @var DeleteShortUrlServiceInterface
@@ -45,7 +45,7 @@ class DeleteShortCodeCommand extends Command
             ->addArgument(
                 'shortCode',
                 InputArgument::REQUIRED,
-                $this->translator->translate('The short code to be deleted')
+                $this->translator->translate('The short code for the short URL to be deleted')
             )
             ->addOption(
                 'ignore-threshold',

module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
@@ -14,8 +14,8 @@ use Zend\I18n\Translator\TranslatorInterface;
 
 class GeneratePreviewCommand extends Command
 {
-    public const NAME = 'short-code:process-previews';
+    public const NAME = 'short-url:process-previews';
-    private const ALIASES = ['shortcode:process-previews'];
+    private const ALIASES = ['shortcode:process-previews', 'short-code:process-previews'];
 
     /**
      * @var PreviewGeneratorInterface

module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
@@ -16,12 +16,12 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\Diactoros\Uri;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class GenerateShortcodeCommand extends Command
+class GenerateShortUrlCommand extends Command
 {
     use ShortUrlBuilderTrait;
 
-    public const NAME = 'short-code:generate';
+    public const NAME = 'short-url:generate';
-    private const ALIASES = ['shortcode:generate'];
+    private const ALIASES = ['shortcode:generate', 'short-code:generate'];
 
     /**
      * @var UrlShortenerInterface
@@ -53,7 +53,7 @@ class GenerateShortcodeCommand extends Command
             ->setName(self::NAME)
             ->setAliases(self::ALIASES)
             ->setDescription(
-                $this->translator->translate('Generates a short code for provided URL and returns the short URL')
+                $this->translator->translate('Generates a short URL for provided long URL and returns it')
             )
             ->addArgument('longUrl', InputArgument::REQUIRED, $this->translator->translate('The long URL to parse'))
             ->addOption(

module/CLI/src/Command/ShortUrl/GetVisitsCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
@@ -15,8 +15,8 @@ use Zend\I18n\Translator\TranslatorInterface;
 
 class GetVisitsCommand extends Command
 {
-    public const NAME = 'short-code:visits';
+    public const NAME = 'short-url:visits';
-    private const ALIASES = ['shortcode:visits'];
+    private const ALIASES = ['shortcode:visits', 'short-code:visits'];
 
     /**
      * @var VisitsTrackerInterface

module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
@@ -14,12 +14,12 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class ListShortcodesCommand extends Command
+class ListShortUrlsCommand extends Command
 {
     use PaginatorUtilsTrait;
 
-    public const NAME = 'short-code:list';
+    public const NAME = 'short-url:list';
-    private const ALIASES = ['shortcode:list'];
+    private const ALIASES = ['shortcode:list', 'short-code:list'];
 
     /**
      * @var ShortUrlServiceInterface
@@ -132,7 +132,7 @@ class ListShortcodesCommand extends Command
 
             if ($this->isLastPage($result)) {
                 $continue = false;
-                $io->success($this->translator->translate('Short codes properly listed'));
+                $io->success($this->translator->translate('Short URLs properly listed'));
             } else {
                 $continue = $io->confirm(
                     \sprintf($this->translator->translate('Continue with page') . ' <options=bold>%s</>?', $page),

module/CLI/src/Command/ShortUrl/ResolveUrlCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
@@ -15,8 +15,8 @@ use Zend\I18n\Translator\TranslatorInterface;
 
 class ResolveUrlCommand extends Command
 {
-    public const NAME = 'short-code:parse';
+    public const NAME = 'short-url:parse';
-    private const ALIASES = ['shortcode:parse'];
+    private const ALIASES = ['shortcode:parse', 'short-code:parse'];
 
     /**
      * @var UrlShortenerInterface

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

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\DeleteShortCodeCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\DeleteShortUrlCommand;
 use Shlinkio\Shlink\Core\Exception;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
 use Symfony\Component\Console\Application;
@@ -28,7 +28,7 @@ class DeleteShortCodeCommandTest extends TestCase
     {
         $this->service = $this->prophesize(DeleteShortUrlServiceInterface::class);
 
-        $command = new DeleteShortCodeCommand($this->service->reveal(), Translator::factory([]));
+        $command = new DeleteShortUrlCommand($this->service->reveal(), Translator::factory([]));
         $app = new Application();
         $app->add($command);
 

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

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GeneratePreviewCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GeneratePreviewCommand;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;

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

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
@@ -28,7 +28,7 @@ class GenerateShortcodeCommandTest extends TestCase
     public function setUp()
     {
         $this->urlShortener = $this->prophesize(UrlShortener::class);
-        $command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
+        $command = new GenerateShortUrlCommand($this->urlShortener->reveal(), Translator::factory([]), [
             'schema' => 'http',
             'hostname' => 'foo.com',
         ]);

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

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;

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

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Application;
@@ -30,7 +30,7 @@ class ListShortcodesCommandTest extends TestCase
     {
         $this->shortUrlService = $this->prophesize(ShortUrlServiceInterface::class);
         $app = new Application();
-        $command = new ListShortcodesCommand($this->shortUrlService->reveal(), Translator::factory([]), []);
+        $command = new ListShortUrlsCommand($this->shortUrlService->reveal(), Translator::factory([]), []);
         $app->add($command);
         $this->commandTester = new CommandTester($command);
     }

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

@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\ResolveUrlCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;