change default for varnish configuration to 4

Author: dbu

src/Test/VarnishTestCase.php

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

tests/Functional/Varnish/UserContextCacheTest.php

@@ -19,11 +19,11 @@ class UserContextCacheTest extends UserContextTestCase
 {
     protected function getConfigFile()
     {
-        switch ($this->getVarnishVersion()) {
-            case '4.0':
-                return './tests/Functional/Fixtures/varnish-4/user_context_cache.vcl';
-            default:
+        switch ((int)$this->getVarnishVersion()) {
+            case 3:
                 return './tests/Functional/Fixtures/varnish-3/user_context_cache.vcl';
+            default:
+                return './tests/Functional/Fixtures/varnish-4/user_context_cache.vcl';
         }
     }
 

tests/Functional/Varnish/UserContextFailureTest.php

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

tests/Functional/Varnish/UserContextNocacheTest.php

@@ -19,11 +19,11 @@ class UserContextNocacheTest extends UserContextTestCase
 {
     protected function getConfigFile()
     {
-        switch ($this->getVarnishVersion()) {
-            case '4.0':
-                return './tests/Functional/Fixtures/varnish-4/user_context_nocache.vcl';
-            default:
+        switch ((int)$this->getVarnishVersion()) {
+            case 3:
                 return './tests/Functional/Fixtures/varnish-3/user_context_nocache.vcl';
+            default:
+                return './tests/Functional/Fixtures/varnish-4/user_context_nocache.vcl';
         }
     }