diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 6eb11a45..41f8ee79 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -6,24 +6,6 @@ parameters: count: 1 path: src/Monolog/ErrorHandler.php - - - message: '#^Method Monolog\\Formatter\\JsonFormatter\:\:normalizeException\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: src/Monolog/Formatter/JsonFormatter.php - - - - message: '#^PHPDoc tag @return with type array\\|int\|string\>\|int\|string\>\|string is not subtype of native type array\.$#' - identifier: return.phpDocType - count: 1 - path: src/Monolog/Formatter/JsonFormatter.php - - - - message: '#^Return type \(array\) of method Monolog\\Formatter\\JsonFormatter\:\:normalizeException\(\) should be covariant with return type \(array\\|int\|string\>\|int\|string\>\|string\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\)$#' - identifier: method.childReturnType - count: 1 - path: src/Monolog/Formatter/JsonFormatter.php - - message: '#^Return type \(array\\|bool\|float\|int\|object\|string\|null\>\|bool\|float\|int\|object\|string\|null\) of method Monolog\\Formatter\\JsonFormatter\:\:normalize\(\) should be covariant with return type \(array\\|bool\|float\|int\|string\|null\>\|bool\|float\|int\|string\|null\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalize\(\)$#' identifier: method.childReturnType @@ -37,13 +19,13 @@ parameters: path: src/Monolog/Formatter/JsonFormatter.php - - message: '#^Method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\) should return array\\|int\|string\>\|int\|string\>\|string but returns array\\.$#' - identifier: return.type + message: '#^Return type \(string\) of method Monolog\\Formatter\\LineFormatter\:\:normalizeException\(\) should be compatible with return type \(array\\|int\|string\>\|int\|string\>\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\)$#' + identifier: method.childReturnType count: 1 - path: src/Monolog/Formatter/NormalizerFormatter.php + path: src/Monolog/Formatter/LineFormatter.php - - message: '#^Method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\) should return array\\|int\|string\>\|int\|string\>\|string but returns array\\|string, array\\|int\|string\>\|int\|string\>\|int\|string\>\.$#' + message: '#^Method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\) should return array\\|int\|string\>\|int\|string\> but returns array\\|int\|string\>\|int\|string\>\|int\|string\>\.$#' identifier: return.type count: 1 path: src/Monolog/Formatter/NormalizerFormatter.php diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php index 2f430540..b59639e1 100644 --- a/src/Monolog/Formatter/JsonFormatter.php +++ b/src/Monolog/Formatter/JsonFormatter.php @@ -216,7 +216,7 @@ class JsonFormatter extends NormalizerFormatter * Normalizes given exception with or without its own stack trace based on * `includeStacktraces` property. * - * @return array>>|string + * @return array>> */ protected function normalizeException(Throwable $e, int $depth = 0): array { diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index 261967f1..c2660359 100644 --- a/src/Monolog/Formatter/NormalizerFormatter.php +++ b/src/Monolog/Formatter/NormalizerFormatter.php @@ -248,7 +248,7 @@ class NormalizerFormatter implements FormatterInterface } /** - * @return array>>|string + * @return array>> */ protected function normalizeException(Throwable $e, int $depth = 0) {