From 4bfbba8de070a14249f01b0299e7e5ae7985bc64 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 28 Jun 2024 11:01:44 +0200 Subject: [PATCH] Fix build --- .github/workflows/continuous-integration.yml | 2 +- phpstan-baseline.neon | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5a760868..246126ec 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -159,7 +159,7 @@ jobs: if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'" run: | composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch rollbar/rollbar - composer require --no-update --no-interaction --dev ruflin/elastica elasticsearch/elasticsearch:^7 + composer require --no-update --no-interaction --dev ruflin/elastica:^7 elasticsearch/elasticsearch:^7 composer require --no-update psr/log:^3 composer update -W composer exec phpunit -- --group Elasticsearch,Elastica diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 53a1ad71..cd24242b 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -10,11 +10,21 @@ parameters: count: 1 path: src/Monolog/Formatter/JsonFormatter.php + - + message: "#^Cannot access offset 'table' on array\\\\|bool\\|float\\|int\\|object\\|string\\.$#" + count: 1 + path: src/Monolog/Formatter/WildfireFormatter.php + - message: "#^Return type \\(array\\\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method Monolog\\\\Formatter\\\\WildfireFormatter\\:\\:normalize\\(\\) should be covariant with return type \\(array\\\\|bool\\|float\\|int\\|string\\|null\\) of method Monolog\\\\Formatter\\\\NormalizerFormatter\\:\\:normalize\\(\\)$#" count: 1 path: src/Monolog/Formatter/WildfireFormatter.php + - + message: "#^Cannot access offset 'items' on array\\|Elastic\\\\Elasticsearch\\\\Response\\\\Elasticsearch\\.$#" + count: 1 + path: src/Monolog/Handler/ElasticsearchHandler.php + - message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#" count: 1