Merge pull request #35 from timoschinkel/support-psr-18

dbu · web-flow · commit 5e1dd6103860 · 2019-02-04T08:57:12.000+01:00
Support psr 18
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,10 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.5
-    - 5.6
     - 7.0
+    - 7.1
+    - 7.2
+    - 7.3
     - hhvm
 
 env:
@@ -25,7 +26,7 @@ matrix:
         - php: hhvm
     fast_finish: true
     include:
-        - php: 5.5
+        - php: 7.0
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## [2.0.0] - 2019-02-02
+
+### Added
+
+- Support for HTTPlug 2.0 and PSR-18
+
+### Changed
+
+- `\Http\Adapter\Guzzle5\Tests\ExceptionTest` extends `\PHPUnit\Framework\TestCase` instead of `PHPUnit_Framework_TestCase`
+
+### Removed
+
+- Support for PHP <7.0
+- Support for PHPUnit <6.0
+
 ## 1.0.1 - 2017-07-11
 
 ### Fixed
diff --git a/composer.json b/composer.json
@@ -15,18 +15,20 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0",
-        "php-http/httplug": "^1.0",
+        "php": "^7.0",
+        "php-http/httplug": "^2.0",
         "guzzlehttp/guzzle": "^5.1",
         "php-http/discovery": "^1.0"
     },
     "require-dev": {
         "ext-curl": "*",
-        "php-http/client-integration-tests": "^0.5.1",
+        "phpunit/phpunit": "^6.0 || ^7.0",
+        "php-http/client-integration-tests": "^2.0",
         "guzzlehttp/ringphp": "^1.1"
     },
     "provide": {
-        "php-http/client-implementation": "1.0"
+        "php-http/client-implementation": "1.0",
+        "psr/http-client-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }
diff --git a/src/Client.php b/src/Client.php
@@ -43,7 +43,7 @@ public function __construct(ClientInterface $client = null, ResponseFactory $res
     /**
      * {@inheritdoc}
      */
-    public function sendRequest(RequestInterface $request)
+    public function sendRequest(RequestInterface $request): ResponseInterface
     {
         $guzzleRequest = $this->createRequest($request);
 
diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
@@ -9,13 +9,15 @@
 use GuzzleHttp\Stream\Stream;
 use Http\Adapter\Guzzle5\Client;
 use Http\Message\MessageFactory\GuzzleMessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends TestCase
 {
     private $guzzleRequest;
+
     private $guzzleResponse;
 
     public function setUp()
@@ -37,84 +39,84 @@ protected function makeRequest(GuzzleExceptions\TransferException $exception)
     public function testConnectException()
     {
         // Guzzle's ConnectException should be converted to a NetworkException
-        $this->setExpectedException('Http\Client\Exception\NetworkException');
+        $this->expectException('Http\Client\Exception\NetworkException');
         $this->makeRequest(new GuzzleExceptions\ConnectException('foo', $this->guzzleRequest));
     }
 
     public function testTooManyRedirectsException()
     {
         // Guzzle's TooManyRedirectsException should be converted to a RequestException
-        $this->setExpectedException('Http\Client\Exception\RequestException');
+        $this->expectException('Http\Client\Exception\RequestException');
         $this->makeRequest(new GuzzleExceptions\TooManyRedirectsException('foo', $this->guzzleRequest));
     }
 
     public function testRequestException()
     {
         // Guzzle's RequestException should be converted to a HttpException
-        $this->setExpectedException('Http\Client\Exception\HttpException');
+        $this->expectException('Http\Client\Exception\HttpException');
         $this->makeRequest(new GuzzleExceptions\RequestException('foo', $this->guzzleRequest, $this->guzzleResponse));
     }
 
     public function testRequestExceptionWithoutResponse()
     {
         // Guzzle's RequestException with no response should be converted to a RequestException
-        $this->setExpectedException('Http\Client\Exception\RequestException');
+        $this->expectException('Http\Client\Exception\RequestException');
         $this->makeRequest(new GuzzleExceptions\RequestException('foo', $this->guzzleRequest));
     }
 
     public function testBadResponseException()
     {
         // Guzzle's BadResponseException should be converted to a HttpException
-        $this->setExpectedException('Http\Client\Exception\HttpException');
+        $this->expectException('Http\Client\Exception\HttpException');
         $this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest, $this->guzzleResponse));
     }
 
     public function testBadResponseExceptionWithoutResponse()
     {
         // Guzzle's BadResponseException with no response should be converted to a RequestException
-        $this->setExpectedException('Http\Client\Exception\RequestException');
+        $this->expectException('Http\Client\Exception\RequestException');
         $this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest));
     }
 
     public function testClientException()
     {
         // Guzzle's ClientException should be converted to a HttpException
-        $this->setExpectedException('Http\Client\Exception\HttpException');
+        $this->expectException('Http\Client\Exception\HttpException');
         $this->makeRequest(new GuzzleExceptions\ClientException('foo', $this->guzzleRequest, $this->guzzleResponse));
     }
 
     public function testClientExceptionWithoutResponse()
     {
         // Guzzle's ClientException with no response should be converted to a RequestException
-        $this->setExpectedException('Http\Client\Exception\RequestException');
+        $this->expectException('Http\Client\Exception\RequestException');
         $this->makeRequest(new GuzzleExceptions\ClientException('foo', $this->guzzleRequest));
     }
 
     public function testServerException()
     {
         // Guzzle's ServerException should be converted to a HttpException
-        $this->setExpectedException('Http\Client\Exception\HttpException');
+        $this->expectException('Http\Client\Exception\HttpException');
         $this->makeRequest(new GuzzleExceptions\ServerException('foo', $this->guzzleRequest, $this->guzzleResponse));
     }
 
     public function testServerExceptionWithoutResponse()
     {
         // Guzzle's ServerException with no response should be converted to a RequestException
-        $this->setExpectedException('Http\Client\Exception\RequestException');
+        $this->expectException('Http\Client\Exception\RequestException');
         $this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest));
     }
 
     public function testTransferException()
     {
         // Guzzle's TransferException should be converted to a TransferException
-        $this->setExpectedException('Http\Client\Exception\TransferException');
+        $this->expectException('Http\Client\Exception\TransferException');
         $this->makeRequest(new GuzzleExceptions\TransferException('foo'));
     }
 
     public function testParseException()
     {
         // Guzzle's ParseException should be converted to a TransferException
-        $this->setExpectedException('Http\Client\Exception\TransferException');
+        $this->expectException('Http\Client\Exception\TransferException');
         $this->makeRequest(new GuzzleExceptions\ParseException('foo', $this->guzzleResponse));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(ClientInterface $client = null, ResponseFactory $res`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function sendRequest(RequestInterface $request)`
	`46`	`+ public function sendRequest(RequestInterface $request): ResponseInterface`
`47`	`47`	`{`
`48`	`48`	`$guzzleRequest = $this->createRequest($request);`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,15 @@`
`9`	`9`	`use GuzzleHttp\Stream\Stream;`
`10`	`10`	`use Http\Adapter\Guzzle5\Client;`
`11`	`11`	`use Http\Message\MessageFactory\GuzzleMessageFactory;`
	`12`	`+use PHPUnit\Framework\TestCase;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* @author Tobias Nyholm <tobias.nyholm@gmail.com>`
`15`	`16`	`*/`
`16`		`-class ExceptionTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class ExceptionTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`private $guzzleRequest;`
	`20`	`+`
`19`	`21`	`private $guzzleResponse;`
`20`	`22`
`21`	`23`	`public function setUp()`
`@@ -37,84 +39,84 @@ protected function makeRequest(GuzzleExceptions\TransferException $exception)`
`37`	`39`	`public function testConnectException()`
`38`	`40`	`{`
`39`	`41`	`// Guzzle's ConnectException should be converted to a NetworkException`
`40`		`- $this->setExpectedException('Http\Client\Exception\NetworkException');`
	`42`	`+ $this->expectException('Http\Client\Exception\NetworkException');`
`41`	`43`	`$this->makeRequest(new GuzzleExceptions\ConnectException('foo', $this->guzzleRequest));`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`public function testTooManyRedirectsException()`
`45`	`47`	`{`
`46`	`48`	`// Guzzle's TooManyRedirectsException should be converted to a RequestException`
`47`		`- $this->setExpectedException('Http\Client\Exception\RequestException');`
	`49`	`+ $this->expectException('Http\Client\Exception\RequestException');`
`48`	`50`	`$this->makeRequest(new GuzzleExceptions\TooManyRedirectsException('foo', $this->guzzleRequest));`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`public function testRequestException()`
`52`	`54`	`{`
`53`	`55`	`// Guzzle's RequestException should be converted to a HttpException`
`54`		`- $this->setExpectedException('Http\Client\Exception\HttpException');`
	`56`	`+ $this->expectException('Http\Client\Exception\HttpException');`
`55`	`57`	`$this->makeRequest(new GuzzleExceptions\RequestException('foo', $this->guzzleRequest, $this->guzzleResponse));`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`public function testRequestExceptionWithoutResponse()`
`59`	`61`	`{`
`60`	`62`	`// Guzzle's RequestException with no response should be converted to a RequestException`
`61`		`- $this->setExpectedException('Http\Client\Exception\RequestException');`
	`63`	`+ $this->expectException('Http\Client\Exception\RequestException');`
`62`	`64`	`$this->makeRequest(new GuzzleExceptions\RequestException('foo', $this->guzzleRequest));`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`public function testBadResponseException()`
`66`	`68`	`{`
`67`	`69`	`// Guzzle's BadResponseException should be converted to a HttpException`
`68`		`- $this->setExpectedException('Http\Client\Exception\HttpException');`
	`70`	`+ $this->expectException('Http\Client\Exception\HttpException');`
`69`	`71`	`$this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest, $this->guzzleResponse));`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`public function testBadResponseExceptionWithoutResponse()`
`73`	`75`	`{`
`74`	`76`	`// Guzzle's BadResponseException with no response should be converted to a RequestException`
`75`		`- $this->setExpectedException('Http\Client\Exception\RequestException');`
	`77`	`+ $this->expectException('Http\Client\Exception\RequestException');`
`76`	`78`	`$this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest));`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`public function testClientException()`
`80`	`82`	`{`
`81`	`83`	`// Guzzle's ClientException should be converted to a HttpException`
`82`		`- $this->setExpectedException('Http\Client\Exception\HttpException');`
	`84`	`+ $this->expectException('Http\Client\Exception\HttpException');`
`83`	`85`	`$this->makeRequest(new GuzzleExceptions\ClientException('foo', $this->guzzleRequest, $this->guzzleResponse));`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`public function testClientExceptionWithoutResponse()`
`87`	`89`	`{`
`88`	`90`	`// Guzzle's ClientException with no response should be converted to a RequestException`
`89`		`- $this->setExpectedException('Http\Client\Exception\RequestException');`
	`91`	`+ $this->expectException('Http\Client\Exception\RequestException');`
`90`	`92`	`$this->makeRequest(new GuzzleExceptions\ClientException('foo', $this->guzzleRequest));`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`public function testServerException()`
`94`	`96`	`{`
`95`	`97`	`// Guzzle's ServerException should be converted to a HttpException`
`96`		`- $this->setExpectedException('Http\Client\Exception\HttpException');`
	`98`	`+ $this->expectException('Http\Client\Exception\HttpException');`
`97`	`99`	`$this->makeRequest(new GuzzleExceptions\ServerException('foo', $this->guzzleRequest, $this->guzzleResponse));`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`public function testServerExceptionWithoutResponse()`
`101`	`103`	`{`
`102`	`104`	`// Guzzle's ServerException with no response should be converted to a RequestException`
`103`		`- $this->setExpectedException('Http\Client\Exception\RequestException');`
	`105`	`+ $this->expectException('Http\Client\Exception\RequestException');`
`104`	`106`	`$this->makeRequest(new GuzzleExceptions\BadResponseException('foo', $this->guzzleRequest));`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`public function testTransferException()`
`108`	`110`	`{`
`109`	`111`	`// Guzzle's TransferException should be converted to a TransferException`
`110`		`- $this->setExpectedException('Http\Client\Exception\TransferException');`
	`112`	`+ $this->expectException('Http\Client\Exception\TransferException');`
`111`	`113`	`$this->makeRequest(new GuzzleExceptions\TransferException('foo'));`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`public function testParseException()`
`115`	`117`	`{`
`116`	`118`	`// Guzzle's ParseException should be converted to a TransferException`
`117`		`- $this->setExpectedException('Http\Client\Exception\TransferException');`
	`119`	`+ $this->expectException('Http\Client\Exception\TransferException');`
`118`	`120`	`$this->makeRequest(new GuzzleExceptions\ParseException('foo', $this->guzzleResponse));`
`119`	`121`	`}`
`120`	`122`	`}`