Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 496d1e6

Browse files
Allow Symfony 4.0 (#218)
* DevKit updates * fix php version in composer.json * 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 * increase symfony-testing version * raise requirements * raise phpcr-odm version * redo phpcr-odm version and do not use phpcr utils < 1.3 * use 2.0 of routing only * higher phpcr-odm version * restrict phpcr-utils version * more restrictions
1 parent cd3ff2a commit 496d1e6

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

.travis.yml

Lines changed: 6 additions & 11 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"
@@ -37,27 +37,22 @@ env:
3737
matrix:
3838
include:
3939
- php: 7.1
40-
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
40+
env: STABILITY=dev SYMFONY_VERSION=4.0.*
4141
- php: 7.1
42-
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
42+
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
4343
- php: 7.1
44-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
44+
env: STABILITY=dev SYMFONY_VERSION=3.3.*
4545
- php: 7.1
46-
env: SYMFONY_VERSION=3.3.*
46+
env: STABILITY=dev SYMFONY_VERSION=3.4.*
4747
- env: TEST_INSTALLATION=true
48-
4948
fast_finish: true
5049
allow_failures:
51-
- php: 7.1
52-
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
5350
- env: TEST_INSTALLATION=true
5451

55-
5652
before_install:
57-
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
5853
- phpenv config-rm xdebug.ini || true
5954
- composer self-update
60-
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
55+
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
6156
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
6257
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
6358

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This bundle automatically creates and manages routes for configured persisted do
2121
## Requirements
2222

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

2727
## Documentation
@@ -42,7 +42,7 @@ For general support and questions, please use [StackOverflow](http://stackoverfl
4242
## Contributing
4343

4444
Pull requests are welcome. Please see our
45-
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
45+
[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
4646
guide.
4747

4848
Unit and/or functional tests exist for this package. See the

composer.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
],
1212
"require": {
1313
"php": "^7.1",
14-
"symfony/framework-bundle": "^2.8|^3.3",
14+
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
1515
"symfony-cmf/routing-auto": "^2.0",
16-
"symfony-cmf/routing-bundle": "^1.2.0|^2.0",
16+
"symfony-cmf/routing-bundle": "^2.0",
1717
"aferrandini/urlizer": "1.0.*",
1818
"phpdocumentor/reflection-docblock": "^3.1, !=3.2.0"
1919
},
2020
"require-dev": {
21-
"symfony/phpunit-bridge": "^3.2",
22-
"symfony/yaml": "^2.8|^3.3",
23-
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
24-
"matthiasnoback/symfony-config-test": "^1.3.1",
25-
"symfony-cmf/testing": "^2.1@dev",
26-
"doctrine/phpcr-odm": "^1.4|^2.0"
21+
"symfony/phpunit-bridge": "^3.3 || ^4.0",
22+
"symfony/yaml": "^2.8 || ^3.3 || ^4.0",
23+
"matthiasnoback/symfony-dependency-injection-test": "^1.0",
24+
"matthiasnoback/symfony-config-test": "^2.2",
25+
"symfony-cmf/testing": "^2.1",
26+
"doctrine/phpcr-odm": "^1.4.2 || ^2.0"
2727
},
2828
"suggest": {
2929
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",
@@ -51,6 +51,9 @@
5151
"SYMFONY_PHPUNIT_REMOVE=\"symfony/yaml\" vendor/bin/simple-phpunit"
5252
]
5353
},
54-
"minimum-stability":"dev",
55-
"prefer-stable": true
54+
"conflict": {
55+
"phpcr/phpcr-utils": "<1.3.2",
56+
"phpunit/phpunit": "<5.7",
57+
"sebastian/exporter": "<2.0"
58+
}
5659
}

0 commit comments

Comments
 (0)