Merge fa3ba0a into f71bab3

ruflin · Oct 27, 2020 · 95b0800 · 95b0800
2 parents f71bab3 + fa3ba0a
commit 95b0800
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/Exception/ElasticsearchException.php b/src/Exception/ElasticsearchException.php
@@ -8,6 +8,8 @@
  * Elasticsearch exception.
  *
  * @author Ian Babrou <ibobrik@gmail.com>
+ *
+ * @deprecated since version 5.2.0
  */
 class ElasticsearchException extends \Exception implements ExceptionInterface
 {

diff --git a/src/Exception/ResponseException.php b/src/Exception/ResponseException.php
@@ -54,10 +54,12 @@ public function getResponse(): Response
 
     /**
      * Returns elasticsearch exception.
+     *
+     * @deprecated since version 7.1.0, use the "getResponse()::getFullError()" method instead.
      */
     public function getElasticsearchException(): ElasticsearchException
     {
-        trigger_deprecation('ruflin/elastica', '7.1.0', 'The "%s()" method is deprecated, use "%s::getResponse()::getFullError()" instead. It will be removed in 8.0.', __METHOD__, __CLASS__);
+        trigger_deprecation('ruflin/elastica', '7.1.0', 'The "%s()" method is deprecated, use "getResponse()::getFullError()" instead. It will be removed in 8.0.', __METHOD__);
 
         $response = $this->getResponse();
 

diff --git a/src/Query/Match.php b/src/Query/Match.php
@@ -11,7 +11,7 @@
  *
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
- * @deprecated Use MatchQuery instead. From PHP 8 match is reserved word and this class will be removed in further Elastica releases
+ * @deprecated since version 7.1.0, use the MatchQuery class instead.
  */
 class Match extends MatchQuery
 {

diff --git a/src/QueryBuilder/DSL/Aggregation.php b/src/QueryBuilder/DSL/Aggregation.php
@@ -233,11 +233,11 @@ public function global(string $name): GlobalAggregation
     }
 
     /**
-     * @deprecated since Elastica 7.0.1, use the "global()" method instead.
+     * @deprecated since version 7.1.0, use the "global()" method instead.
      */
     public function global_agg(string $name): GlobalAggregation
     {
-        trigger_deprecation('ruflin/elastica', '7.1.0', 'The "%s()" method is deprecated, use global() instead. It will be removed in 8.0.', __METHOD__);
+        trigger_deprecation('ruflin/elastica', '7.1.0', 'The "%s()" method is deprecated, use "global()"  instead. It will be removed in 8.0.', __METHOD__);
 
         return $this->global($name);
     }