Skip to content

Commit

Permalink
Merge pull request #287 from benji07/symfony3
Browse files Browse the repository at this point in the history
Allow this component to work with symfony3
  • Loading branch information
Seldaek committed Nov 9, 2015
2 parents fc1de0b + e8ca5c5 commit 045d59b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@ php:
- 7.0
- hhvm

matrix:
include:
# Test against LTS releases
- php: 5.5
env: SYMFONY_VERSION='2.3.*'
- php: 5.5
env: SYMFONY_VERSION='2.7.*'
# Test against dev dependencies
- php: 5.6
env: DEPS=dev
- php: 5.6
env: SYMFONY_VERSION='2.8.*@dev'
- php: 5.6
env: DEPS=dev SYMFONY_VERSION='3.0.*'

before_install:
- composer self-update
- if [ "$DEPS" = 'dev' ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update "symfony/symfony:${SYMFONY_VERSION}"; fi;

before_script:
- composer install --prefer-source

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"require": {
"php": ">=5.4",
"fzaninotto/faker": "~1.0",
"symfony/yaml": "~2.0"
"symfony/yaml": "~2.0|~3.0"
},
"require-dev": {
"doctrine/common": "~2.3",
"symfony/property-access": "~2.2",
"phpunit/phpunit": "~4.0.0"
"symfony/property-access": "~2.2|~3.0",
"phpunit/phpunit": "~4.0"
},
"autoload": {
"psr-4": { "Nelmio\\Alice\\": "src/Nelmio/Alice" }
Expand Down

0 comments on commit 045d59b

Please sign in to comment.