Fixed #846 choosing GET and POST in endpoints based on body

ezimuel · ezimuel · commit cdbeab382f47 · 2019-07-18T17:03:00.000+02:00
diff --git a/src/Elasticsearch/Endpoints/Cluster/AllocationExplain.php b/src/Elasticsearch/Endpoints/Cluster/AllocationExplain.php
@@ -57,6 +57,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Count.php b/src/Elasticsearch/Endpoints/Count.php
@@ -82,6 +82,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/CountPercolate.php b/src/Elasticsearch/Endpoints/CountPercolate.php
@@ -85,6 +85,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Explain.php b/src/Elasticsearch/Endpoints/Explain.php
@@ -95,6 +95,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/FieldCaps.php b/src/Elasticsearch/Endpoints/FieldCaps.php
@@ -64,6 +64,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/FieldStats.php b/src/Elasticsearch/Endpoints/FieldStats.php
@@ -68,6 +68,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Indices/Analyze.php b/src/Elasticsearch/Endpoints/Indices/Analyze.php
@@ -74,6 +74,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Indices/ValidateQuery.php b/src/Elasticsearch/Endpoints/Indices/ValidateQuery.php
@@ -72,6 +72,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Ingest/Simulate.php b/src/Elasticsearch/Endpoints/Ingest/Simulate.php
@@ -60,6 +60,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/MTermVectors.php b/src/Elasticsearch/Endpoints/MTermVectors.php
@@ -65,6 +65,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'POST';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Mget.php b/src/Elasticsearch/Endpoints/Mget.php
@@ -88,6 +88,6 @@ public function getBody()
      */
     public function getMethod()
     {
-        return 'POST';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Msearch.php b/src/Elasticsearch/Endpoints/Msearch.php
@@ -99,6 +99,6 @@ public function getBody()
      */
     public function getMethod()
     {
-        return 'GET';
+        return 'POST';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/MsearchTemplate.php b/src/Elasticsearch/Endpoints/MsearchTemplate.php
@@ -100,6 +100,6 @@ public function getBody()
      */
     public function getMethod()
     {
-        return 'GET';
+        return 'POST';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Percolate.php b/src/Elasticsearch/Endpoints/Percolate.php
@@ -93,6 +93,6 @@ public function getBody()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/RenderSearchTemplate.php b/src/Elasticsearch/Endpoints/RenderSearchTemplate.php
@@ -72,6 +72,6 @@ public function getBody()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Scroll.php b/src/Elasticsearch/Endpoints/Scroll.php
@@ -97,6 +97,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/Search.php b/src/Elasticsearch/Endpoints/Search.php
@@ -107,6 +107,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/SearchTemplate.php b/src/Elasticsearch/Endpoints/SearchTemplate.php
@@ -74,6 +74,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'GET';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/src/Elasticsearch/Endpoints/TermVectors.php b/src/Elasticsearch/Endpoints/TermVectors.php
@@ -90,6 +90,6 @@ public function getParamWhitelist()
      */
     public function getMethod()
     {
-        return 'POST';
+        return isset($this->body) ? 'POST' : 'GET';
     }
 }
diff --git a/tests/Elasticsearch/Tests/Connections/ConnectionTest.php b/tests/Elasticsearch/Tests/Connections/ConnectionTest.php
@@ -5,6 +5,7 @@
 use Elasticsearch\ClientBuilder;
 use Elasticsearch\Connections\Connection;
 use Elasticsearch\Serializers\SerializerInterface;
+use Elasticsearch\Serializers\SmartSerializer;
 use Psr\Log\LoggerInterface;
 
 class ConnectionTest extends \PHPUnit\Framework\TestCase
@@ -38,7 +39,7 @@ function(){},
 
         $this->assertInstanceOf(Connection::class, $connection);
     }
-    
+
     public function testGetHeadersContainUserAgent()
     {
         $params = [];
diff --git a/tests/Elasticsearch/Tests/Endpoints/StatusEndpointTest.php b/tests/Elasticsearch/Tests/Endpoints/StatusEndpointTest.php
@@ -1,7 +1,4 @@
 <?php
-
-declare(strict_types = 1);
-
 namespace Elasticsearch\Tests\Endpoints;
 
 use Elasticsearch\Endpoints\Snapshot\Status;

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ public function getParamWhitelist()`
`57`	`57`	`*/`
`58`	`58`	`public function getMethod()`
`59`	`59`	`{`
`60`		`- return 'GET';`
	`60`	`+ return isset($this->body) ? 'POST' : 'GET';`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ public function getParamWhitelist()`
`82`	`82`	`*/`
`83`	`83`	`public function getMethod()`
`84`	`84`	`{`
`85`		`- return 'GET';`
	`85`	`+ return isset($this->body) ? 'POST' : 'GET';`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,6 @@ public function getParamWhitelist()`
`85`	`85`	`*/`
`86`	`86`	`public function getMethod()`
`87`	`87`	`{`
`88`		`- return 'GET';`
	`88`	`+ return isset($this->body) ? 'POST' : 'GET';`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,6 @@ public function getParamWhitelist()`
`95`	`95`	`*/`
`96`	`96`	`public function getMethod()`
`97`	`97`	`{`
`98`		`- return 'GET';`
	`98`	`+ return isset($this->body) ? 'POST' : 'GET';`
`99`	`99`	`}`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ public function getParamWhitelist()`
`64`	`64`	`*/`
`65`	`65`	`public function getMethod()`
`66`	`66`	`{`
`67`		`- return 'GET';`
	`67`	`+ return isset($this->body) ? 'POST' : 'GET';`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,6 @@ public function getParamWhitelist()`
`68`	`68`	`*/`
`69`	`69`	`public function getMethod()`
`70`	`70`	`{`
`71`		`- return 'GET';`
	`71`	`+ return isset($this->body) ? 'POST' : 'GET';`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@ public function getParamWhitelist()`
`74`	`74`	`*/`
`75`	`75`	`public function getMethod()`
`76`	`76`	`{`
`77`		`- return 'GET';`
	`77`	`+ return isset($this->body) ? 'POST' : 'GET';`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ public function getParamWhitelist()`
`72`	`72`	`*/`
`73`	`73`	`public function getMethod()`
`74`	`74`	`{`
`75`		`- return 'GET';`
	`75`	`+ return isset($this->body) ? 'POST' : 'GET';`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ public function getParamWhitelist()`
`60`	`60`	`*/`
`61`	`61`	`public function getMethod()`
`62`	`62`	`{`
`63`		`- return 'GET';`
	`63`	`+ return isset($this->body) ? 'POST' : 'GET';`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,6 @@ public function getParamWhitelist()`
`65`	`65`	`*/`
`66`	`66`	`public function getMethod()`
`67`	`67`	`{`
`68`		`- return 'POST';`
	`68`	`+ return isset($this->body) ? 'POST' : 'GET';`
`69`	`69`	`}`
`70`	`70`	`}`