Guzzle 5.3

matteocacciola · Dec 9, 2020 · 1ad104a · 1ad104a
1 parent ba54a43
commit 1ad104a
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 composer.phar
 build/*
 vendor/*
+*.idea/
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 	],
 	"require": {
 		"php": ">=5.3",
-		"guzzlehttp/guzzle": "~7"
+		"guzzlehttp/guzzle": "~5.3"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^4.8"

diff --git a/lib/Trello/Api/AbstractApi.php b/lib/Trello/Api/AbstractApi.php
@@ -110,7 +110,7 @@ public function getField($id, $field)
      * @param array  $parameters     GET parameters.
      * @param array  $requestHeaders Request Headers.
      *
-     * @return \Guzzle\Http\EntityBodyInterface|mixed|string
+     * @return mixed
      */
     protected function get($path, array $parameters = array(), $requestHeaders = array())
     {
@@ -126,7 +126,7 @@ protected function get($path, array $parameters = array(), $requestHeaders = arr
      * @param array  $parameters     HEAD parameters.
      * @param array  $requestHeaders Request headers.
      *
-     * @return \Guzzle\Http\Message\Response
+     * @return \GuzzleHttp\Message\Response
      */
     protected function head($path, array $parameters = array(), $requestHeaders = array())
     {
@@ -162,7 +162,7 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
      * @param mixed  $body           Request body.
      * @param array  $requestHeaders Request headers.
      *
-     * @return \Guzzle\Http\EntityBodyInterface|mixed|string
+     * @return mixed
      */
     protected function postRaw($path, $body, $requestHeaders = array())
     {

diff --git a/lib/Trello/HttpClient/HttpClient.php b/lib/Trello/HttpClient/HttpClient.php
@@ -2,10 +2,10 @@
 
 namespace Trello\HttpClient;
 
-use Guzzle\Http\Client as GuzzleClient;
-use Guzzle\Http\ClientInterface;
-use Guzzle\Http\Message\Request;
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Client as GuzzleClient;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Message\Request;
+use GuzzleHttp\Message\Response;
 use Trello\Exception\ErrorException;
 use Trello\Exception\RuntimeException;
 use Trello\HttpClient\Listener\AuthListener;

diff --git a/lib/Trello/HttpClient/HttpClientInterface.php b/lib/Trello/HttpClient/HttpClientInterface.php
@@ -3,7 +3,7 @@
 namespace Trello\HttpClient;
 
 use Trello\Exception\InvalidArgumentException;
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Message\Response;
 
 interface HttpClientInterface
 {

diff --git a/lib/Trello/HttpClient/Listener/AuthListener.php b/lib/Trello/HttpClient/Listener/AuthListener.php
@@ -2,7 +2,7 @@
 
 namespace Trello\HttpClient\Listener;
 
-use Guzzle\Common\Event;
+use GuzzleHttp\Event\AbstractRequestEvent as Event;
 use Trello\Client;
 use Trello\Exception\RuntimeException;
 

diff --git a/lib/Trello/HttpClient/Listener/ErrorListener.php b/lib/Trello/HttpClient/Listener/ErrorListener.php
@@ -3,7 +3,7 @@
 namespace Trello\HttpClient\Listener;
 
 use Trello\HttpClient\Message\ResponseMediator;
-use Guzzle\Common\Event;
+use GuzzleHttp\Event\AbstractRequestEvent as Event;
 use Trello\Exception\ErrorException;
 use Trello\Exception\RuntimeException;
 use Trello\Exception\PermissionDeniedException;
@@ -20,7 +20,6 @@ class ErrorListener
      */
     public function onRequestError(Event $event)
     {
-        /** @var $request \Guzzle\Http\Message\Request */
         $request = $event['request'];
         $response = $request->getResponse();
 

diff --git a/lib/Trello/HttpClient/Message/ResponseMediator.php b/lib/Trello/HttpClient/Message/ResponseMediator.php
@@ -2,13 +2,13 @@
 
 namespace Trello\HttpClient\Message;
 
-use Guzzle\Http\Message\Response;
+use GuzzleHttp\Message\Response;
 
 class ResponseMediator
 {
     public static function getContent(Response $response)
     {
-        $body    = $response->getBody(true);
+        $body    = $response->getBody();
 
         $content = json_decode($body, true);
 

diff --git a/test/Trello/Tests/Unit/Api/AbstractApiTest.php b/test/Trello/Tests/Unit/Api/AbstractApiTest.php
@@ -139,7 +139,7 @@ protected function getHttpMock()
 
     protected function getHttpClientMock()
     {
-        $mock = $this->getMockBuilder('Guzzle\Http\Client')
+        $mock = $this->getMockBuilder('GuzzleHttp\Client')
             ->setMethods(array('send'))
             ->getMock();
         $mock->expects($this->any())

diff --git a/test/Trello/Tests/Unit/Api/TestCase.php b/test/Trello/Tests/Unit/Api/TestCase.php
@@ -21,7 +21,7 @@ protected function getPath()
 
     protected function getApiMock()
     {
-        $httpClient = $this->getMockBuilder('Guzzle\Http\Client')
+        $httpClient = $this->getMockBuilder('GuzzleHttp\Client')
             ->setMethods(array('send'))
             ->getMock();
         $httpClient->expects($this->any())

diff --git a/test/Trello/Tests/Unit/HttpClient/HttpClientTest.php b/test/Trello/Tests/Unit/HttpClient/HttpClientTest.php
@@ -4,8 +4,8 @@
 
 use Trello\Client;
 use Trello\HttpClient\HttpClient;
-use Guzzle\Http\Message\Response;
-use Guzzle\Http\Client as GuzzleClient;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Client as GuzzleClient;
 
 class HttpClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -180,7 +180,7 @@ public function shouldAllowToReturnRawContent()
         $parameters = array('a = b');
         $headers    = array('c' => 'd');
 
-        $message = $this->getMockBuilder('Guzzle\Http\Message\Response')
+        $message = $this->getMockBuilder('GuzzleHttp\Message\Response')
             ->setConstructorArgs(array(200))
             ->setMethods(array('getBody'))
             ->getMock();
@@ -197,17 +197,17 @@ public function shouldAllowToReturnRawContent()
         $response = $httpClient->get($path, $parameters, $headers);
 
         $this->assertEquals("Just raw context", $response->getBody());
-        $this->assertInstanceOf('Guzzle\Http\Message\MessageInterface', $response);
+        $this->assertInstanceOf('GuzzleHttp\Message\MessageInterface', $response);
     }
 
     protected function getBrowserMock(array $methods = array())
     {
         $mockMethods = array('send', 'createRequest') + $methods;
-        $mock = $this->getMockBuilder( 'Guzzle\Http\Client')
+        $mock = $this->getMockBuilder( 'GuzzleHttp\Client')
             ->setMethods($mockMethods)
             ->getMock();
 
-        $requestMock = $this->getMockBuilder('Guzzle\Http\Message\Request')
+        $requestMock = $this->getMockBuilder('GuzzleHttp\Message\Request')
             ->setConstructorArgs(array('GET', 'some'))
             ->getMock();
 

diff --git a/test/Trello/Tests/Unit/HttpClient/Listener/AuthListenerTest.php b/test/Trello/Tests/Unit/HttpClient/Listener/AuthListenerTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Trello\Tests\HttpClient;
 
-use Guzzle\Http\Message\Request;
+use GuzzleHttp\Message\Request;
 use Trello\Client;
 use Trello\HttpClient\Listener\AuthListener;
 
@@ -25,7 +25,7 @@ public function shouldHaveKnownMethodName()
      */
     public function shouldDoNothingForHaveNullMethod()
     {
-        $request = $this->getMockBuilder('Guzzle\Http\Message\RequestInterface')
+        $request = $this->getMockBuilder('GuzzleHttp\Message\RequestInterface')
             ->getMock();
         $request->expects($this->never())
             ->method('addHeader');
@@ -40,7 +40,7 @@ public function shouldDoNothingForHaveNullMethod()
      */
     public function shouldDoNothingForPostSend()
     {
-        $request = $this->getMockBuilder('Guzzle\Http\Message\RequestInterface')
+        $request = $this->getMockBuilder('GuzzleHttp\Message\RequestInterface')
             ->getMock();
         $request->expects($this->never())
             ->method('addHeader');
@@ -56,7 +56,7 @@ public function shouldDoNothingForPostSend()
     public function shouldSetAuthBasicHeaderForAuthPassMethod()
     {
         $expected = 'Basic '.base64_encode('login2:pass42323');
-        $request = $this->getMockBuilder('Guzzle\Http\Message\RequestInterface')
+        $request = $this->getMockBuilder('GuzzleHttp\Message\RequestInterface')
             ->getMock();
         $request->expects($this->once())
             ->method('setHeader')
@@ -76,7 +76,7 @@ public function shouldSetAuthBasicHeaderForAuthPassMethod()
     public function shouldSetAuthTokenHeaderForAuthPassMethod()
     {
         $expected = 'token test';
-        $request = $this->getMockBuilder('Guzzle\Http\Message\RequestInterface')
+        $request = $this->getMockBuilder('GuzzleHttp\Message\RequestInterface')
             ->getMock();
         $request->expects($this->once())
             ->method('setHeader')
@@ -114,7 +114,7 @@ public function shouldSetClientDetailsInUrlForAuthUrlMethod()
 
     private function getEventMock($request = null)
     {
-        $mock = $this->getMockBuilder('Guzzle\Common\Event')->getMock();
+        $mock = $this->getMockBuilder('GuzzleCommon\Event')->getMock();
         if ($request) {
             $mock->expects($this->any())
                 ->method('offsetGet')

diff --git a/test/Trello/Tests/Unit/HttpClient/Listener/ErrorListenerTest.php b/test/Trello/Tests/Unit/HttpClient/Listener/ErrorListenerTest.php
@@ -13,7 +13,7 @@ class ErrorListenerTest extends \PHPUnit_Framework_TestCase
      */
     public function shouldPassIfResponseNotHaveErrorStatus()
     {
-        $response = $this->getMockBuilder('Guzzle\Http\Message\Response')
+        $response = $this->getMockBuilder('GuzzleHttp\Message\Response')
             ->disableOriginalConstructor()
             ->getMock();
         $response->expects($this->once())
@@ -126,9 +126,9 @@ public function getErrorCodesProvider()
 
     private function getEventMock($response)
     {
-        $mock = $this->getMockBuilder('Guzzle\Common\Event')
+        $mock = $this->getMockBuilder('GuzzleHttp\Event\AbstractRequestEvent')
             ->getMock();
-        $request = $this->getMockBuilder('Guzzle\Http\Message\Request')
+        $request = $this->getMockBuilder('GuzzleHttp\Message\Request')
             ->disableOriginalConstructor()
             ->getMock();
         $request->expects($this->any())
@@ -145,7 +145,7 @@ private function createResponseMock(
         $httpStatusCode,
         $responseBody = ''
     ) {
-        $mock = $this->getMockBuilder('Guzzle\Http\Message\Response')
+        $mock = $this->getMockBuilder('GuzzleHttp\Message\Response')
             ->disableOriginalConstructor()
             ->getMock();
         $mock->expects($this->once())
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ composer.lock @@
     composer.phar
     build/*
     vendor/*
+    *.idea/