Skip to content

Make sure travis can run on HHVM #53

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 2 commits into from
Feb 28, 2016
Merged

Make sure travis can run on HHVM #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be07668
Do not use Puli auto discovery on HHVM
Nyholm Feb 28, 2016
0bf9840
Do not allow HHVM to fail
Nyholm Feb 28, 2016
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
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ branches:

matrix:
fast_finish: true
allow_failures:
- php: hhvm
include:
- php: 5.5
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.*
Expand Down
6 changes: 5 additions & 1 deletion Tests/Resources/app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ public function registerBundles()
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load(__DIR__.'/config/config.yml');
$runtime = 'php';
if (defined('HHVM_VERSION')) {
$runtime = 'hhvm';
}
$loader->load(__DIR__.'/config/config_'.$runtime.'.yml');
}

/**
Expand Down
11 changes: 11 additions & 0 deletions Tests/Resources/app/config/config_hhvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
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
1 change: 1 addition & 0 deletions Tests/Resources/app/config/config.yml → Tests/Resources/app/config/config_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ framework:
secret: php-http
test: ~

# Use auto discovery
httplug: ~