Skip to content

Commit 285b69d

Browse files
authored
Merge pull request #115 from phansys/dependencies
Allow new major versions for existing dependencies
2 parents b9995dc + 57bacf5 commit 285b69d

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ warnings_are_errors: false
44
php:
55
- 5.6
66
- 7.0
7+
- 7.1
8+
- 7.2
79
- nightly
810
- hhvm
911

@@ -15,7 +17,6 @@ matrix:
1517
fast_finish: true
1618
include:
1719
- php: 5.6
18-
env: CS_FIXER=run
1920
- php: 5.6
2021
env: COMPOSER_FLAGS="--prefer-lowest"
2122
- php: 5.6
@@ -39,10 +40,7 @@ cache:
3940

4041
before_script:
4142
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
42-
- composer selfupdate
43-
- composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
44-
- composer global require phpunit/phpunit fabpot/php-cs-fixer --no-update
45-
- composer global update --prefer-dist --no-interaction
43+
- if [ "$GITHUB_OAUTH_TOKEN" != "" ]; then echo -e $GITHUB_OAUTH_TOKEN && composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
4644
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
4745
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
4846

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ cs_dry_run:
55
php-cs-fixer fix --verbose --dry-run
66

77
test:
8-
phpunit -c phpunit.xml.dist
8+
vendor/bin/phpunit -c phpunit.xml.dist

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
],
2727
"require": {
2828
"php": "^5.6 || ^7.0",
29-
"symfony/symfony": "^2.8 || ^3.0",
30-
"sensio/framework-extra-bundle": "^3.0.2",
29+
"symfony/symfony": "^2.8 || ^3.0 || ^4.0",
30+
"sensio/framework-extra-bundle": "^3.0.2 || ^4.0",
3131
"doctrine/orm": "^2.4.8",
3232
"doctrine/doctrine-bundle": "~1.4",
3333
"knplabs/knp-paginator-bundle": "~2.3"
@@ -36,8 +36,8 @@
3636
"vich/uploader-bundle": "Allow attaching files to ticket messages"
3737
},
3838
"require-dev": {
39-
"symfony/form": "^2.8 || ^3.0",
40-
"symfony/phpunit-bridge": "^2.8 || ^3.0",
39+
"symfony/form": "^2.8 || ^3.0 || ^4.0",
40+
"symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
4141
"phpunit/phpunit": "^5.4",
4242
"sllh/php-cs-fixer-styleci-bridge": "^1.5"
4343
},

0 commit comments

Comments
 (0)