From bc6df72859690745f5328c88c39301cd2f32df50 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Sun, 7 Aug 2016 13:19:09 +0200
Subject: [PATCH] Do not use different configuration when testing on hhvm

---
 Tests/Resources/app/AppKernel.php                     |  8 ++------
 .../app/config/{config_php.yml => config.yml}         |  0
 Tests/Resources/app/config/config_hhvm.yml            | 11 -----------
 3 files changed, 2 insertions(+), 17 deletions(-)
 rename Tests/Resources/app/config/{config_php.yml => config.yml} (100%)
 delete mode 100644 Tests/Resources/app/config/config_hhvm.yml

diff --git a/Tests/Resources/app/AppKernel.php b/Tests/Resources/app/AppKernel.php
index 139bb45b..7446ce0d 100644
--- a/Tests/Resources/app/AppKernel.php
+++ b/Tests/Resources/app/AppKernel.php
@@ -14,7 +14,7 @@ public function registerBundles()
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Http\HttplugBundle\HttplugBundle(),
         ];
-        
+
         return $bundles;
     }
 
@@ -23,11 +23,7 @@ public function registerBundles()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $runtime = 'php';
-        if (defined('HHVM_VERSION')) {
-            $runtime = 'hhvm';
-        }
-        $loader->load(__DIR__.'/config/config_'.$runtime.'.yml');
+        $loader->load(__DIR__.'/config/config.yml');
     }
 
     /**
diff --git a/Tests/Resources/app/config/config_php.yml b/Tests/Resources/app/config/config.yml
similarity index 100%
rename from Tests/Resources/app/config/config_php.yml
rename to Tests/Resources/app/config/config.yml
diff --git a/Tests/Resources/app/config/config_hhvm.yml b/Tests/Resources/app/config/config_hhvm.yml
deleted file mode 100644
index 307d6aa1..00000000
--- a/Tests/Resources/app/config/config_hhvm.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-framework:
-  secret: php-http
-  test: ~
-
-# Do not use auto discovery
-httplug:
-  classes:
-    client: Http\Adapter\Guzzle6\Client
-    message_factory: Http\Message\MessageFactory\GuzzleMessageFactory
-    uri_factory: Http\Message\UriFactory\GuzzleUriFactory
-    stream_factory: Http\Message\StreamFactory\GuzzleStreamFactory