From 8d620310743d8d395745df8c8434258ecfceff55 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 28 Oct 2024 09:50:45 +0100 Subject: [PATCH] Update to PHP coding standard 2.4.0 --- CHANGELOG.md | 1 + composer.json | 12 ++++++------ src/RoadRunner/RoadRunnerTaskConsumerToListener.php | 2 +- .../RoadRunnerEventDispatcherFactoryTest.php | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bb0e26..01d96d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * Update to PHPStan 1.11. * Update dependencies. * Switch to xdebug for code coverage reports, as pcov is not marking functions as covered +* Update shlinkio coding standard to v2.4 ### Deprecated * *Nothing* diff --git a/composer.json b/composer.json index 4abad7b..4ef8f54 100644 --- a/composer.json +++ b/composer.json @@ -16,16 +16,16 @@ "league/event": "^3.0", "psr/event-dispatcher": "^1.0", "psr/log": "^3.0", - "shlinkio/shlink-config": "^3.1", - "shlinkio/shlink-json": "^1.1" + "shlinkio/shlink-config": "^3.3", + "shlinkio/shlink-json": "^1.2" }, "require-dev": { - "phpstan/phpstan": "^1.11", + "phpstan/phpstan": "^1.12", "phpstan/phpstan-phpunit": "^1.4", - "phpunit/phpunit": "^11.3", + "phpunit/phpunit": "^11.4", "roave/security-advisories": "dev-master", - "shlinkio/php-coding-standard": "~2.3.0", - "spiral/roadrunner-jobs": "^4.5", + "shlinkio/php-coding-standard": "~2.4.0", + "spiral/roadrunner-jobs": "^4.6", "symfony/var-dumper": "^7.1" }, "suggest": { diff --git a/src/RoadRunner/RoadRunnerTaskConsumerToListener.php b/src/RoadRunner/RoadRunnerTaskConsumerToListener.php index 0e2fe17..8c73e9c 100644 --- a/src/RoadRunner/RoadRunnerTaskConsumerToListener.php +++ b/src/RoadRunner/RoadRunnerTaskConsumerToListener.php @@ -25,7 +25,7 @@ public function __construct( /** * @param (callable(string): void)|null $setCurrentRequestId */ - public function listenForTasks(?callable $setCurrentRequestId = null): void + public function listenForTasks(callable|null $setCurrentRequestId = null): void { while ($task = $this->consumer->waitTask()) { try { diff --git a/test/RoadRunner/RoadRunnerEventDispatcherFactoryTest.php b/test/RoadRunner/RoadRunnerEventDispatcherFactoryTest.php index 023964f..56ac55e 100644 --- a/test/RoadRunner/RoadRunnerEventDispatcherFactoryTest.php +++ b/test/RoadRunner/RoadRunnerEventDispatcherFactoryTest.php @@ -85,7 +85,7 @@ private function getPrivateProp(object $object, string $propName): mixed } private function container( - ?EnabledListenerCheckerInterface $listenerChecker = null, + EnabledListenerCheckerInterface|null $listenerChecker = null, bool $hasRequestIdProvider = false, ): ContainerInterface { $container = $this->createMock(ContainerInterface::class);