Jordi Boggiano 1 рік тому
батько
коміт
4bfbba8de0
2 змінених файлів з 11 додано та 1 видалено
  1. 1 1
      .github/workflows/continuous-integration.yml
  2. 10 0
      phpstan-baseline.neon

+ 1 - 1
.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

+ 10 - 0
phpstan-baseline.neon

@@ -10,11 +10,21 @@ parameters:
 			count: 1
 			path: src/Monolog/Formatter/JsonFormatter.php
 
+		-
+			message: "#^Cannot access offset 'table' on array\\<array\\|bool\\|float\\|int\\|string\\|null\\>\\|bool\\|float\\|int\\|object\\|string\\.$#"
+			count: 1
+			path: src/Monolog/Formatter/WildfireFormatter.php
+
 		-
 			message: "#^Return type \\(array\\<array\\|bool\\|float\\|int\\|string\\|null\\>\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method Monolog\\\\Formatter\\\\WildfireFormatter\\:\\:normalize\\(\\) should be covariant with return type \\(array\\<array\\|bool\\|float\\|int\\|string\\|null\\>\\|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