separate http client from trait

src/Test/HttpCaller.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the FOSHttpCache package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\HttpCache\Test;
+
+use FOS\HttpCache\Test\HttpClient;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Provides a method for getting responses from your application
+ */
+trait HttpCaller
+{
+    /**
+     * HTTP adapter for requests to the application
+     *
+     * @var HttpClient
+     */
+    protected $client;
+
+    /**
+     * Call a HTTP resource from your test
+     *
+     * @param string $uri     HTTP URI, domain and port are added from the embedding class if not specified
+     * @param array  $headers HTTP headers
+     * @param string $method  HTTP method
+     *
+     * @return ResponseInterface
+     */
+    public function getResponse($uri, array $headers = [], $method = 'GET')
+    {
+        if (!$this->client) {
+            $this->client = new HttpClient($this->getHostName(), $this->getCachingProxyPort());
+        }
+
+        return $this->client->getResponse($uri, $headers, $method);
+    }
+
+    /**
+     * Get the default host name to use.
+     *
+     * @return string
+     */
+    abstract protected function getHostName();
+
+    /**
+     * Get the default port to use.
+     *
+     * @return string
+     */
+    abstract protected function getCachingProxyPort();
+}

src/Test/AppClient.php → src/Test/HttpClient.php

@@ -20,16 +20,36 @@
 use Psr\Http\Message\UriInterface;
 
 /**
- * Provides a HTTP client for getting responses from your application
+ * Provides a very simple way to fetch HTTP responses, auto-creating a client.
  */
-trait AppClient
+class HttpClient
 {
     /**
      * HTTP adapter for requests to the application
      *
      * @var HttpAdapter
      */
-    protected $httpAdapter;
+    private $httpAdapter;
+
+    /**
+     * @var string
+     */
+    private $hostname;
+
+    /**
+     * @var string
+     */
+    private $port;
+
+    /**
+     * @param string $hostname Default hostname if not specified in the URL
+     * @param string $port     Default port if not specified in the URL
+     */
+    public function __construct($hostname, $port)
+    {
+        $this->hostname = $hostname;
+        $this->port = $port;
+    }
 
     /**
      * Get HTTP response from your application
@@ -40,7 +60,7 @@ trait AppClient
      *
      * @return ResponseInterface
      */
-    public function getResponse($uri, array $headers = [], $method = 'GET')
+    public function getResponse($uri, array $headers, $method)
     {
         // Close connections to make sure invalidation (PURGE/BAN) requests will
         // not interfere with content (GET) requests.
@@ -79,11 +99,11 @@ protected function createRequest($method, $uri, $headers)
         $uri = $this->createUri($uri);
         if ($uri->getHost() === '') {
             // Add base URI host
-            $uri = $uri->withHost($this->getHostName());
+            $uri = $uri->withHost($this->hostname);
         }
 
         if (!$uri->getPort()) {
-            $uri = $uri->withPort($this->getCachingProxyPort());
+            $uri = $uri->withPort($this->port);
         }
 
         if ($uri->getScheme() === '') {
@@ -109,6 +129,4 @@ protected function createUri($uriString)
     {
         return UriFactoryDiscovery::find()->createUri($uriString);
     }
-
-    abstract protected function getHostName();
 }

src/Test/ProxyTestCase.php

@@ -20,6 +20,6 @@
  */
 abstract class ProxyTestCase extends \PHPUnit_Framework_TestCase
 {
-    use AppClient;
+    use HttpCaller;
     use CacheAssertions;
 }