Updated to shlinkio coding standard 1.1.0

composer.json

@@ -58,7 +58,7 @@
         "phpunit/phpcov": "^6.0@dev || ^5.0",
         "phpunit/phpunit": "^8.0 || ^7.5",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~1.0.0",
+        "shlinkio/php-coding-standard": "~1.1.0",
         "symfony/dotenv": "^4.2",
         "symfony/var-dumper": "^4.2",
         "zendframework/zend-component-installer": "^2.1",

config/autoload/logger.global.php

@@ -7,6 +7,7 @@ use Monolog\Handler\RotatingFileHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Monolog\Processor;
+
 use const PHP_EOL;
 
 return [

config/autoload/url-shortener.global.php

@@ -2,6 +2,7 @@
 declare(strict_types=1);
 
 use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+
 use function Shlinkio\Shlink\Common\env;
 
 return [

config/config.php

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink;
 use Acelaya\ExpressiveErrorHandler;
 use Zend\ConfigAggregator;
 use Zend\Expressive;
+
 use function Shlinkio\Shlink\Common\env;
 
 return (new ConfigAggregator\ConfigAggregator([

config/test/bootstrap_api_tests.php

@@ -5,6 +5,7 @@ namespace ShlinkioTest\Shlink\Common;
 
 use Doctrine\ORM\EntityManager;
 use Psr\Container\ContainerInterface;
+
 use function file_exists;
 use function touch;
 

config/test/bootstrap_db_tests.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Common;
 
 use Psr\Container\ContainerInterface;
+
 use function file_exists;
 use function touch;
 

config/test/test_config.global.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink;
 use GuzzleHttp\Client;
 use Zend\ConfigAggregator\ConfigAggregator;
 use Zend\ServiceManager\Factory\InvokableFactory;
+
 use function sprintf;
 use function sys_get_temp_dir;
 

module/CLI/src/Command/Api/DisableKeyCommand.php

@@ -11,6 +11,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class DisableKeyCommand extends Command

module/CLI/src/Command/Api/GenerateKeyCommand.php

@@ -11,6 +11,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class GenerateKeyCommand extends Command

module/CLI/src/Command/Api/ListKeysCommand.php

@@ -11,6 +11,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+
 use function array_filter;
 use function array_map;
 use function sprintf;

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

@@ -9,6 +9,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 use function str_shuffle;
 

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

@@ -9,6 +9,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 /** @deprecated */

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

@@ -12,6 +12,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class DeleteShortUrlCommand extends Command

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

@@ -11,6 +11,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class GeneratePreviewCommand extends Command

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

@@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\Diactoros\Uri;
+
 use function array_map;
 use function Functional\curry;
 use function Functional\flatten;

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

@@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\Stdlib\ArrayUtils;
+
 use function array_map;
 use function Functional\select_keys;
 

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

@@ -16,6 +16,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\Paginator\Paginator;
+
 use function array_values;
 use function count;
 use function explode;

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

@@ -12,6 +12,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class ResolveUrlCommand extends Command

module/CLI/src/Command/Tag/ListTagsCommand.php

@@ -10,6 +10,7 @@ use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+
 use function Functional\map;
 
 class ListTagsCommand extends Command

module/CLI/src/Command/Tag/RenameTagCommand.php

@@ -11,6 +11,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+
 use function sprintf;
 
 class RenameTagCommand extends Command

module/CLI/src/Command/Visit/ProcessVisitsCommand.php

@@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Lock\Factory as Locker;
+
 use function sprintf;
 
 class ProcessVisitsCommand extends Command

module/CLI/test/Command/Config/GenerateCharsetCommandTest.php

@@ -7,6 +7,7 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Config\GenerateCharsetCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
+
 use function implode;
 use function sort;
 use function str_split;

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

@@ -11,7 +11,9 @@ use Shlinkio\Shlink\Core\Exception;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
+
 use const PHP_EOL;
+
 use function array_pop;
 use function sprintf;
 

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

@@ -15,6 +15,7 @@ use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\Paginator\Adapter\ArrayAdapter;
 use Zend\Paginator\Paginator;
+
 use function count;
 use function substr_count;
 

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

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
+
 use const PHP_EOL;
 
 class ResolveUrlCommandTest extends TestCase

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

@@ -20,6 +20,7 @@ use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Lock;
+
 use function array_shift;
 use function sprintf;
 

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -11,6 +11,7 @@ use Shlinkio\Shlink\Core\Options\AppOptions;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Zend\ServiceManager\ServiceManager;
+
 use function array_merge;
 
 class ApplicationFactoryTest extends TestCase

module/Common/functions/functions.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Common;
 
 use const JSON_ERROR_NONE;
+
 use function getenv;
 use function json_decode as spl_json_decode;
 use function json_last_error;

module/Common/src/Exception/WrongIpException.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Common\Exception;
 
 use Throwable;
+
 use function sprintf;
 
 class WrongIpException extends RuntimeException

module/Common/src/Factory/CacheFactory.php

@@ -11,6 +11,7 @@ use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\FactoryInterface;
+
 use function Functional\contains;
 use function Shlinkio\Shlink\Common\env;
 use function sys_get_temp_dir;

module/Common/src/Factory/DottedAccessConfigAbstractFactory.php

@@ -10,6 +10,7 @@ use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
+
 use function array_shift;
 use function explode;
 use function is_array;

module/Common/src/Factory/LoggerFactory.php

@@ -9,6 +9,7 @@ use Interop\Container\Exception\ContainerException;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\FactoryInterface;
+
 use function count;
 use function explode;
 

module/Common/src/IpGeolocation/GeoLite2/DbUpdater.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Common\Exception\RuntimeException;
 use Symfony\Component\Filesystem\Exception as FilesystemException;
 use Symfony\Component\Filesystem\Filesystem;
 use Throwable;
+
 use function sprintf;
 
 class DbUpdater implements DbUpdaterInterface

module/Common/src/IpGeolocation/GeoLite2LocationResolver.php

@@ -9,6 +9,7 @@ use GeoIp2\Model\City;
 use GeoIp2\Record\Subdivision;
 use MaxMind\Db\Reader\InvalidDatabaseException;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+
 use function Functional\first;
 
 class GeoLite2LocationResolver implements IpLocationResolverInterface

module/Common/src/IpGeolocation/IpApiLocationResolver.php

@@ -7,6 +7,7 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+
 use function Shlinkio\Shlink\Common\json_decode;
 use function sprintf;
 

module/Common/src/Logger/Processor/ExceptionWithNewLineProcessor.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Common\Logger\Processor;
 
 use const PHP_EOL;
+
 use function str_replace;
 use function strpos;
 

module/Common/src/Middleware/LocaleMiddleware.php

@@ -8,6 +8,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface as DelegateInterface;
 use Zend\I18n\Translator\Translator;
+
 use function count;
 use function explode;
 

module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php

@@ -5,6 +5,7 @@ namespace Shlinkio\Shlink\Common\Paginator\Adapter;
 
 use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
 use Zend\Paginator\Adapter\AdapterInterface;
+
 use function strip_tags;
 use function trim;
 

module/Common/src/Paginator/Util/PaginatorUtilsTrait.php

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink\Common\Paginator\Util;
 use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
 use Zend\Paginator\Paginator;
 use Zend\Stdlib\ArrayUtils;
+
 use function array_map;
 use function sprintf;
 

module/Common/src/Response/PixelResponse.php

@@ -7,6 +7,7 @@ use Fig\Http\Message\StatusCodeInterface as StatusCode;
 use Psr\Http\Message\StreamInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
+
 use function base64_decode;
 
 class PixelResponse extends Response

module/Common/src/Service/PreviewGenerator.php

@@ -7,6 +7,7 @@ use mikehaertl\wkhtmlto\Image;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Image\ImageBuilderInterface;
 use Symfony\Component\Filesystem\Filesystem;
+
 use function sprintf;
 use function urlencode;
 

module/Common/src/Util/IpAddress.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Common\Util;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
+
 use function count;
 use function explode;
 use function implode;

module/Common/src/Util/ResponseUtilsTrait.php

@@ -9,6 +9,7 @@ use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
 use Zend\Stdlib\ArrayUtils;
+
 use const FILEINFO_MIME;
 
 trait ResponseUtilsTrait

module/Common/test-db/ApiTest/ApiTestCase.php

@@ -10,6 +10,7 @@ use GuzzleHttp\RequestOptions;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Shlinkio\Shlink\Rest\Authentication\Plugin\ApiKeyHeaderPlugin;
+
 use function Shlinkio\Shlink\Common\json_decode;
 use function sprintf;
 

module/Common/test-db/TestHelper.php

@@ -8,6 +8,7 @@ use Doctrine\Common\DataFixtures\Loader;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Process\Process;
+
 use function file_exists;
 use function unlink;
 

module/Common/test/Factory/CacheFactoryTest.php

@@ -12,6 +12,7 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Factory\CacheFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\ServiceManager;
+
 use function count;
 use function putenv;
 use function realpath;

module/Common/test/IpGeolocation/EmptyIpLocationResolverTest.php

@@ -7,6 +7,7 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\IpGeolocation\EmptyIpLocationResolver;
 use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+
 use function Functional\map;
 use function range;
 

module/Common/test/IpGeolocation/IpApiLocationResolverTest.php

@@ -11,6 +11,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
 use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
 use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
+
 use function json_encode;
 
 class IpApiLocationResolverTest extends TestCase

module/Common/test/Logger/Processor/ExceptionWithNewLineProcessorTest.php

@@ -6,7 +6,9 @@ namespace ShlinkioTest\Shlink\Common\Logger\Processor;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Logger\Processor\ExceptionWithNewLineProcessor;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+
 use const PHP_EOL;
+
 use function Functional\map;
 use function range;
 

module/Common/test/Service/PreviewGeneratorTest.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Common\Image\ImageBuilder;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\ServiceManager\ServiceManager;
+
 use function sprintf;
 use function urlencode;
 

module/Common/test/Util/StringUtilsTraitTest.php

@@ -5,6 +5,7 @@ namespace ShlinkioTest\Shlink\Common\Util;
 
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+
 use function Functional\map;
 use function range;
 use function strlen;

module/Core/src/Action/AbstractTrackingAction.php

@@ -15,6 +15,7 @@ use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
+
 use function array_key_exists;
 
 abstract class AbstractTrackingAction implements MiddlewareInterface

module/Core/src/Entity/ShortUrl.php

@@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Shlinkio\Shlink\Common\Entity\AbstractEntity;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
+
 use function count;
 
 class ShortUrl extends AbstractEntity

module/Core/src/Exception/DeleteShortUrlException.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Exception;
 
 use Throwable;
+
 use function sprintf;
 
 class DeleteShortUrlException extends RuntimeException

module/Core/src/Exception/InvalidShortCodeException.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Exception;
 
 use Throwable;
+
 use function sprintf;
 
 class InvalidShortCodeException extends RuntimeException

module/Core/src/Exception/InvalidUrlException.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Exception;
 
 use Throwable;
+
 use function sprintf;
 
 class InvalidUrlException extends RuntimeException

module/Core/src/Exception/ValidationException.php

@@ -5,7 +5,9 @@ namespace Shlinkio\Shlink\Core\Exception;
 
 use Throwable;
 use Zend\InputFilter\InputFilterInterface;
+
 use const PHP_EOL;
+
 use function is_array;
 use function print_r;
 use function sprintf;

module/Core/src/Options/AppOptions.php

@@ -5,6 +5,7 @@ namespace Shlinkio\Shlink\Core\Options;
 
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 use Zend\Stdlib\AbstractOptions;
+
 use function sprintf;
 
 class AppOptions extends AbstractOptions

module/Core/src/Repository/ShortUrlRepository.php

@@ -7,6 +7,7 @@ use Cake\Chronos\Chronos;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
+
 use function array_column;
 use function array_key_exists;
 use function Functional\contains;

module/Core/src/Response/NotFoundHandler.php

@@ -9,6 +9,7 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;
 use Zend\Expressive\Template\TemplateRendererInterface;
+
 use function array_shift;
 use function explode;
 use function Functional\contains;

module/Core/src/Service/UrlShortener.php

@@ -20,6 +20,7 @@ use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
 use Shlinkio\Shlink\Core\Util\TagManagerTrait;
 use Throwable;
+
 use function array_reduce;
 use function count;
 use function floor;

module/Core/src/Service/VisitsTracker.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Paginator\Adapter\VisitsPaginatorAdapter;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
 use Zend\Paginator\Paginator;
+
 use function sprintf;
 
 class VisitsTracker implements VisitsTrackerInterface

module/Core/src/Transformer/ShortUrlDataTransformer.php

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink\Core\Transformer;
 use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Util\ShortUrlBuilderTrait;
+
 use function Functional\invoke;
 
 class ShortUrlDataTransformer implements DataTransformerInterface

module/Core/src/Util/TagManagerTrait.php

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink\Core\Util;
 use Doctrine\Common\Collections;
 use Doctrine\ORM\EntityManagerInterface;
 use Shlinkio\Shlink\Core\Entity\Tag;
+
 use function str_replace;
 use function strtolower;
 use function trim;

module/Core/test-db/Repository/ShortUrlRepositoryTest.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
 use ShlinkioTest\Shlink\Common\DbTest\DatabaseTestCase;
+
 use function count;
 
 class ShortUrlRepositoryTest extends DatabaseTestCase

module/Core/test-db/Repository/VisitRepositoryTest.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
 use ShlinkioTest\Shlink\Common\DbTest\DatabaseTestCase;
+
 use function Functional\map;
 use function range;
 use function sprintf;

module/Core/test/Action/PreviewActionTest.php

@@ -17,7 +17,9 @@ use Shlinkio\Shlink\Core\Service\UrlShortener;
 use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
+
 use const FILEINFO_MIME;
+
 use function filesize;
 
 class PreviewActionTest extends TestCase

module/Core/test/Exception/DeleteShortUrlExceptionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioTest\Shlink\Core\Exception;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 use Shlinkio\Shlink\Core\Exception\DeleteShortUrlException;
+
 use function Functional\map;
 use function range;
 use function sprintf;

module/Core/test/Exception/IpCannotBeLocatedExceptionTest.php

@@ -9,6 +9,7 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Exception\RuntimeException;
 use Throwable;
+
 use function count;
 use function func_get_args;
 use function random_int;

module/Core/test/Service/ShortUrl/DeleteShortUrlServiceTest.php

@@ -15,6 +15,7 @@ use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Options\DeleteShortUrlsOptions;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepositoryInterface;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlService;
+
 use function Functional\map;
 use function range;
 

module/Core/test/Service/ShortUrlServiceTest.php

@@ -15,6 +15,7 @@ use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
+
 use function count;
 
 class ShortUrlServiceTest extends TestCase

module/Core/test/Service/VisitServiceTest.php

@@ -15,6 +15,7 @@ use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Repository\VisitRepository;
 use Shlinkio\Shlink\Core\Service\VisitService;
+
 use function array_shift;
 use function count;
 use function floor;

module/Rest/src/Action/AbstractRestAction.php

@@ -8,6 +8,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+
 use function array_merge;
 
 abstract class AbstractRestAction implements RequestHandlerInterface, RequestMethodInterface, StatusCodeInterface

module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php

@@ -16,6 +16,7 @@ use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Throwable;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 abstract class AbstractCreateShortUrlAction extends AbstractRestAction

module/Rest/src/Action/ShortUrl/DeleteShortUrlAction.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class DeleteShortUrlAction extends AbstractRestAction

module/Rest/src/Action/ShortUrl/EditShortUrlAction.php

@@ -13,6 +13,7 @@ use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class EditShortUrlAction extends AbstractRestAction

module/Rest/src/Action/ShortUrl/EditShortUrlTagsAction.php

@@ -11,6 +11,7 @@ use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class EditShortUrlTagsAction extends AbstractRestAction

module/Rest/src/Action/ShortUrl/ResolveShortUrlAction.php

@@ -14,6 +14,7 @@ use Shlinkio\Shlink\Core\Transformer\ShortUrlDataTransformer;
 use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class ResolveShortUrlAction extends AbstractRestAction

module/Rest/src/Action/Tag/UpdateTagAction.php

@@ -12,6 +12,7 @@ use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class UpdateTagAction extends AbstractRestAction

module/Rest/src/Action/Visit/GetVisitsAction.php

@@ -13,6 +13,7 @@ use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function sprintf;
 
 class GetVisitsAction extends AbstractRestAction

module/Rest/src/Authentication/JWTService.php

@@ -8,6 +8,7 @@ use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 use UnexpectedValueException;
+
 use function time;
 
 class JWTService implements JWTServiceInterface

module/Rest/src/Authentication/Plugin/AuthorizationHeaderPlugin.php

@@ -9,6 +9,7 @@ use Shlinkio\Shlink\Rest\Authentication\JWTServiceInterface;
 use Shlinkio\Shlink\Rest\Exception\VerifyAuthenticationException;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Throwable;
+
 use function count;
 use function explode;
 use function sprintf;

module/Rest/src/Authentication/RequestToHttpAuthPlugin.php

@@ -6,6 +6,7 @@ namespace Shlinkio\Shlink\Rest\Authentication;
 use Psr\Container;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Rest\Exception\NoAuthenticationException;
+
 use function array_filter;
 use function array_reduce;
 use function array_shift;

module/Rest/src/ConfigProvider.php

@@ -5,6 +5,7 @@ namespace Shlinkio\Shlink\Rest;
 
 use Zend\Config\Factory;
 use Zend\Stdlib\Glob;
+
 use function sprintf;
 
 class ConfigProvider

module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php

@@ -9,6 +9,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Throwable;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function str_replace;
 use function strtoupper;
 

module/Rest/src/Exception/VerifyAuthenticationException.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Rest\Exception;
 
 use Throwable;
+
 use function sprintf;
 
 class VerifyAuthenticationException extends RuntimeException

module/Rest/src/Middleware/AuthenticationMiddleware.php

@@ -19,6 +19,7 @@ use Shlinkio\Shlink\Rest\Exception\VerifyAuthenticationException;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Expressive\Router\RouteResult;
+
 use function Functional\contains;
 use function implode;
 use function sprintf;

module/Rest/src/Middleware/BodyParserMiddleware.php

@@ -8,6 +8,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function array_shift;
 use function explode;
 use function Functional\contains;

module/Rest/src/Middleware/CrossDomainMiddleware.php

@@ -9,6 +9,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Authentication;
+
 use function implode;
 
 class CrossDomainMiddleware implements MiddlewareInterface, RequestMethodInterface

module/Rest/src/Middleware/PathVersionMiddleware.php

@@ -7,6 +7,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function strpos;
 
 class PathVersionMiddleware implements MiddlewareInterface

module/Rest/src/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddleware.php

@@ -9,6 +9,7 @@ use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\JsonResponse;
+
 use function array_shift;
 use function explode;
 use function strpos;

module/Rest/src/Middleware/ShortUrl/ShortCodePathMiddleware.php

@@ -7,6 +7,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+
 use function str_replace;
 
 class ShortCodePathMiddleware implements MiddlewareInterface

module/Rest/src/Service/ApiKeyService.php

@@ -7,6 +7,7 @@ use Cake\Chronos\Chronos;
 use Doctrine\ORM\EntityManagerInterface;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
+
 use function sprintf;
 
 class ApiKeyService implements ApiKeyServiceInterface

module/Rest/test-api/Action/CreateShortUrlActionTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioApiTest\Shlink\Rest\Action;
 use Cake\Chronos\Chronos;
 use GuzzleHttp\RequestOptions;
 use ShlinkioTest\Shlink\Common\ApiTest\ApiTestCase;
+
 use function Functional\map;
 use function range;
 

module/Rest/test-api/Middleware/AuthenticationTest.php

@@ -7,6 +7,7 @@ use Shlinkio\Shlink\Rest\Authentication\Plugin\ApiKeyHeaderPlugin;
 use Shlinkio\Shlink\Rest\Authentication\RequestToHttpAuthPlugin;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use ShlinkioTest\Shlink\Common\ApiTest\ApiTestCase;
+
 use function implode;
 use function sprintf;
 

module/Rest/test/Action/AuthenticateActionTest.php

@@ -11,6 +11,7 @@ use Shlinkio\Shlink\Rest\Authentication\JWTService;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Zend\Diactoros\ServerRequest;
+
 use function strpos;
 
 class AuthenticateActionTest extends TestCase

module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php

@@ -16,6 +16,7 @@ use Shlinkio\Shlink\Rest\Action\ShortUrl\CreateShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Uri;
+
 use function strpos;
 
 class CreateShortUrlActionTest extends TestCase

module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php

@@ -13,6 +13,7 @@ use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Rest\Action\ShortUrl\ResolveShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequest;
+
 use function strpos;
 
 class ResolveShortUrlActionTest extends TestCase

module/Rest/test/Action/Tag/ListTagsActionTest.php

@@ -9,6 +9,7 @@ use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
 use Shlinkio\Shlink\Rest\Action\Tag\ListTagsAction;
 use Zend\Diactoros\ServerRequest;
+
 use function Shlinkio\Shlink\Common\json_decode;
 
 class ListTagsActionTest extends TestCase

module/Rest/test/Authentication/JWTServiceTest.php

@@ -9,6 +9,7 @@ use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Rest\Authentication\JWTService;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
+
 use function time;
 
 class JWTServiceTest extends TestCase