Simplify Http Client

Author: barryvdh

src/Common/Http/Client.php

@@ -39,12 +39,8 @@ public function __construct($httpClient = null, RequestFactory $requestFactory =
      * @param string $protocolVersion
      * @return ResponseInterface
      */
-    public function send($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1')
+    public function request($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1')
     {
-        if (is_array($body)) {
-            $body = http_build_query($body, '', '&');
-        }
-
         $request = $this->createRequest($method, $uri, $headers, $body, $protocolVersion);
 
         return $this->sendRequest($request);
@@ -71,29 +67,4 @@ public function sendRequest(RequestInterface $request)
     {
         return $this->httpClient->sendRequest($request);
     }
-
-    /**
-     * Send a GET request.
-     *
-     * @param UriInterface|string $uri
-     * @param array $headers
-     * @return ResponseInterface
-     */
-    public function get($uri, array $headers = [])
-    {
-        return $this->send('GET', $uri, $headers);
-    }
-
-    /**
-     * Send a POST request.
-     *
-     * @param UriInterface|string $uri
-     * @param array $headers
-     * @param string|array|null|resource|StreamInterface $body
-     * @return ResponseInterface
-     */
-    public function post($uri, array $headers = [], $body = null)
-    {
-        return $this->send('POST', $uri, $headers, $body);
-    }
 }

tests/Omnipay/Common/Http/ClientTest.php

@@ -48,70 +48,6 @@ public function testSend()
 
         $mockClient->shouldReceive('sendRequest')->with($request)->once();
 
-        $client->send('GET', '/path');
-    }
-
-    public function testSendParsesArrayBody()
-    {
-        $mockClient = m::mock(HttpClient::class);
-        $mockFactory = m::mock(RequestFactory::class);
-        $client = new Client($mockClient, $mockFactory);
-
-        $request = new Request('POST', '/path', [], 'a=1&b=2');
-
-        $mockFactory->shouldReceive('createRequest')->withArgs([
-            'POST',
-            '/path',
-            [],
-            'a=1&b=2',
-            '1.1',
-        ])->andReturn($request);
-
-        $mockClient->shouldReceive('sendRequest')->with($request)->once();
-
-        $client->send('POST', '/path', [], ['a'=>'1', 'b'=>2]);
-    }
-
-
-    public function testGet()
-    {
-        $mockClient = m::mock(HttpClient::class);
-        $mockFactory = m::mock(RequestFactory::class);
-        $client = new Client($mockClient, $mockFactory);
-
-        $request = new Request('GET', '/path');
-
-        $mockFactory->shouldReceive('createRequest')->withArgs([
-            'GET',
-            '/path',
-            [],
-            null,
-            '1.1',
-        ])->andReturn($request);
-
-        $mockClient->shouldReceive('sendRequest')->with($request)->once();
-
-        $client->get('/path');
-    }
-
-    public function testPost()
-    {
-        $mockClient = m::mock(HttpClient::class);
-        $mockFactory = m::mock(RequestFactory::class);
-        $client = new Client($mockClient, $mockFactory);
-
-        $request = new Request('POST', '/path', [], 'a=b');
-
-        $mockFactory->shouldReceive('createRequest')->withArgs([
-            'POST',
-            '/path',
-            [],
-            'a=b',
-            '1.1',
-        ])->andReturn($request);
-
-        $mockClient->shouldReceive('sendRequest')->with($request)->once();
-
-        $client->post('/path', [], ['a' => 'b']);
+        $client->request('GET', '/path');
     }
 }