Merge branch 'fix/suppress-deprecation'

ezimuel · ezimuel · commit 5afb458e7153 · 2019-11-26T12:39:47.000+01:00
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,8 +10,6 @@
 >
     <php>
         <env name="ES_TEST_HOST" value=""/>
-        <!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
-        <ini name="error_reporting" value="16383"/>
     </php>
     <testsuites>
         <testsuite name="Tests">
diff --git a/src/Elasticsearch/Endpoints/Bulk.php b/src/Elasticsearch/Endpoints/Bulk.php
@@ -31,7 +31,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/ClearScroll.php b/src/Elasticsearch/Endpoints/ClearScroll.php
@@ -24,7 +24,7 @@ public function getURI(): string
     {
         $scroll_id = $this->scroll_id ?? null;
         if (isset($scroll_id)) {
-            trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);
+            @trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);
         }
 
         if (isset($scroll_id)) {
diff --git a/src/Elasticsearch/Endpoints/Count.php b/src/Elasticsearch/Endpoints/Count.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Create.php b/src/Elasticsearch/Endpoints/Create.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Delete.php b/src/Elasticsearch/Endpoints/Delete.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/DeleteByQuery.php b/src/Elasticsearch/Endpoints/DeleteByQuery.php
@@ -30,7 +30,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Exists.php b/src/Elasticsearch/Endpoints/Exists.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/ExistsSource.php b/src/Elasticsearch/Endpoints/ExistsSource.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Explain.php b/src/Elasticsearch/Endpoints/Explain.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Get.php b/src/Elasticsearch/Endpoints/Get.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/GetSource.php b/src/Elasticsearch/Endpoints/GetSource.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Index.php b/src/Elasticsearch/Endpoints/Index.php
@@ -31,7 +31,7 @@ public function getURI(): string
         $id = $this->id ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type) && isset($id)) {
diff --git a/src/Elasticsearch/Endpoints/Indices/ExistsType.php b/src/Elasticsearch/Endpoints/Indices/ExistsType.php
@@ -25,7 +25,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Indices/GetFieldMapping.php b/src/Elasticsearch/Endpoints/Indices/GetFieldMapping.php
@@ -32,7 +32,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Indices/GetMapping.php b/src/Elasticsearch/Endpoints/Indices/GetMapping.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Indices/PutMapping.php b/src/Elasticsearch/Endpoints/Indices/PutMapping.php
@@ -25,7 +25,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Indices/ValidateQuery.php b/src/Elasticsearch/Endpoints/Indices/ValidateQuery.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/MTermVectors.php b/src/Elasticsearch/Endpoints/MTermVectors.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Mget.php b/src/Elasticsearch/Endpoints/Mget.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Msearch.php b/src/Elasticsearch/Endpoints/Msearch.php
@@ -31,7 +31,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/MsearchTemplate.php b/src/Elasticsearch/Endpoints/MsearchTemplate.php
@@ -31,7 +31,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/Scroll.php b/src/Elasticsearch/Endpoints/Scroll.php
@@ -24,7 +24,7 @@ public function getURI(): string
     {
         $scroll_id = $this->scroll_id ?? null;
         if (isset($scroll_id)) {
-            trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);
+            @trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);
         }
 
         if (isset($scroll_id)) {
diff --git a/src/Elasticsearch/Endpoints/Search.php b/src/Elasticsearch/Endpoints/Search.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/SearchTemplate.php b/src/Elasticsearch/Endpoints/SearchTemplate.php
@@ -24,7 +24,7 @@ public function getURI(): string
         $index = $this->index ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($index) && isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/TermVectors.php b/src/Elasticsearch/Endpoints/TermVectors.php
@@ -31,7 +31,7 @@ public function getURI(): string
         $id = $this->id ?? null;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type) && isset($id)) {
diff --git a/src/Elasticsearch/Endpoints/Update.php b/src/Elasticsearch/Endpoints/Update.php
@@ -36,7 +36,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/src/Elasticsearch/Endpoints/UpdateByQuery.php b/src/Elasticsearch/Endpoints/UpdateByQuery.php
@@ -30,7 +30,7 @@ public function getURI(): string
         $index = $this->index;
         $type = $this->type ?? null;
         if (isset($type)) {
-            trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
+            @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
         }
 
         if (isset($type)) {
diff --git a/util/template/deprecated b/util/template/deprecated
@@ -1,3 +1,3 @@
         if (isset($:part)) {
-            trigger_error(':msg', E_USER_DEPRECATED);
+            @trigger_error(':msg', E_USER_DEPRECATED);
         }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`>`
`11`	`11`	`<php>`
`12`	`12`	`<env name="ES_TEST_HOST" value=""/>`
`13`		`- <!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->`
`14`		`- <ini name="error_reporting" value="16383"/>`
`15`	`13`	`</php>`
`16`	`14`	`<testsuites>`
`17`	`15`	`<testsuite name="Tests">`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getURI(): string`
`31`	`31`	`$index = $this->index ?? null;`
`32`	`32`	`$type = $this->type ?? null;`
`33`	`33`	`if (isset($type)) {`
`34`		`- trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
	`34`	`+ @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (isset($index) && isset($type)) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function getURI(): string`
`24`	`24`	`{`
`25`	`25`	`$scroll_id = $this->scroll_id ?? null;`
`26`	`26`	`if (isset($scroll_id)) {`
`27`		`- trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);`
	`27`	`+ @trigger_error('A scroll id can be quite large and should be specified as part of the body', E_USER_DEPRECATED);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (isset($scroll_id)) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getURI(): string`
`36`	`36`	`$index = $this->index;`
`37`	`37`	`$type = $this->type ?? null;`
`38`	`38`	`if (isset($type)) {`
`39`		`- trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
	`39`	`+ @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (isset($type)) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function getURI(): string`
`30`	`30`	`$index = $this->index;`
`31`	`31`	`$type = $this->type ?? null;`
`32`	`32`	`if (isset($type)) {`
`33`		`- trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
	`33`	`+ @trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (isset($type)) {`