Skip to content

Commit cdbeab3

Browse files
committed
Fixed #846 choosing GET and POST in endpoints based on body
1 parent 26da9a3 commit cdbeab3

21 files changed

+21
-23
lines changed

src/Elasticsearch/Endpoints/Cluster/AllocationExplain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ public function getParamWhitelist()
5757
*/
5858
public function getMethod()
5959
{
60-
return 'GET';
60+
return isset($this->body) ? 'POST' : 'GET';
6161
}
6262
}

src/Elasticsearch/Endpoints/Count.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ public function getParamWhitelist()
8282
*/
8383
public function getMethod()
8484
{
85-
return 'GET';
85+
return isset($this->body) ? 'POST' : 'GET';
8686
}
8787
}

src/Elasticsearch/Endpoints/CountPercolate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ public function getParamWhitelist()
8585
*/
8686
public function getMethod()
8787
{
88-
return 'GET';
88+
return isset($this->body) ? 'POST' : 'GET';
8989
}
9090
}

src/Elasticsearch/Endpoints/Explain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ public function getParamWhitelist()
9595
*/
9696
public function getMethod()
9797
{
98-
return 'GET';
98+
return isset($this->body) ? 'POST' : 'GET';
9999
}
100100
}

src/Elasticsearch/Endpoints/FieldCaps.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ public function getParamWhitelist()
6464
*/
6565
public function getMethod()
6666
{
67-
return 'GET';
67+
return isset($this->body) ? 'POST' : 'GET';
6868
}
6969
}

src/Elasticsearch/Endpoints/FieldStats.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ public function getParamWhitelist()
6868
*/
6969
public function getMethod()
7070
{
71-
return 'GET';
71+
return isset($this->body) ? 'POST' : 'GET';
7272
}
7373
}

src/Elasticsearch/Endpoints/Indices/Analyze.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public function getParamWhitelist()
7474
*/
7575
public function getMethod()
7676
{
77-
return 'GET';
77+
return isset($this->body) ? 'POST' : 'GET';
7878
}
7979
}

src/Elasticsearch/Endpoints/Indices/ValidateQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ public function getParamWhitelist()
7272
*/
7373
public function getMethod()
7474
{
75-
return 'GET';
75+
return isset($this->body) ? 'POST' : 'GET';
7676
}
7777
}

src/Elasticsearch/Endpoints/Ingest/Simulate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ public function getParamWhitelist()
6060
*/
6161
public function getMethod()
6262
{
63-
return 'GET';
63+
return isset($this->body) ? 'POST' : 'GET';
6464
}
6565
}

src/Elasticsearch/Endpoints/MTermVectors.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ public function getParamWhitelist()
6565
*/
6666
public function getMethod()
6767
{
68-
return 'POST';
68+
return isset($this->body) ? 'POST' : 'GET';
6969
}
7070
}

src/Elasticsearch/Endpoints/Mget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ public function getBody()
8888
*/
8989
public function getMethod()
9090
{
91-
return 'POST';
91+
return isset($this->body) ? 'POST' : 'GET';
9292
}
9393
}

src/Elasticsearch/Endpoints/Msearch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ public function getBody()
9999
*/
100100
public function getMethod()
101101
{
102-
return 'GET';
102+
return 'POST';
103103
}
104104
}

src/Elasticsearch/Endpoints/MsearchTemplate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ public function getBody()
100100
*/
101101
public function getMethod()
102102
{
103-
return 'GET';
103+
return 'POST';
104104
}
105105
}

src/Elasticsearch/Endpoints/Percolate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ public function getBody()
9393
*/
9494
public function getMethod()
9595
{
96-
return 'GET';
96+
return isset($this->body) ? 'POST' : 'GET';
9797
}
9898
}

src/Elasticsearch/Endpoints/RenderSearchTemplate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ public function getBody()
7272
*/
7373
public function getMethod()
7474
{
75-
return 'GET';
75+
return isset($this->body) ? 'POST' : 'GET';
7676
}
7777
}

src/Elasticsearch/Endpoints/Scroll.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,6 @@ public function getParamWhitelist()
9797
*/
9898
public function getMethod()
9999
{
100-
return 'GET';
100+
return isset($this->body) ? 'POST' : 'GET';
101101
}
102102
}

src/Elasticsearch/Endpoints/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ public function getParamWhitelist()
107107
*/
108108
public function getMethod()
109109
{
110-
return 'GET';
110+
return isset($this->body) ? 'POST' : 'GET';
111111
}
112112
}

src/Elasticsearch/Endpoints/SearchTemplate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public function getParamWhitelist()
7474
*/
7575
public function getMethod()
7676
{
77-
return 'GET';
77+
return isset($this->body) ? 'POST' : 'GET';
7878
}
7979
}

src/Elasticsearch/Endpoints/TermVectors.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ public function getParamWhitelist()
9090
*/
9191
public function getMethod()
9292
{
93-
return 'POST';
93+
return isset($this->body) ? 'POST' : 'GET';
9494
}
9595
}

tests/Elasticsearch/Tests/Connections/ConnectionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Elasticsearch\ClientBuilder;
66
use Elasticsearch\Connections\Connection;
77
use Elasticsearch\Serializers\SerializerInterface;
8+
use Elasticsearch\Serializers\SmartSerializer;
89
use Psr\Log\LoggerInterface;
910

1011
class ConnectionTest extends \PHPUnit\Framework\TestCase
@@ -38,7 +39,7 @@ function(){},
3839

3940
$this->assertInstanceOf(Connection::class, $connection);
4041
}
41-
42+
4243
public function testGetHeadersContainUserAgent()
4344
{
4445
$params = [];

tests/Elasticsearch/Tests/Endpoints/StatusEndpointTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<?php
2-
3-
declare(strict_types = 1);
4-
52
namespace Elasticsearch\Tests\Endpoints;
63

74
use Elasticsearch\Endpoints\Snapshot\Status;

0 commit comments

Comments
 (0)