Update to PHP coding standard 2.4.0

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Changed
 * Extract configuration-related code from `EntityManagerFactory` into `ConfigurationFactory`.
+* Update to shlinkio coding standard 2.4.
 
 ### Deprecated
 * *Nothing*

composer.json

@@ -49,7 +49,7 @@
         "phpunit/phpunit": "^11.3",
         "psr/simple-cache": "^3.0",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.3.0",
+        "shlinkio/php-coding-standard": "~2.4.0",
         "symfony/var-dumper": "^7.1"
     },
     "suggest": {

functions/functions.php

@@ -10,7 +10,7 @@
 use function array_pad;
 use function explode;
 
-function buildDateRange(?Chronos $startDate, ?Chronos $endDate): DateRange
+function buildDateRange(Chronos|null $startDate, Chronos|null $endDate): DateRange
 {
     return match (true) {
         $startDate !== null && $endDate !== null => DateRange::between($startDate, $endDate),

src/Cache/CacheFactory.php

@@ -16,7 +16,7 @@ class CacheFactory
 {
     private Closure $apcuEnabled;
 
-    public function __construct(?callable $apcuEnabled = null)
+    public function __construct(callable|null $apcuEnabled = null)
     {
         $this->apcuEnabled = Closure::fromCallable($apcuEnabled ?? static fn () => extension_loaded('apcu'));
     }

src/Cache/RedisFactory.php

@@ -85,7 +85,7 @@ private function normalizeServer(string $server): array
         return $parsedServer;
     }
 
-    private function resolveOptions(array $redisConfig, array $servers): ?array
+    private function resolveOptions(array $redisConfig, array $servers): array|null
     {
         $sentinelService = $redisConfig['sentinel_service'] ?? null;
         if ($sentinelService !== null) {

src/Doctrine/Type/ChronosDateTimeType.php

@@ -23,7 +23,7 @@ public function getName(): string
     /**
      * @throws ConversionException
      */
-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Chronos
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): Chronos|null
     {
         if ($value === null) {
             return null;
@@ -39,7 +39,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Ch
      * @template T
      * @throws ConversionException
      */
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): string|null
     {
         if ($value === null) {
             return null;

src/Entity/AbstractEntity.php

@@ -6,7 +6,7 @@
 
 abstract class AbstractEntity
 {
-    protected ?string $id = null;
+    protected string|null $id = null;
 
     public function getId(): string
     {

src/Lock/NamespacedStore.php

@@ -18,7 +18,7 @@ class NamespacedStore implements SharedLockStoreInterface
 {
     public function __construct(
         private readonly SharedLockStoreInterface $wrappedStore,
-        private readonly ?string $namespace = null,
+        private readonly string|null $namespace = null,
         /** Some stores may not allow default separator value. Make sure you provide the appropriate one */
         private readonly string $namespaceSeparator = ':',
     ) {

src/Mercure/JwtProviderInterface.php

@@ -17,5 +17,5 @@ public function buildPublishToken(): string;
     /**
      * @return non-empty-string
      */
-    public function buildSubscriptionToken(?DateTimeImmutable $expiresAt = null): string;
+    public function buildSubscriptionToken(DateTimeImmutable|null $expiresAt = null): string;
 }

src/Mercure/LcobucciJwtProvider.php

@@ -36,7 +36,7 @@ public function buildPublishToken(): string
     /**
      * @return non-empty-string
      */
-    public function buildSubscriptionToken(?DateTimeImmutable $expiresAt = null): string
+    public function buildSubscriptionToken(DateTimeImmutable|null $expiresAt = null): string
     {
         $expiresAt = $this->roundDateToTheSecond($expiresAt ?? Chronos::now()->addDays(3));
         return $this->buildToken(['subscribe' => ['*']], $expiresAt);

src/Mercure/MercureOptions.php

@@ -12,9 +12,9 @@
      * @param non-empty-string $jwtIssuer
      */
     public function __construct(
-        public ?string $publicHubUrl = null,
-        public ?string $internalHubUrl = null,
-        public ?string $jwtSecret = null,
+        public string|null $publicHubUrl = null,
+        public string|null $internalHubUrl = null,
+        public string|null $jwtSecret = null,
         public string $jwtIssuer = 'Shlink',
     ) {
     }

src/Paginator/Util/PagerfantaUtils.php

@@ -22,7 +22,7 @@ final class PagerfantaUtils
      */
     public static function serializePaginator(
         Pagerfanta $paginator,
-        ?callable $serializer = null,
+        callable|null $serializer = null,
         string $dataProp = 'data',
     ): array {
         $currentPageItems = ArrayUtils::iteratorToArray($paginator->getCurrentPageResults());
@@ -43,7 +43,7 @@ public static function serializePaginator(
      * @param T[] $items
      * @param null|callable(T): array $serializer
      */
-    private static function serializeItems(array $items, ?callable $serializer = null): array
+    private static function serializeItems(array $items, callable|null $serializer = null): array
     {
         return $serializer === null ? $items : array_map($serializer, $items);
     }

src/Paginator/Util/PagerfantaUtilsTrait.php

@@ -18,7 +18,7 @@ trait PagerfantaUtilsTrait
      */
     private function serializePaginator(
         Pagerfanta $paginator,
-        ?DataTransformerInterface $transformer = null,
+        DataTransformerInterface|null $transformer = null,
         string $dataProp = 'data',
     ): array {
         $serializer = $transformer !== null ? fn ($value) => $transformer->transform($value) : null;

src/Util/DateRange.php

@@ -6,9 +6,9 @@
 
 use Cake\Chronos\Chronos;
 
-final class DateRange
+final readonly class DateRange
 {
-    private function __construct(public readonly ?Chronos $startDate = null, public readonly ?Chronos $endDate = null)
+    private function __construct(public Chronos|null $startDate = null, public Chronos|null $endDate = null)
     {
     }
 

src/Validation/HostAndPortValidator.php

@@ -36,7 +36,7 @@ class HostAndPortValidator extends AbstractValidator
     private ValidatorInterface $hostValidator;
     private ValidatorInterface $portValidator;
 
-    public function __construct(?array $options = null)
+    public function __construct(array|null $options = null)
     {
         parent::__construct($options);
 

src/Validation/InputFactory.php

@@ -54,7 +54,7 @@ public static function date(
         return $input;
     }
 
-    public static function numeric(string $name, ?int $min = 1, bool $required = false): Input
+    public static function numeric(string $name, int|null $min = 1, bool $required = false): Input
     {
         $input = self::basic($name, $required);
         $input->getValidatorChain()->attach(new Validator\Callback(fn ($value) => is_numeric($value)))

src/Validation/SluggerFilter.php

@@ -14,7 +14,7 @@ class SluggerFilter implements FilterInterface
 {
     private Slugger\SluggerInterface $slugger;
 
-    public function __construct(?Slugger\SluggerInterface $slugger = null)
+    public function __construct(Slugger\SluggerInterface|null $slugger = null)
     {
         $this->slugger = $slugger ?? new Slugger\AsciiSlugger();
     }

test/Cache/RedisFactoryTest.php

@@ -36,7 +36,7 @@ public function setUp(): void
      */
     #[Test, DataProvider('provideRedisConfig')]
     public function createsRedisClientBasedOnCacheConfig(
-        ?array $config,
+        array|null $config,
         string $expectedCluster,
         string $expectedReplication,
     ): void {
@@ -117,9 +117,9 @@ public function exceptionIsThrownIfServerUriHasInvalidFormat(): void
     #[Test, DataProvider('provideServersWithCredentials')]
     public function providedCredentialsArePassedToConnection(
         array $redisConfig,
-        ?string $expectedUsername,
-        ?string $expectedPassword,
-        ?array $expectedSslOptions,
+        string|null $expectedUsername,
+        string|null $expectedPassword,
+        array|null $expectedSslOptions,
     ): void {
         $this->container->expects($this->once())->method('get')->with('config')->willReturn([
             'cache' => ['redis' => $redisConfig],
@@ -161,7 +161,7 @@ public static function provideServersWithCredentials(): iterable
     #[Test, DataProvider('provideServersWithDatabases')]
     public function databaseConfigurationIsApplied(
         array $redisConfig,
-        ?int $expectedDatabase,
+        int|null $expectedDatabase,
     ): void {
         $this->container->expects($this->once())->method('get')->with('config')->willReturn([
             'cache' => ['redis' => $redisConfig],

test/Doctrine/Type/ChronosDateTimeTypeTest.php

@@ -42,7 +42,7 @@ public function nameIsReturned(): void
      * @param class-string<Chronos>|null $expected
      */
     #[Test, DataProvider('provideValues')]
-    public function valueIsConverted(?string $value, ?string $expected): void
+    public function valueIsConverted(string|null $value, string|null $expected): void
     {
         $platform = $this->createMock(AbstractPlatform::class);
         $platform->method('getDateTimeFormatString')->willReturn('Y-m-d H:i:s');
@@ -64,7 +64,7 @@ public static function provideValues(): iterable
     }
 
     #[Test, DataProvider('providePhpValues')]
-    public function valueIsConvertedToDatabaseFormat(?DateTimeInterface $value, ?string $expected): void
+    public function valueIsConvertedToDatabaseFormat(DateTimeInterface|null $value, string|null $expected): void
     {
         $platform = $this->createMock(AbstractPlatform::class);
         $platform->method('getDateTimeFormatString')->willReturn('Y-m-d');

test/Functions/FunctionsTest.php

@@ -14,8 +14,11 @@
 class FunctionsTest extends TestCase
 {
     #[Test, DataProvider('provideDates')]
-    public function expectedDateRangeIsBuilt(?Chronos $startDate, ?Chronos $endDate, bool $expectedIsAllTime): void
-    {
+    public function expectedDateRangeIsBuilt(
+        Chronos|null $startDate,
+        Chronos|null $endDate,
+        bool $expectedIsAllTime,
+    ): void {
         $dateRange = buildDateRange($startDate, $endDate);
 
         self::assertEquals($expectedIsAllTime, $dateRange->isAllTime());

test/Lock/NamespacedStoreTest.php

@@ -23,7 +23,7 @@ public function setUp(): void
 
     #[Test, DataProvider('provideKeysAndNamespaces')]
     public function keyIsReturnedVerbatimWhenNoNamespacesIsProvided(
-        ?string $namespace,
+        string|null $namespace,
         Key $key,
         string $expectedResource,
     ): void {

test/Mercure/LcobucciJwtProviderTest.php

@@ -75,7 +75,7 @@ public static function provideMercureConfigs(): iterable
     }
 
     #[Test, DataProvider('provideExpirationDates')]
-    public function expectedSubscriptionTokenIsCreated(?Chronos $expiresAt, Chronos $expectedExpiresAt): void
+    public function expectedSubscriptionTokenIsCreated(Chronos|null $expiresAt, Chronos $expectedExpiresAt): void
     {
         /** @var UnencryptedToken $token */
         $token = $this->jwtConfig->parser()->parse(

test/Mercure/MercureOptionsTest.php

@@ -12,7 +12,7 @@
 class MercureOptionsTest extends TestCase
 {
     #[Test, DataProvider('providePublicHubUrls')]
-    public function isEnabledOnlyWHenPublicUrlExists(?string $publicHubUrl, bool $expectedIsEnabled): void
+    public function isEnabledOnlyWHenPublicUrlExists(string|null $publicHubUrl, bool $expectedIsEnabled): void
     {
         $options = new MercureOptions(publicHubUrl: $publicHubUrl);
         self::assertEquals($options->isEnabled(), $expectedIsEnabled);

test/Validation/SluggerFilterTest.php

@@ -25,7 +25,7 @@ public function setUp(): void
     }
 
     #[Test, DataProvider('provideValuesToFilter')]
-    public function providedValueIsFilteredAsExpected(?string $providedValue, ?string $expectedValue): void
+    public function providedValueIsFilteredAsExpected(string|null $providedValue, string|null $expectedValue): void
     {
         $this->slugger->expects($this->exactly($expectedValue !== null ? 1 : 0))->method('slug')->with(
             $providedValue,