Skip to content

Commit 1bc371c

Browse files
committed
allow Symfony 3.0
1 parent bc26a6a commit 1bc371c

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.travis.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ php:
55
- 5.4
66
- 5.5
77
- 5.6
8-
- nightly
8+
- 7.0
99
- hhvm
1010

1111
sudo: false
@@ -26,16 +26,14 @@ matrix:
2626
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
2727
- php: 5.5
2828
env: SYMFONY_VERSION='2.3.* symfony/expression-language:2.4.*' SYMFONY_DEPRECATIONS_HELPER=weak
29-
- php: 5.5
30-
env: SYMFONY_VERSION=2.4.*
3129
- php: 5.5
3230
env: SYMFONY_VERSION=2.6.*
3331
- php: 5.5
34-
env: SYMFONY_VERSION='2.7.*'
32+
env: SYMFONY_VERSION=2.7.*
33+
- php: 5.5
34+
env: SYMFONY_VERSION=2.8.*
3535
- php: 5.5
36-
env: SYMFONY_VERSION='2.8.*@dev symfony/security-acl:2.8.*@dev'
37-
allow_failures:
38-
- php: nightly
36+
env: SYMFONY_VERSION=3.0.*
3937

4038
before_install:
4139
- composer self-update

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
"require": {
2424
"php": ">=5.3.9",
2525
"psr/log": "~1.0",
26-
"symfony/framework-bundle": "~2.3",
27-
"symfony/http-kernel": "~2.3,>=2.3.24",
26+
"symfony/framework-bundle": "~2.3|~3.0",
27+
"symfony/http-kernel": "^2.3.24|~3.0",
2828
"doctrine/inflector": "~1.0",
2929
"willdurand/negotiation": "~1.2",
3030
"willdurand/jsonp-callback-validator": "~1.0"
3131
},
3232

3333
"require-dev": {
3434
"sensio/framework-extra-bundle": "~2.0|~3.0",
35-
"symfony/form": "~2.3",
36-
"symfony/validator": "~2.3",
37-
"symfony/serializer": "~2.3",
38-
"symfony/yaml": "~2.3",
39-
"symfony/security": "~2.3",
40-
"symfony/browser-kit": "~2.3",
41-
"symfony/dependency-injection": "~2.3",
42-
"symfony/phpunit-bridge": "~2.7",
35+
"symfony/form": "~2.3|~3.0",
36+
"symfony/validator": "~2.3|~3.0",
37+
"symfony/serializer": "~2.3|~3.0",
38+
"symfony/yaml": "~2.3|~3.0",
39+
"symfony/security": "~2.3|~3.0",
40+
"symfony/browser-kit": "~2.3|~3.0",
41+
"symfony/dependency-injection": "~2.3|~3.0",
42+
"symfony/phpunit-bridge": "~2.7|~3.0",
4343
"phpoption/phpoption": "~1.1.0",
4444
"jms/serializer": "~0.13|~1.0",
4545
"jms/serializer-bundle": "~0.12|~1.0",

0 commit comments

Comments
 (0)