Skip to content

Commit

Permalink
Merge pull request #195 from KnpLabs/feature/symfony3-compat
Browse files Browse the repository at this point in the history
Compatibiity with Symfony/Process ~2.3 | ~3.0
  • Loading branch information
akovalyov committed Nov 17, 2015
2 parents cd4736e + 660000a commit 44f7a9b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
23 changes: 17 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
language: php

sudo: false

cache:
directories:
- $HOME/.composer/cache
php:
- 5.3
- 5.4
Expand All @@ -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
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -36,8 +38,5 @@
"branch-alias": {
"dev-master": "0.5.x-dev"
}
},
"config": {
"bin-dir": "bin"
}
}

0 comments on commit 44f7a9b

Please sign in to comment.