add support for PHPUnit 6

Author: fbourigault

Tests/Functional/ProfilingTest.php

@@ -15,11 +15,12 @@
 use Http\Message\Formatter\CurlCommandFormatter;
 use Http\Message\Formatter\FullHttpMessageFormatter;
 use Http\Mock\Client;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class ProfilingTest extends \PHPUnit_Framework_TestCase
+class ProfilingTest extends TestCase
 {
     /**
      * @var Collector
@@ -63,14 +64,15 @@ public function testProfilingWithCachePlugin()
         $this->assertEquals('example.com', $stack->getRequestHost());
     }
 
+    /**
+     * @expectedException \Exception
+     */
     public function testProfilingWhenPluginThrowException()
     {
         $client = $this->createClient([
             new ExceptionThrowerPlugin(),
         ]);
 
-        $this->setExpectedException(\Exception::class);
-
         try {
             $client->sendRequest(new Request('GET', 'https://example.com'));
         } finally {

Tests/Unit/ClientFactory/BuzzFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Adapter\Buzz\Client;
 use Http\HttplugBundle\ClientFactory\BuzzFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class BuzzFactoryTest extends \PHPUnit_Framework_TestCase
+class BuzzFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/CurlFactoryTest.php

@@ -6,11 +6,12 @@
 use Http\Client\Curl\Client;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class CurlFactoryTest extends \PHPUnit_Framework_TestCase
+class CurlFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/Guzzle6FactoryTest.php

@@ -4,11 +4,12 @@
 
 use Http\HttplugBundle\ClientFactory\Guzzle6Factory;
 use Http\Adapter\Guzzle6\Client;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class Guzzle6FactoryTest extends \PHPUnit_Framework_TestCase
+class Guzzle6FactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/ReactFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Adapter\React\Client;
 use Http\HttplugBundle\ClientFactory\ReactFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class ReactFactoryTest extends \PHPUnit_Framework_TestCase
+class ReactFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/ClientFactory/SocketFactoryTest.php

@@ -5,11 +5,12 @@
 use Http\Client\Socket\Client;
 use Http\HttplugBundle\ClientFactory\SocketFactory;
 use Http\Message\MessageFactory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class SocketFactoryTest extends \PHPUnit_Framework_TestCase
+class SocketFactoryTest extends TestCase
 {
     public function testCreateClient()
     {

Tests/Unit/Collector/CollectorTest.php

@@ -4,8 +4,9 @@
 
 use Http\HttplugBundle\Collector\Collector;
 use Http\HttplugBundle\Collector\Stack;
+use PHPUnit\Framework\TestCase;
 
-class CollectorTest extends \PHPUnit_Framework_TestCase
+class CollectorTest extends TestCase
 {
     public function testCollectClientNames()
     {

Tests/Unit/Collector/FormatterTest.php

@@ -9,8 +9,9 @@
 use Http\HttplugBundle\Collector\Formatter;
 use Http\Message\Formatter as MessageFormatter;
 use Http\Message\Formatter\CurlCommandFormatter;
+use PHPUnit\Framework\TestCase;
 
-class FormatterTest extends \PHPUnit_Framework_TestCase
+class FormatterTest extends TestCase
 {
     /**
      * @var MessageFormatter

Tests/Unit/Collector/ProfileClientFactoryTest.php

@@ -8,9 +8,10 @@
 use Http\HttplugBundle\Collector\Formatter;
 use Http\HttplugBundle\Collector\ProfileClient;
 use Http\HttplugBundle\Collector\ProfileClientFactory;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class ProfileClientFactoryTest extends \PHPUnit_Framework_TestCase
+class ProfileClientFactoryTest extends TestCase
 {
     /**
      * @var Collector

Tests/Unit/Collector/ProfileClientTest.php

@@ -14,13 +14,14 @@
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
-class ProfileClientTest extends \PHPUnit_Framework_TestCase
+class ProfileClientTest extends TestCase
 {
     /**
      * @var Collector