Merge pull request #187 from line/get_params

Fix curl get params handling
line · Oct 24, 2018 · f8ab3a8 · f8ab3a8
2 parents c192891 + 6808484
commit f8ab3a8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/LINEBot/HTTPClient.php b/src/LINEBot/HTTPClient.php
@@ -31,7 +31,7 @@ interface HTTPClient
      * Sends GET request to LINE Messaging API.
      *
      * @param string $url Request URL.
-     * @param array $data Request body.
+     * @param array $data URL parameters.
      * @param array $headers
      * @return Response Response of API request.
      */

diff --git a/src/LINEBot/HTTPClient/CurlHTTPClient.php b/src/LINEBot/HTTPClient/CurlHTTPClient.php
@@ -63,7 +63,10 @@ public function __construct($channelToken)
      */
     public function get($url, array $data = [], array $headers = [])
     {
-        return $this->sendRequest('GET', $url, $headers, $data);
+        if ($data) {
+            $url .= '?' . http_build_query($data);
+        }
+        return $this->sendRequest('GET', $url, $headers);
     }
 
     /**

diff --git a/tests/LINEBot/HTTPClient/CurlHTTPClientTest.php b/tests/LINEBot/HTTPClient/CurlHTTPClientTest.php
@@ -75,13 +75,26 @@ protected function setUp()
     public function testGet()
     {
         $curl = new CurlHTTPClient("channel-token");
-        $res = $curl->get('127.0.0.1:' . CurlHTTPClientTest::$reqMirrorPort . '/foo/bar?buz=qux');
+        $res = $curl->get('127.0.0.1:' . CurlHTTPClientTest::$reqMirrorPort . '/foo/bar');
         $body = $res->getJSONDecodedBody();
         $this->assertNotNull($body);
         $this->assertEquals('GET', $body['_SERVER']['REQUEST_METHOD']);
         $this->assertEquals('/foo/bar', $body['_SERVER']['SCRIPT_NAME']);
         $this->assertEquals('', $body['Body']);
-        $this->assertEquals('buz=qux', $body['_SERVER']['QUERY_STRING']);
+        $this->assertEquals('Bearer channel-token', $body['_SERVER']['HTTP_AUTHORIZATION']);
+        $this->assertEquals('LINE-BotSDK-PHP/' . Meta::VERSION, $body['_SERVER']['HTTP_USER_AGENT']);
+    }
+
+    public function testGetWithParams()
+    {
+        $curl = new CurlHTTPClient("channel-token");
+        $res = $curl->get('127.0.0.1:' . CurlHTTPClientTest::$reqMirrorPort . '/foo/bar', ['baz' => 'qwer']);
+        $body = $res->getJSONDecodedBody();
+        $this->assertNotNull($body);
+        $this->assertEquals('GET', $body['_SERVER']['REQUEST_METHOD']);
+        $this->assertEquals('/foo/bar', $body['_SERVER']['SCRIPT_NAME']);
+        $this->assertEquals('', $body['Body']);
+        $this->assertEquals('baz=qwer', $body['_SERVER']['QUERY_STRING']);
         $this->assertEquals('Bearer channel-token', $body['_SERVER']['HTTP_AUTHORIZATION']);
         $this->assertEquals('LINE-BotSDK-PHP/' . Meta::VERSION, $body['_SERVER']['HTTP_USER_AGENT']);
     }