diff --git a/composer.json b/composer.json index 8afbf5a0..7846b83f 100644 --- a/composer.json +++ b/composer.json @@ -36,25 +36,24 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "^8.1", - "psr/container": "^1.0|^2.0", - "psr/log": "^2.0|^3.0", - "symfony/console": "^5.4|^6.0|^7.0", + "php": "8.1 - 8.4", + "psr/container": "^1.0 || ^2.0", + "psr/log": "^2.0 || ^3.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", "yiisoft/definitions": "^3.3.1", "yiisoft/factory": "^1.3", "yiisoft/friendly-exception": "^1.0", "yiisoft/injector": "^1.0" }, "require-dev": { - "maglnet/composer-require-checker": "^4.7", - "phpbench/phpbench": "^1.3", - "phpunit/phpunit": "^10.5", - "rector/rector": "^2.0", - "roave/infection-static-analysis-plugin": "^1.34", - "infection/infection": "^0.27.8||^0.29.0", - "spatie/phpunit-watcher": "^1.23", - "vimeo/psalm": "^5.20||^6.0", - "yiisoft/test-support": "^3.0", + "maglnet/composer-require-checker": "^4.7.1", + "phpbench/phpbench": "^1.4.1", + "phpunit/phpunit": "^10.5.45", + "rector/rector": "^2.0.11", + "roave/infection-static-analysis-plugin": "^1.35", + "spatie/phpunit-watcher": "^1.24", + "vimeo/psalm": "^5.26.1 || ^6.10", + "yiisoft/test-support": "^3.0.2", "yiisoft/yii-debug": "dev-master" }, "suggest": { diff --git a/psalm.xml b/psalm.xml index 36dc15f9..14406f64 100644 --- a/psalm.xml +++ b/psalm.xml @@ -3,6 +3,7 @@ errorLevel="2" findUnusedBaselineEntry="true" findUnusedCode="false" + ensureOverrideAttribute="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" diff --git a/src/Cli/SignalLoop.php b/src/Cli/SignalLoop.php index 6e0524ba..1f1be127 100644 --- a/src/Cli/SignalLoop.php +++ b/src/Cli/SignalLoop.php @@ -4,7 +4,7 @@ namespace Yiisoft\Queue\Cli; -class SignalLoop implements LoopInterface +final class SignalLoop implements LoopInterface { use SoftLimitTrait; diff --git a/src/Cli/SimpleLoop.php b/src/Cli/SimpleLoop.php index 5c81ae4d..2c34ad05 100644 --- a/src/Cli/SimpleLoop.php +++ b/src/Cli/SimpleLoop.php @@ -4,7 +4,7 @@ namespace Yiisoft\Queue\Cli; -class SimpleLoop implements LoopInterface +final class SimpleLoop implements LoopInterface { use SoftLimitTrait; diff --git a/src/Exception/AdapterConfiguration/AdapterNotConfiguredException.php b/src/Exception/AdapterConfiguration/AdapterNotConfiguredException.php index 68ae754a..4e91096e 100644 --- a/src/Exception/AdapterConfiguration/AdapterNotConfiguredException.php +++ b/src/Exception/AdapterConfiguration/AdapterNotConfiguredException.php @@ -9,7 +9,7 @@ use Yiisoft\Queue\Provider\QueueProviderInterface; use Yiisoft\Queue\Queue; -class AdapterNotConfiguredException extends RuntimeException implements FriendlyExceptionInterface +final class AdapterNotConfiguredException extends RuntimeException implements FriendlyExceptionInterface { protected $message = 'Queue adapter is not configured'; diff --git a/src/Exception/JobFailureException.php b/src/Exception/JobFailureException.php index acfeee3b..59482d72 100644 --- a/src/Exception/JobFailureException.php +++ b/src/Exception/JobFailureException.php @@ -9,7 +9,7 @@ use Yiisoft\Queue\Message\MessageInterface; use Yiisoft\Queue\Message\IdEnvelope; -class JobFailureException extends RuntimeException +final class JobFailureException extends RuntimeException { public function __construct(private MessageInterface $queueMessage, Throwable $previous) { diff --git a/src/Middleware/InvalidMiddlewareDefinitionException.php b/src/Middleware/InvalidMiddlewareDefinitionException.php index 2ae2da71..9ca6ef27 100644 --- a/src/Middleware/InvalidMiddlewareDefinitionException.php +++ b/src/Middleware/InvalidMiddlewareDefinitionException.php @@ -5,7 +5,6 @@ namespace Yiisoft\Queue\Middleware; use InvalidArgumentException; - use Throwable; use function is_array;