Inject the GuzzleHttp\ClientInterface instead of the concrete class i…

…n the RpcClient constructor
cyb3rd4d · Jan 13, 2016 · 9a98dc0 · 9a98dc0
1 parent 818b552
commit 9a98dc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/RpcClient.php b/src/RpcClient.php
@@ -2,15 +2,15 @@
 
 namespace Martial\Transmission\API;
 
-use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\RequestException;
 use Martial\Transmission\API\Argument\Torrent\Add;
 
 class RpcClient implements TransmissionAPI
 {
     /**
-     * @var Client
+     * @var ClientInterface
      */
     private $httpClient;
 
@@ -27,11 +27,11 @@ class RpcClient implements TransmissionAPI
     /**
      * RpcClient constructor.
      *
-     * @param Client $httpClient
+     * @param ClientInterface $httpClient
      * @param string $rpcUsername
      * @param string $rpcPassword
      */
-    public function __construct(Client $httpClient, $rpcUsername, $rpcPassword)
+    public function __construct(ClientInterface $httpClient, $rpcUsername, $rpcPassword)
     {
         $this->httpClient = $httpClient;
         $this->rpcUsername = $rpcUsername;
@@ -501,7 +501,7 @@ private function sendRequest($sessionId, $requestBody)
         try {
             $response = $this
                 ->httpClient
-                ->post('', [
+                ->request('POST', '', [
                     'body' => $requestBody,
                     'auth' => [$this->rpcUsername, $this->rpcPassword],
                     'headers' => [

diff --git a/tests/RpcClientTest.php b/tests/RpcClientTest.php
@@ -36,7 +36,7 @@ class RpcClientTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->guzzle = m::mock('\GuzzleHttp\Client');
+        $this->guzzle = m::mock('\GuzzleHttp\ClientInterface');
         $this->guzzleResponse = m::mock('\Psr\Http\Message\ResponseInterface');
         $this->sessionId = uniqid();
         $this->rpcClient = new RpcClient($this->guzzle, self::RPC_USERNAME, self::RPC_PASSWORD);
@@ -1774,13 +1774,15 @@ private function sendRequest($requestBody, $sessionId = '')
 
         return $this
             ->guzzle
-            ->shouldReceive('post')
+            ->shouldReceive('request')
             ->once()
-            ->with('', [
-                'body' => $requestBody,
-                'auth' => [self::RPC_USERNAME, self::RPC_PASSWORD],
-                'headers' => [
-                    'X-Transmission-Session-Id' => $sessionId
+            ->withArgs([
+                'POST',
+                '',
+                [
+                    'body' => $requestBody,
+                    'auth' => [self::RPC_USERNAME, self::RPC_PASSWORD],
+                    'headers' => ['X-Transmission-Session-Id' => $sessionId]
                 ]
             ]);
     }