Merge pull request #216 from FriendsOfSymfony/varnish-4-default

Change default Varnish version to 4

Author: dbu

CHANGELOG.md

@@ -11,6 +11,7 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
   calling `setPurgeLocation()`.
 * In ProxyTestCase, `getHttpClient()` has been replaced with `getHttpAdapter()`;
   added HTTP method parameter to `getResponse()`.
+* Changed default Varnish version to 4.
 
 1.4.0
 -----

doc/testing-your-application.rst

@@ -80,7 +80,7 @@ Constant                Getter                    Default
 ``VARNISH_PORT``        ``getCachingProxyPort()`` ``6181``                                           port Varnish listens on
 ``VARNISH_MGMT_PORT``   ``getVarnishMgmtPort()``  ``6182``                                           Varnish management port
 ``VARNISH_CACHE_DIR``   ``getCacheDir()``         ``sys_get_temp_dir()`` + ``/foshttpcache-varnish`` directory to use for cache
-``VARNISH_VERSION``     ``getVarnishVersion()``   ``3``                                              installed varnish application version
+``VARNISH_VERSION``     ``getVarnishVersion()``   ``4``                                              installed varnish application version
 ``WEB_SERVER_HOSTNAME`` ``getHostName()``                                                            hostname your application can be reached at
 ======================= ========================= ================================================== ===========================================
 

src/Test/VarnishTestCase.php

@@ -35,7 +35,7 @@
  * VARNISH_MGMT_PORT    Varnish management port (default 6182)
  * VARNISH_CACHE_DIR    directory to use for cache
  *                      (default sys_get_temp_dir() + '/foshttpcache-varnish')
- * VARNISH_VERSION      Version of varnish: 3 or 4, defaults to 3.
+ * VARNISH_VERSION      Version of varnish: 3 or 4, defaults to 4.
  * WEB_SERVER_HOSTNAME  hostname/IP your application can be reached at (required)
  */
 abstract class VarnishTestCase extends ProxyTestCase
@@ -107,13 +107,13 @@ protected function getCacheDir()
     }
 
     /**
-     * Defaults to 3
+     * Defaults to 4
      *
      * @return int
      */
     protected function getVarnishVersion()
     {
-        return getenv('VARNISH_VERSION') ?: 3;
+        return getenv('VARNISH_VERSION') ?: 4;
     }
 
     /**

tests/Functional/Varnish/UserContextFailureTest.php

@@ -90,10 +90,10 @@ public function testHashRequestFailure()
     protected function getConfigFile()
     {
         switch ($this->getVarnishVersion()) {
-            case '4.0':
-                return sprintf('./tests/Functional/Fixtures/varnish-4/user_context_%s.vcl', $this->mode);
-            default:
+            case 3:
                 return sprintf('./tests/Functional/Fixtures/varnish-3/user_context_%s.vcl', $this->mode);
+            default:
+                return sprintf('./tests/Functional/Fixtures/varnish-4/user_context_%s.vcl', $this->mode);
         }
     }
 }

tests/bootstrap.php

@@ -16,11 +16,11 @@
 
 if (!defined('VARNISH_FILE')) {
     if (getenv('VARNISH_VERSION')
-        && (0 === strncmp('4.', getenv('VARNISH_VERSION'), 2))
+        && (0 === strncmp('3.', getenv('VARNISH_VERSION'), 2))
     ) {
-        define('VARNISH_FILE', './tests/Functional/Fixtures/varnish-4/fos.vcl');
-    } else {
         define('VARNISH_FILE', './tests/Functional/Fixtures/varnish-3/fos.vcl');
+    } else {
+        define('VARNISH_FILE', './tests/Functional/Fixtures/varnish-4/fos.vcl');
     }
 }