Skip to content

Commit

Permalink
Bump to SF 4.4 & PHPUnit version 8
Browse files Browse the repository at this point in the history
  • Loading branch information
mazsudo authored and core23 committed Jan 29, 2020
1 parent 266df18 commit d6d295a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
- SYMFONY_DEPRECATIONS_HELPER=max[self]=0
- TARGET=test
- UPSTREAM_URL=https://github.com/sonata-project/SonataIntlBundle.git
- PHPUNIT_VERSION=7
- PHPUNIT_VERSION=8

matrix:
fast_finish: true
Expand All @@ -45,16 +45,16 @@ matrix:
- php: '7.2'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '7.3'
env: SYMFONY=3.4.*
env: SYMFONY=4.4.*
- php: '7.3'
env: SYMFONY='dev-master as 3.4.x-dev'
env: SYMFONY='dev-master as 4.4.x-dev'
- php: '7.3'
env: SYMFONY_DEPRECATIONS_HELPER=0
allow_failures:
- php: 7.4snapshot
- php: 7.4
- php: nightly
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY='dev-master as 3.4.x-dev'
- env: SYMFONY='dev-master as 4.4.x-dev'

before_install:
- git remote add upstream ${UPSTREAM_URL} && git fetch --all
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
],
"require": {
"php": "^7.1",
"symfony/config": "^3.4 || ^4.2",
"symfony/dependency-injection": "^3.4 || ^4.2",
"symfony/http-foundation": "^3.4 || ^4.2",
"symfony/http-kernel": "^3.4 || ^4.2",
"symfony/intl": "^3.4 || ^4.2",
"symfony/templating": "^3.4 || ^4.2",
"symfony/config": "^4.4",
"symfony/dependency-injection": "^4.4",
"symfony/http-foundation": "^4.4",
"symfony/http-kernel": "^4.4",
"symfony/intl": "^4.4",
"symfony/templating": "^4.4",
"twig/twig": "^2.9"
},
"conflict": {
"sonata-project/user-bundle": "<2.0 || >=5.0"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^3.1",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"sonata-project/user-bundle": "^3.6 || ^4.0",
"symfony/phpunit-bridge": "^5.0",
"symfony/security-core": "^3.4 || ^4.2"
"symfony/security-core": "^4.4"
},
"suggest": {
"sonata-project/user-bundle": "For user timezone detection"
Expand Down

0 comments on commit d6d295a

Please sign in to comment.