prepare release, use class constants in all tests

Author: dbu

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
-## 1.16.0 - unreleased
+## 1.16.0 - 2019-06-05
 
 ### Changed
 
@@ -12,12 +12,11 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 ### Added
 
 - Integration for VCR Plugin
-- curl-client v1.* is marked in conflict with the current bundle version.
 
 ### Fixed
 
-- Fix compatibility with curl-client v2.*, the `CurlFactory` now build the
-  client using PSR17 factories.
+- Fix compatibility with curl-client `2.*`. The `CurlFactory` now builds the
+  client using PSR-17 factories. Marked a conflict for curl-client `1.*`.
 
 ## 1.15.2 - 2019-04-18
 

tests/Functional/DiscoveryTest.php

@@ -13,6 +13,7 @@
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\ContainerBuilderHasAliasConstraint;
 use PHPUnit\Framework\Constraint\LogicalNot;
 use Symfony\Component\DependencyInjection\Definition;
+use Http\Adapter\Guzzle6\Client;
 
 /**
  * @author Márk Sági-Kazár <[email protected]>
@@ -50,9 +51,9 @@ public function testDiscoveryFallbacks()
     public function testDiscoveryPartialFallbacks()
     {
         $this->load();
-        $this->setDefinition('httplug.client.default', new Definition('Http\Adapter\Guzzle6\Client'));
+        $this->setDefinition('httplug.client.default', new Definition(Client::class));
 
-        $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6\Client');
+        $this->assertContainerBuilderHasService('httplug.client.default', Client::class);
         $this->assertContainerBuilderHasService('httplug.message_factory.default', MessageFactory::class);
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', UriFactory::class);
         $this->assertContainerBuilderHasService('httplug.stream_factory.default', StreamFactory::class);

tests/Functional/Issue206.php

@@ -17,7 +17,7 @@ public function testCustomClientDoesNotCauseException()
     {
         static::bootKernel();
         $container = static::$kernel->getContainer();
-        PluginClientFactory::setFactory([$container->get('Http\Client\Common\PluginClientFactory'), 'createClient']);
+        PluginClientFactory::setFactory([$container->get(PluginClientFactory::class), 'createClient']);
 
         // Create a client
         $myCustomClient = new HttpMethodsClient(HttpClientDiscovery::find(), MessageFactoryDiscovery::find());

tests/Functional/ProfilingTest.php

@@ -64,16 +64,14 @@ public function testProfilingWithCachePlugin()
         $this->assertEquals('example.com', $stack->getRequestHost());
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function testProfilingWhenPluginThrowException()
     {
         $client = $this->createClient([
             new ExceptionThrowerPlugin(),
         ]);
 
         try {
+            $this->expectException(\Exception::class);
             $client->sendRequest(new Request('GET', 'https://example.com'));
         } finally {
             $this->assertCount(1, $this->collector->getStacks());

tests/Functional/ServiceInstantiationTest.php

@@ -2,6 +2,7 @@
 
 namespace Http\HttplugBundle\Tests\Functional;
 
+use GuzzleHttp\Psr7\Request as GuzzleRequest;
 use Http\Client\Common\Plugin\RedirectPlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\HttpClient;
@@ -14,7 +15,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Kernel;
@@ -98,7 +99,7 @@ public function testProfilingPsr18Decoration()
         $psr18Client = NSA::getProperty($flexibleClient, 'httpClient');
         $this->assertInstanceOf(ClientInterface::class, $psr18Client);
 
-        $response = $client->sendRequest(new \GuzzleHttp\Psr7\Request('GET', 'https://example.com'));
+        $response = $client->sendRequest(new GuzzleRequest('GET', 'https://example.com'));
         $this->assertInstanceOf(ResponseInterface::class, $response);
     }
 
@@ -112,7 +113,7 @@ protected static function bootKernel(array $options = [])
         /** @var EventDispatcherInterface $dispatcher */
         $dispatcher = static::$kernel->getContainer()->get('event_dispatcher');
 
-        $event = new GetResponseEvent(static::$kernel, new Request(), HttpKernelInterface::MASTER_REQUEST);
+        $event = new GetResponseEvent(static::$kernel, new SymfonyRequest(), HttpKernelInterface::MASTER_REQUEST);
 
         if (version_compare(Kernel::VERSION, '4.3.0', '>=')) {
             $dispatcher->dispatch($event, KernelEvents::REQUEST);

tests/Unit/ClientFactory/BuzzFactoryTest.php

@@ -14,7 +14,7 @@ class BuzzFactoryTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (!class_exists(\Http\Adapter\Buzz\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('Buzz adapter is not installed');
         }
 

tests/Unit/ClientFactory/CurlFactoryTest.php

@@ -15,7 +15,7 @@ class CurlFactoryTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (!class_exists(\Http\Client\Curl\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('Curl client is not installed');
         }
 

tests/Unit/ClientFactory/Guzzle6FactoryTest.php

@@ -13,7 +13,7 @@ class Guzzle6FactoryTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (!class_exists(\Http\Adapter\Guzzle6\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('Guzzle6 adapter is not installed');
         }
 

tests/Unit/ClientFactory/ReactFactoryTest.php

@@ -14,7 +14,7 @@ class ReactFactoryTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (!class_exists(\Http\Adapter\React\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('React adapter is not installed');
         }
 

tests/Unit/ClientFactory/SocketFactoryTest.php

@@ -14,7 +14,7 @@ class SocketFactoryTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (!class_exists(\Http\Client\Socket\Client::class)) {
+        if (!class_exists(Client::class)) {
             $this->markTestSkipped('Socket client is not installed');
         }