adding back extending the phpunit test case

Author: dbu

CHANGELOG.md

@@ -12,6 +12,10 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
 * In ProxyTestCase, `getHttpClient()` has been replaced with `getHttpAdapter()`;
   added HTTP method parameter to `getResponse()`.
 * Changed default Varnish version to 4.
+* Added support and documentation for setting a custom TTL specifically for the
+  caching proxy.
+* Refactored the proxy client test system into traits. Removed ProxyTestCase,
+  use the traits `CacheAssertions` and `HttpCaller` instead.
 
 1.4.0
 -----

doc/testing-your-application.rst

@@ -11,8 +11,8 @@ rules that it defines.
 The FOSHttpCache library provides traits and base test classes to help you write
 functional tests. Using the traits, you can extend your own (or your
 framework’s) base test classes. For convenience, you can also extend the
-FOSHttpCache base test classes, as they include a sensible set of traits by
-default.
+FOSHttpCache base test class suitable for your caching proxy, which includes
+a sensible set of traits.
 
 By using the traits, you get:
 
@@ -185,8 +185,8 @@ integrated.
 ======================= ========================= ================================================ ===========================================
 Constant                Getter                    Default                                          Description
 ======================= ========================= ================================================ ===========================================
-``WEB_SERVER_HOSTNAME`` ``getHostName()``                                                          hostname your application can be reached at
-``WEB_SERVER_PORT``     ``getConfigFile()``                                                        The port on which the web server runs
+``WEB_SERVER_HOSTNAME`` ``getHostName()``                                                          Hostname your application can be reached at
+``WEB_SERVER_PORT``     ``getCachingProxyPort()``                                                  The port on which the web server runs
 ``SYMFONY_CACHE_DIR``   ``getCacheDir()``         ``sys_get_temp_dir()`` + ``/foshttpcache-nginx`` directory to use for cache
                                                                                                    Must match the configuration of your
                                                                                                    HttpCache and must be writable by the user
@@ -204,6 +204,8 @@ proxy::
 
     class YourTest extends \PHPUnit_Framework_TestCase
     {
+        use HttpCaller;
+
         public function testCachingHeaders()
         {
             // Get some response from your application
@@ -214,6 +216,10 @@ proxy::
         }
     }
 
+This trait requires the methods ``getHostName()`` and ``getCachingProxyPort()``
+to exist. When using one of the caching proxy traits, these will be provided by
+the trait, otherwise you have to implement them.
+
 CacheAssertions Trait
 ~~~~~~~~~~~~~~~~~~~~~
 

src/Test/NginxTestCase.php

@@ -15,7 +15,7 @@
  * Abstract test that collects traits necessary for running tests against
  * NGINX
  */
-abstract class NginxTestCase
+abstract class NginxTestCase extends \PHPUnit_Framework_TestCase
 {
     use CacheAssertions;
     use HttpCaller;

src/Test/SymfonyTestCase.php

@@ -15,7 +15,7 @@
  * Abstract test that contains traits necessary for running tests against
  * Symfony HtptCache
  */
-abstract class SymfonyTestCase
+abstract class SymfonyTestCase extends \PHPUnit_Framework_TestCase
 {
     use CacheAssertions;
     use HttpCaller;

src/Test/VarnishTest.php

@@ -136,7 +136,7 @@ protected function getCacheDir()
      */
     protected function getVarnishVersion()
     {
-        return getenv('VARNISH_VERSION') ?: 4;
+        return getenv('VARNISH_VERSION') ?: '4.0';
     }
 
     /**

src/Test/VarnishTestCase.php

@@ -14,7 +14,7 @@
 /**
  * Abstract test that contains traits necessary for running tests against Varnish
  */
-abstract class VarnishTestCase
+abstract class VarnishTestCase extends \PHPUnit_Framework_TestCase
 {
     use CacheAssertions;
     use HttpCaller;