allow php 7 a force symfony 2.8

This commit is contained in:
Julien Fastré 2016-01-05 14:04:45 +01:00
parent 23ec2a1a16
commit c8077ac575
2 changed files with 5 additions and 3 deletions

View File

@ -12,7 +12,9 @@ before_script:
test:php-5.6:
stage: test
image: chill/ci-image:php-5.6
script: phpunit --testdox
test:php-7:
stage: test
image: chill/ci-image:php-7
script: phpunit --testdox

View File

@ -22,11 +22,11 @@
}
],
"require": {
"php": "~5.5",
"php": "~5.5|~7.0",
"twig/extensions": "~1.0",
"symfony/assetic-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
"symfony/framework-bundle": "~2.7",
"symfony/framework-bundle": "~2.8",
"symfony/yaml": "~2.7",
"symfony/symfony": "~2.7",
"doctrine/dbal": "~2.5",