diff --git a/.travis.yml b/.travis.yml index 17f9c064..d4084eb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: php +sudo: false + +cache: + directories: + - $HOME/.composer/cache php: - 5.3 - 5.4 @@ -9,12 +14,18 @@ php: - hhvm matrix: - allow_failures: - - php: hhvm - - php: 7.0 + include: + - php: 5.6 + env: SYMFONY_VERSION="2.3.*" + - php: 5.6 + env: SYMFONY_VERSION="2.8.*@dev symfony/phpunit-bridge:~2.7" + - php: 5.6 + env: SYMFONY_VERSION="3.0.*@dev" + fast_finish: true + +before_install: if [[ "$SYMFONY_VERSION" != "" ]]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi -before_script: - - composer install --prefer-dist +install: composer update --prefer-dist script: - - bin/phpunit + - vendor/bin/phpunit diff --git a/composer.json b/composer.json index 15b9d704..fd85f8c6 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,16 @@ ], "require": { "php": ">=5.3.3", - "symfony/process": "~2.1" + "symfony/process": "~2.3|~3.0" }, "require-dev": { - "phpunit/phpunit": "4.7.*" + "phpunit/phpunit": "~4.7" }, "suggest": { "h4cc/wkhtmltopdf-amd64": "Provides wkhtmltopdf-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency", "h4cc/wkhtmltopdf-i386": "Provides wkhtmltopdf-i386 binary for Linux-compatible machines, use version `~0.12` as dependency", + "h4cc/wkhtmltoimage-amd64": "Provides wkhtmltoimage-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency", + "h4cc/wkhtmltoimage-i386": "Provides wkhtmltoimage-i386 binary for Linux-compatible machines, use version `~0.12` as dependency", "wemersonjanuario/wkhtmltopdf-windows": "Provides wkhtmltopdf executable for Windows, use version `~0.12` as dependency" }, "autoload": { @@ -36,8 +38,5 @@ "branch-alias": { "dev-master": "0.5.x-dev" } - }, - "config": { - "bin-dir": "bin" } }