Updated Guzzle version from 3.7.* to 6.*

Author: corpsee

CHANGELOG.md

@@ -7,3 +7,4 @@ master
 * Added alternative `symfony/console` versions (`~3.0` and `~4.0`).
 * Removed PHP versions < `5.6`.
 * Replace `guzzle/guzzle` by `guzzlehttp/guzzle`.
+* Updated Guzzle version from 3.7.* to 6.*.

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^5.6 || ^7.1",
-        "guzzlehttp/guzzle": "~3.7",
+        "guzzlehttp/guzzle": "~6.0",
         "symfony/console": "~2.5|~3.0|~4.0"
     },
     "require-dev":{

src/Mremi/Flowdock/Api/Push/BaseMessage.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Base push message class
@@ -31,7 +31,7 @@ abstract class BaseMessage implements BaseMessageInterface
     protected $tags = array();
 
     /**
-     * @var Response
+     * @var ResponseInterface
      */
     protected $response;
 
@@ -106,7 +106,7 @@ public function getTags()
     /**
      * {@inheritdoc}
      */
-    public function setResponse(Response $response)
+    public function setResponse(ResponseInterface $response)
     {
         $this->response = $response;
 

src/Mremi/Flowdock/Api/Push/BaseMessageInterface.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Base push message interface
@@ -78,16 +78,16 @@ public function getTags();
     /**
      * Sets the Flowdock response
      *
-     * @param Response $response
+     * @param ResponseInterface $response
      *
      * @return static
      */
-    public function setResponse(Response $response);
+    public function setResponse(ResponseInterface $response);
 
     /**
      * Gets the Flowdock response
      *
-     * @return Response
+     * @return ResponseInterface
      */
     public function getResponse();
 

src/Mremi/Flowdock/Api/Push/Push.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Api\Push;
 
-use Guzzle\Http\Client;
+use GuzzleHttp\Client;
 
 /**
  * Push class
@@ -67,13 +67,14 @@ protected function sendMessage(BaseMessageInterface $message, $baseUrl, array $o
     {
         $client = $this->createClient(sprintf('%s/%s', $baseUrl, $this->flowApiToken));
 
-        $request = $client->post(null, array(
-            'Content-Type' => 'application/json'
-        ), json_encode(
-            $message->getData()
-        ), $options);
+        $response = $client->post(null, array_merge(
+            $options, [
+                'headers' => ['Content-Type' => 'application/json'],
+                'json'    => $message->getData()
+            ]
+        ));
 
-        $message->setResponse($request->send());
+        $message->setResponse($response);
 
         return !$message->hasResponseErrors();
     }

tests/Mremi/Flowdock/Tests/Api/Push/BaseMessageTest.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Tests\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Psr7\Response;
 
 use Mremi\Flowdock\Api\Push\BaseMessageInterface;
 
@@ -90,7 +90,7 @@ public function testAddTags()
      */
     public function testValidResponse()
     {
-        $this->message->setResponse(new Response(200, null, '{"dummy": "ok"}'));
+        $this->message->setResponse(new Response(200, [], '{"dummy": "ok"}'));
 
         $this->assertEquals(array('dummy' => 'ok'), $this->message->getResponseBody());
 
@@ -106,7 +106,7 @@ public function testValidResponse()
      */
     public function testInvalidResponse()
     {
-        $this->message->setResponse(new Response(400, null, '{"message": "Validation error", "errors": {"content": ["can\'t be blank"]}}'));
+        $this->message->setResponse(new Response(400, [], '{"message": "Validation error", "errors": {"content": ["can\'t be blank"]}}'));
 
         $this->assertEquals(array('message' => 'Validation error', 'errors' => array('content' => array('can\'t be blank'))), $this->message->getResponseBody());
 

tests/Mremi/Flowdock/Tests/Api/Push/ChatMessageTest.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Tests\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Psr7\Response;
 
 use Mremi\Flowdock\Api\Push\ChatMessage;
 

tests/Mremi/Flowdock/Tests/Api/Push/PushTest.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Tests\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Psr7\Response;
 
 use Mremi\Flowdock\Api\Push\BaseMessageInterface;
 use Mremi\Flowdock\Api\Push\ChatMessage;
@@ -85,15 +85,16 @@ public function testSendMessage(BaseMessageInterface $message, $baseUrl, array $
             'Content-Type' => 'application/json; charset=utf-8',
         ), '{"message": "Validation error", "errors": {"content": ["can\'t be blank"]}}');
 
-        $request = $this->getMock('Guzzle\Http\Message\RequestInterface');
-        $request->expects($this->exactly(2))->method('send')->will($this->onConsecutiveCalls($responseOk, $responseKo));
-
-        $client = $this->getMock('Guzzle\Http\ClientInterface');
+        $clientOptions = $options;
+        $clientOptions['headers'] = array('Content-Type' => 'application/json');
+        $clientOptions['json'] = $message->getData();
+        
+        $client = $this->getMock('GuzzleHttp\Client');
         $client
             ->expects($this->exactly(2))
-            ->method('post')
-            ->with($this->equalTo(null), $this->equalTo(array('Content-Type' => 'application/json')), $this->equalTo(json_encode($message->getData())), $this->equalTo($options))
-            ->will($this->returnValue($request));
+            ->method('__call')
+            ->with($this->equalTo('post'), $this->equalTo([null, $clientOptions]))
+            ->willReturnOnConsecutiveCalls($responseOk, $responseKo);
 
         $push = $this->getMockBuilder('Mremi\Flowdock\Api\Push\Push')
             ->setConstructorArgs(array('flow_api_token'))

tests/Mremi/Flowdock/Tests/Api/Push/TeamInboxMessageTest.php

@@ -11,7 +11,7 @@
 
 namespace Mremi\Flowdock\Tests\Api\Push;
 
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Psr7\Response;
 
 use Mremi\Flowdock\Api\Push\TeamInboxMessage;