Skip to content

Do not use different configuration when testing on hhvm #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2016
Merged

Do not use different configuration when testing on hhvm #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions Tests/Resources/app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function registerBundles()
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new \Http\HttplugBundle\HttplugBundle(),
];

return $bundles;
}

Expand All @@ -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');
}

/**
Expand Down
0 Tests/Resources/app/config/config_php.yml → Tests/Resources/app/config/config.yml
View file
Open in desktop
File renamed without changes.
11 changes: 0 additions & 11 deletions Tests/Resources/app/config/config_hhvm.yml
View file
Open in desktop

This file was deleted.