Skip to content

Commit

Permalink
Fix phpstan build
Browse files Browse the repository at this point in the history
  • Loading branch information
Seldaek committed Nov 9, 2024
1 parent e5b3586 commit d5b588a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 3 deletions.
27 changes: 26 additions & 1 deletion phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,32 @@ parameters:
path: src/Monolog/Formatter/WildfireFormatter.php

-
message: "#^Cannot access offset 'items' on array\\|Elastic\\\\Elasticsearch\\\\Response\\\\Elasticsearch\\.$#"
message: "#^Access to constant VERSION on an unknown class Elasticsearch\\\\Client\\.$#"
count: 1
path: src/Monolog/Handler/ElasticsearchHandler.php

-
message: "#^Call to method bulk\\(\\) on an unknown class Elasticsearch\\\\Client\\.$#"
count: 1
path: src/Monolog/Handler/ElasticsearchHandler.php

-
message: "#^Method Monolog\\\\Handler\\\\ElasticsearchHandler\\:\\:createExceptionFromError\\(\\) should return Throwable but returns Elasticsearch\\\\Common\\\\Exceptions\\\\RuntimeException\\.$#"
count: 1
path: src/Monolog/Handler/ElasticsearchHandler.php

-
message: "#^Method Monolog\\\\Handler\\\\ElasticsearchHandler\\:\\:createExceptionFromResponses\\(\\) should return Throwable but returns Elasticsearch\\\\Common\\\\Exceptions\\\\RuntimeException\\.$#"
count: 1
path: src/Monolog/Handler/ElasticsearchHandler.php

-
message: "#^Parameter \\$client of method Monolog\\\\Handler\\\\ElasticsearchHandler\\:\\:__construct\\(\\) has invalid type Elasticsearch\\\\Client\\.$#"
count: 2
path: src/Monolog/Handler/ElasticsearchHandler.php

-
message: "#^Property Monolog\\\\Handler\\\\ElasticsearchHandler\\:\\:\\$client has unknown class Elasticsearch\\\\Client as its type\\.$#"
count: 1
path: src/Monolog/Handler/ElasticsearchHandler.php

Expand Down
12 changes: 10 additions & 2 deletions src/Monolog/Handler/ElasticsearchHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ protected function createExceptionFromResponses($responses): Throwable
return new ElasticInvalidArgumentException('Elasticsearch failed to index one or more records.');
}

return new ElasticsearchRuntimeException('Elasticsearch failed to index one or more records.');
if (class_exists(ElasticsearchRuntimeException::class)) {
return new ElasticsearchRuntimeException('Elasticsearch failed to index one or more records.');
}

throw new \LogicException('Unsupported elastic search client version');
}

/**
Expand All @@ -225,6 +229,10 @@ protected function createExceptionFromError(array $error): Throwable
return new ElasticInvalidArgumentException($error['type'] . ': ' . $error['reason'], 0, $previous);
}

return new ElasticsearchRuntimeException($error['type'] . ': ' . $error['reason'], 0, $previous);
if (class_exists(ElasticsearchRuntimeException::class)) {
return new ElasticsearchRuntimeException($error['type'].': '.$error['reason'], 0, $previous);
}

throw new \LogicException('Unsupported elastic search client version');
}
}

0 comments on commit d5b588a

Please sign in to comment.