Skip to content

Commit e9af162

Browse files
Allow Symfony 4.0 (#160)
* DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * remove unused require-dev versions * DevKit updates
1 parent 2518486 commit e9af162

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

.travis.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cache:
2626
- $HOME/.composer/cache/files
2727

2828
env:
29-
matrix: SYMFONY_VERSION=^3.4@dev
29+
matrix: SYMFONY_VERSION=4.0.*
3030
global:
3131
- SYMFONY_DEPRECATIONS_HELPER=0
3232
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
@@ -36,22 +36,17 @@ env:
3636
matrix:
3737
include:
3838
- php: 7.1
39-
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
39+
env: DEPS=dev SYMFONY_VERSION=4.0.*
4040
- php: 7.1
41-
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
41+
env: DEPS=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
4242
- php: 7.1
43-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
43+
env: DEPS=dev SYMFONY_VERSION=3.3.*
4444
- php: 7.1
45-
env: SYMFONY_VERSION=3.3.*
46-
45+
env: DEPS=dev SYMFONY_VERSION=3.4.*
4746
fast_finish: true
4847
allow_failures:
49-
- php: 7.1
50-
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
51-
5248

5349
before_install:
54-
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
5550
- phpenv config-rm xdebug.ini || true
5651
- composer self-update
5752
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ the context of the CMF.
2222
## Requirements
2323

2424
* PHP 7.1
25-
* Symfony 2.8 / 3.3 / ^3.4@dev
25+
* Symfony 2.8 / 3.3 / 3.4 / 4.0
2626
* See also the `require` section of [composer.json](composer.json)
2727

2828
## Documentation

composer.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
],
1111
"require": {
1212
"php": "^7.1",
13-
"symfony/phpunit-bridge": "^3.2",
14-
"symfony/monolog-bundle": "^2.8|^3.3|^4.0",
13+
"symfony/phpunit-bridge": "3.3 || ^4.0",
14+
"symfony/monolog-bundle": "~3.1",
1515
"doctrine/common": "^2.4",
1616
"doctrine/doctrine-bundle": "^1.0|^2.0",
1717
"doctrine/phpcr-odm": "^1.4|^2.0",
1818
"doctrine/phpcr-bundle": "^2.0@dev",
1919
"doctrine/data-fixtures": "^1.0",
2020
"jackalope/jackalope": "^1.1.5",
2121
"jackalope/jackalope-doctrine-dbal": "^1.1.5",
22-
"symfony/yaml": "^2.8|^3.3|^4.0"
22+
"symfony/yaml": "^2.8 || ^3.3 || ^4.0"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -35,7 +35,5 @@
3535
"branch-alias": {
3636
"dev-master": "2.1-dev"
3737
}
38-
},
39-
"minimum-stability":"dev",
40-
"prefer-stable": true
38+
}
4139
}

0 commit comments

Comments
 (0)