Skip to content

Commit d56a403

Browse files
authored
Merge pull request #115 from php-http/no-special-tests-for-hhvm
Do not use different configuration when testing on hhvm
2 parents c2493b5 + bc6df72 commit d56a403

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

Tests/Resources/app/AppKernel.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function registerBundles()
1414
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
1515
new \Http\HttplugBundle\HttplugBundle(),
1616
];
17-
17+
1818
return $bundles;
1919
}
2020

@@ -23,11 +23,7 @@ public function registerBundles()
2323
*/
2424
public function registerContainerConfiguration(LoaderInterface $loader)
2525
{
26-
$runtime = 'php';
27-
if (defined('HHVM_VERSION')) {
28-
$runtime = 'hhvm';
29-
}
30-
$loader->load(__DIR__.'/config/config_'.$runtime.'.yml');
26+
$loader->load(__DIR__.'/config/config.yml');
3127
}
3228

3329
/**

Tests/Resources/app/config/config_hhvm.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)