diff --git a/composer.json b/composer.json index c5d04c8f..8244768f 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "require-dev": { "ext-posix": "*", "phpunit/phpunit": "9.5.10", - "vimeo/psalm": "4.10.0", + "vimeo/psalm": "4.11.1", "squizlabs/php_codesniffer": "3.6.1", "mockery/mockery": "1.4.4", "psalm/plugin-mockery": "0.9.0", diff --git a/composer.lock b/composer.lock index 64354a2e..d8eb0582 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8c6e7bb44e1a9a10dec51411b6795b69", + "content-hash": "590bf87206a4c8421c3eb9be386d223d", "packages": [ { "name": "amphp/amp", @@ -1987,16 +1987,16 @@ }, { "name": "composer/semver", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "reference": "83e511e247de329283478496f7a1e114c9517506" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", + "reference": "83e511e247de329283478496f7a1e114c9517506", "shasum": "" }, "require": { @@ -2048,7 +2048,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.6" }, "funding": [ { @@ -2064,7 +2064,7 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2021-10-25T11:34:17+00:00" }, { "name": "composer/xdebug-handler", @@ -3213,16 +3213,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -3233,7 +3233,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -3263,22 +3264,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", "shasum": "" }, "require": { @@ -3313,9 +3314,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" }, - "time": "2021-09-17T15:28:14+00:00" + "time": "2021-10-02T14:08:47+00:00" }, { "name": "phpspec/prophecy", @@ -5493,16 +5494,16 @@ }, { "name": "vimeo/psalm", - "version": "4.10.0", + "version": "4.11.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "916b098b008f6de4543892b1e0651c1c3b92cbfa" + "reference": "e33492398bd4e5e2ab60e331d445979bd83feecd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/916b098b008f6de4543892b1e0651c1c3b92cbfa", - "reference": "916b098b008f6de4543892b1e0651c1c3b92cbfa", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/e33492398bd4e5e2ab60e331d445979bd83feecd", + "reference": "e33492398bd4e5e2ab60e331d445979bd83feecd", "shasum": "" }, "require": { @@ -5522,7 +5523,7 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.12", + "nikic/php-parser": "^4.13", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", @@ -5592,9 +5593,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.10.0" + "source": "https://github.com/vimeo/psalm/tree/4.11.1" }, - "time": "2021-09-04T21:00:09+00:00" + "time": "2021-10-24T12:29:22+00:00" }, { "name": "webmozart/assert", diff --git a/src/Lib/Log/StateCollector/CallerStateCollector.php b/src/Lib/Log/StateCollector/CallerStateCollector.php index 3ed20469..9697309d 100644 --- a/src/Lib/Log/StateCollector/CallerStateCollector.php +++ b/src/Lib/Log/StateCollector/CallerStateCollector.php @@ -38,6 +38,7 @@ public function collect(): array $result = []; if ($last_logger_frame) { assert(isset($last_logger_frame['file'])); + /** @psalm-suppress RedundantCondition */ assert(isset($last_logger_frame['line'])); $result['context'] = [ 'file' => $last_logger_frame['file'], diff --git a/src/Lib/Loop/LoopMiddleware/RetryOnExceptionMiddleware.php b/src/Lib/Loop/LoopMiddleware/RetryOnExceptionMiddleware.php index ba7ea40a..963456c9 100644 --- a/src/Lib/Loop/LoopMiddleware/RetryOnExceptionMiddleware.php +++ b/src/Lib/Loop/LoopMiddleware/RetryOnExceptionMiddleware.php @@ -39,6 +39,7 @@ public function invoke(): bool return $result; } catch (\Throwable $e) { foreach ($this->exception_names as $exception_name) { + /** @psalm-suppress DocblockTypeContradiction */ if (is_a($e, $exception_name)) { $this->current_retry_count++; continue 2;