Skip to content

Commit 5afb458

Browse files
ezimuelezimuel
committed
Merge branch 'fix/suppress-deprecation'
2 parents e6c7b42 + 8de5784 commit 5afb458

29 files changed

+28
-30
lines changed

‎phpunit.xml.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
>
1111
<php>
1212
<env name="ES_TEST_HOST" value=""/>
13-
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
14-
<ini name="error_reporting" value="16383"/>
1513
</php>
1614
<testsuites>
1715
<testsuite name="Tests">

‎src/Elasticsearch/Endpoints/Bulk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getURI(): string
3131
$index = $this->index ?? null;
3232
$type = $this->type ?? null;
3333
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);
3535
}
3636

3737
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/ClearScroll.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
{
2525
$scroll_id = $this->scroll_id ?? null;
2626
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);
2828
}
2929

3030
if (isset($scroll_id)) {

‎src/Elasticsearch/Endpoints/Count.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Create.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/DeleteByQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getURI(): string
3030
$index = $this->index;
3131
$type = $this->type ?? null;
3232
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);
3434
}
3535

3636
if (isset($type)) {

‎src/Elasticsearch/Endpoints/Exists.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/ExistsSource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/Explain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/Get.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/GetSource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getURI(): string
3131
$id = $this->id ?? null;
3232
$type = $this->type ?? null;
3333
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);
3535
}
3636

3737
if (isset($type) && isset($id)) {

‎src/Elasticsearch/Endpoints/Indices/ExistsType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function getURI(): string
2525
$index = $this->index ?? null;
2626
$type = $this->type ?? null;
2727
if (isset($type)) {
28-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
28+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2929
}
3030

3131
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Indices/GetFieldMapping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function getURI(): string
3232
$index = $this->index ?? null;
3333
$type = $this->type ?? null;
3434
if (isset($type)) {
35-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
35+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
3636
}
3737

3838
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Indices/GetMapping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Indices/PutMapping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function getURI(): string
2525
$index = $this->index ?? null;
2626
$type = $this->type ?? null;
2727
if (isset($type)) {
28-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
28+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2929
}
3030

3131
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Indices/ValidateQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/MTermVectors.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Mget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Msearch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getURI(): string
3131
$index = $this->index ?? null;
3232
$type = $this->type ?? null;
3333
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);
3535
}
3636

3737
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/MsearchTemplate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getURI(): string
3131
$index = $this->index ?? null;
3232
$type = $this->type ?? null;
3333
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);
3535
}
3636

3737
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/Scroll.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
{
2525
$scroll_id = $this->scroll_id ?? null;
2626
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);
2828
}
2929

3030
if (isset($scroll_id)) {

‎src/Elasticsearch/Endpoints/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/SearchTemplate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getURI(): string
2424
$index = $this->index ?? null;
2525
$type = $this->type ?? null;
2626
if (isset($type)) {
27-
trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
27+
@trigger_error('Specifying types in urls has been deprecated', E_USER_DEPRECATED);
2828
}
2929

3030
if (isset($index) && isset($type)) {

‎src/Elasticsearch/Endpoints/TermVectors.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getURI(): string
3131
$id = $this->id ?? null;
3232
$type = $this->type ?? null;
3333
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);
3535
}
3636

3737
if (isset($type) && isset($id)) {

‎src/Elasticsearch/Endpoints/Update.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getURI(): string
3636
$index = $this->index;
3737
$type = $this->type ?? null;
3838
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);
4040
}
4141

4242
if (isset($type)) {

‎src/Elasticsearch/Endpoints/UpdateByQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getURI(): string
3030
$index = $this->index;
3131
$type = $this->type ?? null;
3232
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);
3434
}
3535

3636
if (isset($type)) {

‎util/template/deprecated

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
if (isset($:part)) {
2-
trigger_error(':msg', E_USER_DEPRECATED);
2+
@trigger_error(':msg', E_USER_DEPRECATED);
33
}

0 commit comments

Comments
 (0)