mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-23 21:27:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updated to coding-standard library v1.2.2

Browse source
This commit is contained in:
Alejandro Celaya 2019-08-01 19:49:54 +02:00
parent 3562afc2bd
commit aff1df32f2
63 changed files with 78 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -43,7 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
#### Changed
* *Nothing*
* [#430](https://github.com/shlinkio/shlink/issues/430) Updated to [shlinkio/php-coding-standard](https://github.com/shlinkio/php-coding-standard) 1.2.2
### Deprecated
@ -56,7 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
#### Fixed
* [#416](https://github.com/shlinkio/shlink/issues/416) Fixed error thrown when trying to locate visits after the GeoLite2 DB is downloaded for the first time.
* [#424](https://github.com/shlinkio/shlink/issues/424) Update wkhtmltoimage to version 0.12.5
* [#424](https://github.com/shlinkio/shlink/issues/424) Updated wkhtmltoimage to version 0.12.5
* [#427](https://github.com/shlinkio/shlink/issues/427) Fixed shlink being unusable after a database error on swoole contexts.

2
composer.json
View file

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

4
module/CLI/src/Exception/GeolocationDbUpdateFailedException.php
View file

@ -11,13 +11,13 @@ class GeolocationDbUpdateFailedException extends RuntimeException implements Exc
/** @var bool */
private $olderDbExists;
public function __construct(bool $olderDbExists, string $message = '', int $code = 0, Throwable $previous = null)
public function __construct(bool $olderDbExists, string $message = '', int $code = 0, ?Throwable $previous = null)
{
$this->olderDbExists = $olderDbExists;
parent::__construct($message, $code, $previous);
}
public static function create(bool $olderDbExists, Throwable $prev = null): self
public static function create(bool $olderDbExists, ?Throwable $prev = null): self
{
return new self(
$olderDbExists,

2
module/CLI/src/Factory/ApplicationFactory.php
View file

@ -29,7 +29,7 @@ class ApplicationFactory implements FactoryInterface
* @throws ServiceNotCreatedException if an exception is raised when creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null): CliApp
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): CliApp
{
$config = $container->get('config')['cli'];
$appOptions = $container->get(AppOptions::class);

4
module/CLI/test/Command/ShortUrl/DeleteShortUrlCommandTest.php
View file

@ -12,11 +12,11 @@ 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;
use const PHP_EOL;
class DeleteShortUrlCommandTest extends TestCase
{
/** @var CommandTester */

4
module/Common/functions/functions.php
View file

@ -3,8 +3,6 @@ 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;
@ -13,6 +11,8 @@ use function sprintf;
use function strtolower;
use function trim;
use const JSON_ERROR_NONE;
/**
* Gets the value of an environment variable. Supports boolean, empty and null.
* This is basically Laravel's env helper

2
module/Common/src/Exception/WrongIpException.php
View file

@ -9,7 +9,7 @@ use function sprintf;
class WrongIpException extends RuntimeException
{
public static function fromIpAddress($ipAddress, Throwable $prev = null): self
public static function fromIpAddress($ipAddress, ?Throwable $prev = null): self
{
return new self(sprintf('Provided IP "%s" is invalid', $ipAddress), 0, $prev);
}

2
module/Common/src/Factory/CacheFactory.php
View file

@ -12,7 +12,7 @@ use function Shlinkio\Shlink\Common\env;
class CacheFactory implements FactoryInterface
{
public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Cache\Cache
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Cache\Cache
{
$appOptions = $container->get(AppOptions::class);
$adapter = env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();

2
module/Common/src/Factory/DottedAccessConfigAbstractFactory.php
View file

@ -44,7 +44,7 @@ class DottedAccessConfigAbstractFactory implements AbstractFactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$parts = explode('.', $requestedName);
$serviceName = array_shift($parts);

2
module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php
View file

@ -25,7 +25,7 @@ class EmptyResponseImplicitOptionsMiddlewareFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
return new ImplicitOptionsMiddleware(function () {
return new EmptyResponse();

2
module/Common/src/Factory/EntityManagerFactory.php
View file

@ -25,7 +25,7 @@ class EntityManagerFactory implements FactoryInterface
* @throws ORMException
* @throws DBALException
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$globalConfig = $container->get('config');
$isDevMode = isset($globalConfig['debug']) ? ((bool) $globalConfig['debug']) : false;

2
module/Common/src/Factory/LoggerFactory.php
View file

@ -27,7 +27,7 @@ class LoggerFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$config = $container->has('config') ? $container->get('config') : [];
Cascade::fileConfig($config['logger'] ?? ['loggers' => []]);

2
module/Common/src/Factory/TranslatorFactory.php
View file

@ -24,7 +24,7 @@ class TranslatorFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$config = $container->get('config');
return Translator::factory($config['translator'] ?? []);

2
module/Common/src/Image/ImageBuilderFactory.php
View file

@ -24,7 +24,7 @@ class ImageBuilderFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
return new ImageBuilder($container, ['factories' => [
Image::class => ImageFactory::class,

2
module/Common/src/Image/ImageFactory.php
View file

@ -24,7 +24,7 @@ class ImageFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$config = $container->get('config')['wkhtmltopdf'];
$image = new Image($config['images'] ?? null);

4
module/Common/src/IpGeolocation/GeoLite2/DbUpdater.php
View file

@ -37,7 +37,7 @@ class DbUpdater implements DbUpdaterInterface
/**
* @throws RuntimeException
*/
public function downloadFreshCopy(callable $handleProgress = null): void
public function downloadFreshCopy(?callable $handleProgress = null): void
{
$tempDir = $this->options->getTempDir();
$compressedFile = sprintf('%s/%s', $tempDir, self::DB_COMPRESSED_FILE);
@ -48,7 +48,7 @@ class DbUpdater implements DbUpdaterInterface
$this->deleteTempFiles([$compressedFile, $tempFullPath]);
}
private function downloadDbFile(string $dest, callable $handleProgress = null): void
private function downloadDbFile(string $dest, ?callable $handleProgress = null): void
{
try {
$this->httpClient->request(RequestMethod::METHOD_GET, $this->options->getDownloadFrom(), [

2
module/Common/src/IpGeolocation/GeoLite2/DbUpdaterInterface.php
View file

@ -12,5 +12,5 @@ interface DbUpdaterInterface
/**
* @throws RuntimeException
*/
public function downloadFreshCopy(callable $handleProgress = null): void;
public function downloadFreshCopy(?callable $handleProgress = null): void;
}

4
module/Common/src/Logger/Processor/ExceptionWithNewLineProcessor.php
View file

@ -3,11 +3,11 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Common\Logger\Processor;
use const PHP_EOL;
use function str_replace;
use function strpos;
use const PHP_EOL;
final class ExceptionWithNewLineProcessor
{
private const EXCEPTION_PLACEHOLDER = '{e}';

2
module/Common/src/Middleware/IpAddressMiddlewareFactory.php
View file

@ -21,7 +21,7 @@ class IpAddressMiddlewareFactory implements FactoryInterface
* @throws ServiceNotFoundException if unable to resolve the service.
* @throws ServiceNotCreatedException if an exception is raised when creating a service.
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null): IpAddress
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): IpAddress
{
$config = $container->get('config');
$headersToInspect = $config['ip_address_resolution']['headers_to_inspect'] ?? [];

8
module/Common/src/Repository/PaginableRepositoryInterface.php
View file

@ -16,9 +16,9 @@ interface PaginableRepositoryInterface
* @return array
*/
public function findList(
int $limit = null,
int $offset = null,
string $searchTerm = null,
?int $limit = null,
?int $offset = null,
?string $searchTerm = null,
array $tags = [],
$orderBy = null
): array;
@ -30,5 +30,5 @@ interface PaginableRepositoryInterface
* @param array $tags
* @return int
*/
public function countList(string $searchTerm = null, array $tags = []): int;
public function countList(?string $searchTerm = null, array $tags = []): int;
}

4
module/Common/test/Logger/Processor/ExceptionWithNewLineProcessorTest.php
View file

@ -7,11 +7,11 @@ 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;
use const PHP_EOL;
class ExceptionWithNewLineProcessorTest extends TestCase
{
use StringUtilsTrait;

2
module/Common/test/Util/TestUtils.php
View file

@ -14,7 +14,7 @@ class TestUtils
{
private static $prophet;
public static function createReqHandlerMock(ResponseInterface $response = null, RequestInterface $request = null)
public static function createReqHandlerMock(?ResponseInterface $response = null, ?RequestInterface $request = null)
{
$argument = $request ?: Argument::any();
$delegate = static::getProphet()->prophesize(RequestHandlerInterface::class);

1
module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
View file

@ -5,7 +5,6 @@ namespace Shlinkio\Shlink\Core;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
use Doctrine\ORM\Mapping\ClassMetadata;
use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
/** @var $metadata ClassMetadata */

1
module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Tag.php
View file

@ -5,7 +5,6 @@ namespace Shlinkio\Shlink\Core;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
use Doctrine\ORM\Mapping\ClassMetadata;
/** @var $metadata ClassMetadata */
$builder = new ClassMetadataBuilder($metadata);

1
module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php
View file

@ -5,7 +5,6 @@ namespace Shlinkio\Shlink\Core;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
use Doctrine\ORM\Mapping\ClassMetadata;
use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
/** @var $metadata ClassMetadata */

1
module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.VisitLocation.php
View file

@ -5,7 +5,6 @@ namespace Shlinkio\Shlink\Core;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
use Doctrine\ORM\Mapping\ClassMetadata;
/** @var $metadata ClassMetadata */
$builder = new ClassMetadataBuilder($metadata);

2
module/Core/src/Action/AbstractTrackingAction.php
View file

@ -33,7 +33,7 @@ abstract class AbstractTrackingAction implements MiddlewareInterface
UrlShortenerInterface $urlShortener,
VisitsTrackerInterface $visitTracker,
AppOptions $appOptions,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
$this->urlShortener = $urlShortener;
$this->visitTracker = $visitTracker;

2
module/Core/src/Action/PreviewAction.php
View file

@ -32,7 +32,7 @@ class PreviewAction implements MiddlewareInterface
public function __construct(
PreviewGeneratorInterface $previewGenerator,
UrlShortenerInterface $urlShortener,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
$this->previewGenerator = $previewGenerator;
$this->urlShortener = $urlShortener;

2
module/Core/src/Action/QrCodeAction.php
View file

@ -36,7 +36,7 @@ class QrCodeAction implements MiddlewareInterface
public function __construct(
RouterInterface $router,
UrlShortenerInterface $urlShortener,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
$this->router = $router;
$this->urlShortener = $urlShortener;

2
module/Core/src/Action/RedirectAction.php
View file

@ -25,7 +25,7 @@ class RedirectAction extends AbstractTrackingAction
VisitsTrackerInterface $visitTracker,
Options\AppOptions $appOptions,
Options\NotFoundShortUrlOptions $notFoundOptions,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($urlShortener, $visitTracker, $appOptions, $logger);
$this->notFoundOptions = $notFoundOptions;

2
module/Core/src/Entity/ShortUrl.php
View file

@ -30,7 +30,7 @@ class ShortUrl extends AbstractEntity
/** @var integer|null */
private $maxVisits;
public function __construct(string $longUrl, ShortUrlMeta $meta = null)
public function __construct(string $longUrl, ?ShortUrlMeta $meta = null)
{
$meta = $meta ?? ShortUrlMeta::createEmpty();

2
module/Core/src/Exception/DeleteShortUrlException.php
View file

@ -12,7 +12,7 @@ class DeleteShortUrlException extends RuntimeException
/** @var int */
private $visitsThreshold;
public function __construct(int $visitsThreshold, string $message = '', int $code = 0, Throwable $previous = null)
public function __construct(int $visitsThreshold, string $message = '', int $code = 0, ?Throwable $previous = null)
{
$this->visitsThreshold = $visitsThreshold;
parent::__construct($message, $code, $previous);

2
module/Core/src/Exception/InvalidUrlException.php
View file

@ -9,7 +9,7 @@ use function sprintf;
class InvalidUrlException extends RuntimeException
{
public static function fromUrl(string $url, Throwable $previous = null): self
public static function fromUrl(string $url, ?Throwable $previous = null): self
{
$code = $previous !== null ? $previous->getCode() : -1;
return new static(sprintf('Provided URL "%s" is not an existing and valid URL', $url), $code, $previous);

10
module/Core/src/Exception/ValidationException.php
View file

@ -6,12 +6,12 @@ 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;
use const PHP_EOL;
class ValidationException extends RuntimeException
{
/** @var array */
@ -21,7 +21,7 @@ class ValidationException extends RuntimeException
string $message = '',
array $invalidElements = [],
int $code = 0,
Throwable $previous = null
?Throwable $previous = null
) {
$this->invalidElements = $invalidElements;
parent::__construct($message, $code, $previous);
@ -32,7 +32,7 @@ class ValidationException extends RuntimeException
* @param \Throwable|null $prev
* @return ValidationException
*/
public static function fromInputFilter(InputFilterInterface $inputFilter, Throwable $prev = null): self
public static function fromInputFilter(InputFilterInterface $inputFilter, ?Throwable $prev = null): self
{
return static::fromArray($inputFilter->getMessages(), $prev);
}
@ -42,7 +42,7 @@ class ValidationException extends RuntimeException
* @param \Throwable|null $prev
* @return ValidationException
*/
private static function fromArray(array $invalidData, Throwable $prev = null): self
private static function fromArray(array $invalidData, ?Throwable $prev = null): self
{
return new self(
sprintf(

8
module/Core/src/Repository/ShortUrlRepository.php
View file

@ -22,9 +22,9 @@ class ShortUrlRepository extends EntityRepository implements ShortUrlRepositoryI
* @return ShortUrl[]
*/
public function findList(
int $limit = null,
int $offset = null,
string $searchTerm = null,
?int $limit = null,
?int $offset = null,
?string $searchTerm = null,
array $tags = [],
$orderBy = null
): array {
@ -76,7 +76,7 @@ class ShortUrlRepository extends EntityRepository implements ShortUrlRepositoryI
return $qb->getQuery()->getResult();
}
public function countList(string $searchTerm = null, array $tags = []): int
public function countList(?string $searchTerm = null, array $tags = []): int
{
$qb = $this->createListQueryBuilder($searchTerm, $tags);
$qb->select('COUNT(DISTINCT s)');

2
module/Core/src/Service/ShortUrlService.php
View file

@ -31,7 +31,7 @@ class ShortUrlService implements ShortUrlServiceInterface
* @param array|string|null $orderBy
* @return ShortUrl[]|Paginator
*/
public function listShortUrls(int $page = 1, string $searchQuery = null, array $tags = [], $orderBy = null)
public function listShortUrls(int $page = 1, ?string $searchQuery = null, array $tags = [], $orderBy = null)
{
/** @var ShortUrlRepository $repo */
$repo = $this->em->getRepository(ShortUrl::class);

2
module/Core/src/Service/ShortUrlServiceInterface.php
View file

@ -15,7 +15,7 @@ interface ShortUrlServiceInterface
* @param array|string|null $orderBy
* @return ShortUrl[]|Paginator
*/
public function listShortUrls(int $page = 1, string $searchQuery = null, array $tags = [], $orderBy = null);
public function listShortUrls(int $page = 1, ?string $searchQuery = null, array $tags = [], $orderBy = null);
/**
* @param string[] $tags

4
module/Core/test/Action/PreviewActionTest.php
View file

@ -18,10 +18,10 @@ use ShlinkioTest\Shlink\Common\Util\TestUtils;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
use const FILEINFO_MIME;
use function filesize;
use const FILEINFO_MIME;
class PreviewActionTest extends TestCase
{
/** @var PreviewAction */

2
module/EventDispatcher/src/Async/TaskRunnerDelegator.php
View file

@ -14,7 +14,7 @@ class TaskRunnerDelegator implements DelegatorFactoryInterface
ContainerInterface $container,
$name,
callable $callback,
array $options = null
?array $options = null
): HttpServer {
$server = $callback();
$logger = $container->get(LoggerInterface::class);

2
module/EventDispatcher/src/Async/TaskRunnerFactory.php
View file

@ -9,7 +9,7 @@ use Zend\ServiceManager\Factory\FactoryInterface;
class TaskRunnerFactory implements FactoryInterface
{
public function __invoke(ContainerInterface $container, $requestedName, array $options = null): TaskRunner
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): TaskRunner
{
$logger = $container->get(LoggerInterface::class);
return new TaskRunner($logger, $container);

2
module/EventDispatcher/src/Listener/ListenerProviderFactory.php
View file

@ -13,7 +13,7 @@ use function Shlinkio\Shlink\EventDispatcher\asyncListener;
class ListenerProviderFactory implements FactoryInterface
{
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$config = $container->has('config') ? $container->get('config') : [];
$events = $config['events'] ?? [];

1
module/Rest/config/entities-mappings/Shlinkio.Shlink.Rest.Entity.ApiKey.php
View file

@ -5,7 +5,6 @@ namespace Shlinkio\Shlink\Rest;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
use Doctrine\ORM\Mapping\ClassMetadata;
use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
/** @var $metadata ClassMetadata */

2
module/Rest/src/Action/AbstractRestAction.php
View file

@ -19,7 +19,7 @@ abstract class AbstractRestAction implements RequestHandlerInterface, RequestMet
/** @var LoggerInterface */
protected $logger;
public function __construct(LoggerInterface $logger = null)
public function __construct(?LoggerInterface $logger = null)
{
$this->logger = $logger ?: new NullLogger();
}

2
module/Rest/src/Action/AuthenticateAction.php
View file

@ -26,7 +26,7 @@ class AuthenticateAction extends AbstractRestAction
public function __construct(
ApiKeyServiceInterface $apiKeyService,
JWTServiceInterface $jwtService,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($logger);
$this->apiKeyService = $apiKeyService;

2
module/Rest/src/Action/HealthAction.php
View file

@ -25,7 +25,7 @@ class HealthAction extends AbstractRestAction
/** @var Connection */
private $conn;
public function __construct(Connection $conn, AppOptions $options, LoggerInterface $logger = null)
public function __construct(Connection $conn, AppOptions $options, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->conn = $conn;

2
module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php
View file

@ -29,7 +29,7 @@ abstract class AbstractCreateShortUrlAction extends AbstractRestAction
public function __construct(
UrlShortenerInterface $urlShortener,
array $domainConfig,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($logger);
$this->urlShortener = $urlShortener;

2
module/Rest/src/Action/ShortUrl/DeleteShortUrlAction.php
View file

@ -23,7 +23,7 @@ class DeleteShortUrlAction extends AbstractRestAction
/** @var DeleteShortUrlServiceInterface */
private $deleteShortUrlService;
public function __construct(DeleteShortUrlServiceInterface $deleteShortUrlService, LoggerInterface $logger = null)
public function __construct(DeleteShortUrlServiceInterface $deleteShortUrlService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->deleteShortUrlService = $deleteShortUrlService;

2
module/Rest/src/Action/ShortUrl/EditShortUrlAction.php
View file

@ -24,7 +24,7 @@ class EditShortUrlAction extends AbstractRestAction
/** @var ShortUrlServiceInterface */
private $shortUrlService;
public function __construct(ShortUrlServiceInterface $shortUrlService, LoggerInterface $logger = null)
public function __construct(ShortUrlServiceInterface $shortUrlService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->shortUrlService = $shortUrlService;

2
module/Rest/src/Action/ShortUrl/EditShortUrlTagsAction.php
View file

@ -22,7 +22,7 @@ class EditShortUrlTagsAction extends AbstractRestAction
/** @var ShortUrlServiceInterface */
private $shortUrlService;
public function __construct(ShortUrlServiceInterface $shortUrlService, LoggerInterface $logger = null)
public function __construct(ShortUrlServiceInterface $shortUrlService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->shortUrlService = $shortUrlService;

2
module/Rest/src/Action/ShortUrl/ListShortUrlsAction.php
View file

@ -29,7 +29,7 @@ class ListShortUrlsAction extends AbstractRestAction
public function __construct(
ShortUrlServiceInterface $shortUrlService,
array $domainConfig,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($logger);
$this->shortUrlService = $shortUrlService;

2
module/Rest/src/Action/ShortUrl/ResolveShortUrlAction.php
View file

@ -30,7 +30,7 @@ class ResolveShortUrlAction extends AbstractRestAction
public function __construct(
UrlShortenerInterface $urlShortener,
array $domainConfig,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($logger);
$this->urlShortener = $urlShortener;

2
module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
View file

@ -23,7 +23,7 @@ class SingleStepCreateShortUrlAction extends AbstractCreateShortUrlAction
UrlShortenerInterface $urlShortener,
ApiKeyServiceInterface $apiKeyService,
array $domainConfig,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
parent::__construct($urlShortener, $domainConfig, $logger);
$this->apiKeyService = $apiKeyService;

2
module/Rest/src/Action/Tag/CreateTagsAction.php
View file

@ -18,7 +18,7 @@ class CreateTagsAction extends AbstractRestAction
/** @var TagServiceInterface */
private $tagService;
public function __construct(TagServiceInterface $tagService, LoggerInterface $logger = null)
public function __construct(TagServiceInterface $tagService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->tagService = $tagService;

2
module/Rest/src/Action/Tag/DeleteTagsAction.php
View file

@ -18,7 +18,7 @@ class DeleteTagsAction extends AbstractRestAction
/** @var TagServiceInterface */
private $tagService;
public function __construct(TagServiceInterface $tagService, LoggerInterface $logger = null)
public function __construct(TagServiceInterface $tagService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->tagService = $tagService;

2
module/Rest/src/Action/Tag/ListTagsAction.php
View file

@ -18,7 +18,7 @@ class ListTagsAction extends AbstractRestAction
/** @var TagServiceInterface */
private $tagService;
public function __construct(TagServiceInterface $tagService, LoggerInterface $logger = null)
public function __construct(TagServiceInterface $tagService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->tagService = $tagService;

2
module/Rest/src/Action/Tag/UpdateTagAction.php
View file

@ -23,7 +23,7 @@ class UpdateTagAction extends AbstractRestAction
/** @var TagServiceInterface */
private $tagService;
public function __construct(TagServiceInterface $tagService, LoggerInterface $logger = null)
public function __construct(TagServiceInterface $tagService, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->tagService = $tagService;

2
module/Rest/src/Action/Visit/GetVisitsAction.php
View file

@ -26,7 +26,7 @@ class GetVisitsAction extends AbstractRestAction
/** @var VisitsTrackerInterface */
private $visitsTracker;
public function __construct(VisitsTrackerInterface $visitsTracker, LoggerInterface $logger = null)
public function __construct(VisitsTrackerInterface $visitsTracker, ?LoggerInterface $logger = null)
{
parent::__construct($logger);
$this->visitsTracker = $visitsTracker;

2
module/Rest/src/Authentication/AuthenticationPluginManagerFactory.php
View file

@ -23,7 +23,7 @@ class AuthenticationPluginManagerFactory implements FactoryInterface
* creating a service.
* @throws ContainerException if any other error occurs
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
$config = $container->get('config') ?? [];
return new AuthenticationPluginManager($container, $config['auth']['plugins'] ?? []);

4
module/Rest/src/Authentication/JWTServiceInterface.php
View file

@ -8,8 +8,8 @@ use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
interface JWTServiceInterface
{
const DEFAULT_LIFETIME = 604800; // 1 week
const DEFAULT_ENCRYPTION_ALG = 'HS256';
public const DEFAULT_LIFETIME = 604800; // 1 week
public const DEFAULT_ENCRYPTION_ALG = 'HS256';
/**
* Creates a new JSON web token por provided API key

2
module/Rest/src/Authentication/Plugin/AuthorizationHeaderPlugin.php
View file

@ -60,7 +60,7 @@ class AuthorizationHeaderPlugin implements AuthenticationPluginInterface
}
}
private function createInvalidTokenError(Throwable $prev = null): VerifyAuthenticationException
private function createInvalidTokenError(?Throwable $prev = null): VerifyAuthenticationException
{
return VerifyAuthenticationException::withError(
RestUtils::INVALID_AUTH_TOKEN_ERROR,

4
module/Rest/src/Exception/VerifyAuthenticationException.php
View file

@ -19,14 +19,14 @@ class VerifyAuthenticationException extends RuntimeException
string $publicMessage,
string $message = '',
int $code = 0,
Throwable $previous = null
?Throwable $previous = null
) {
parent::__construct($message, $code, $previous);
$this->errorCode = $errorCode;
$this->publicMessage = $publicMessage;
}
public static function withError(string $errorCode, string $publicMessage, Throwable $prev = null): self
public static function withError(string $errorCode, string $publicMessage, ?Throwable $prev = null): self
{
return new self(
$errorCode,

2
module/Rest/src/Middleware/AuthenticationMiddleware.php
View file

@ -36,7 +36,7 @@ class AuthenticationMiddleware implements MiddlewareInterface, StatusCodeInterfa
public function __construct(
RequestToHttpAuthPluginInterface $requestToAuthPlugin,
array $routesWhitelist,
LoggerInterface $logger = null
?LoggerInterface $logger = null
) {
$this->routesWhitelist = $routesWhitelist;
$this->requestToAuthPlugin = $requestToAuthPlugin;

2
module/Rest/test-api/Fixtures/ApiKeyFixture.php
View file

@ -19,7 +19,7 @@ class ApiKeyFixture implements FixtureInterface
$manager->flush();
}
private function buildApiKey(string $key, bool $enabled, Chronos $expiresAt = null): ApiKey
private function buildApiKey(string $key, bool $enabled, ?Chronos $expiresAt = null): ApiKey
{
$apiKey = new ApiKey($expiresAt);
$refObj = new ReflectionObject($apiKey);