Skip to content

Commit dec3a0f

Browse files
authored
Merge pull request #50 from acrobat/requirement-tweaks
Update dependencies to supported version and update travis config
2 parents b0680e1 + f7fe9a6 commit dec3a0f

3 files changed

Lines changed: 24 additions & 74 deletions

File tree

.travis.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
1+
sudo: false
2+
dist: trusty
3+
14
language: php
25

36
php:
4-
- 5.5
57
- 5.6
68
- 7.0
9+
- 7.1
710
- hhvm
811

9-
env:
10-
- SYMFONY_VERSION=2.3.*
11-
- SYMFONY_VERSION=2.4.*
12-
- SYMFONY_VERSION=2.5.*
13-
- SYMFONY_VERSION=2.6.*
14-
- SYMFONY_VERSION=2.7.*
15-
- SYMFONY_VERSION=2.8.*
16-
- SYMFONY_VERSION=3.0.*
12+
matrix:
13+
fast_finish: true
14+
include:
15+
- php: 5.6
16+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
17+
- php: 7.1
18+
env: DEPENDENCIES=dev
19+
- php: 7.0
20+
env: SYMFONY_VERSION=2.8.* # Test against LTS versions
21+
22+
before_install:
23+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
24+
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
1725

1826
before_install:
1927
- composer self-update
2028

2129
install:
22-
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
23-
- composer require symfony/console:${SYMFONY_VERSION} --no-update
24-
- composer require symfony/finder:${SYMFONY_VERSION} --no-update
25-
- composer install --no-progress --no-plugins
30+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
2631

2732
script:
2833
- bin/phpunit

Tests/BernardBundleTest.php

Lines changed: 0 additions & 56 deletions
This file was deleted.

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
},
1111

1212
"require" : {
13-
"bernard/bernard" : "1.0.*@dev",
14-
"symfony/framework-bundle" : "~2.3|~3.0"
13+
"php": "^5.6|^7.0",
14+
"bernard/bernard": "1.0.*@dev",
15+
"symfony/framework-bundle": "^2.7|^3.0"
1516
},
1617

1718
"require-dev" : {
18-
"symfony/console" : "~2.3|~3.0",
19-
"symfony/finder" : "~2.3|~3.0",
20-
"phpunit/phpunit" : "~4.0"
19+
"symfony/console": "^2.7|^3.0",
20+
"symfony/finder": "^2.7|^3.0",
21+
"phpunit/phpunit": "~4.0"
2122
},
2223

2324
"extra" : {

0 commit comments

Comments
 (0)