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

Commit 640f413

Browse files
Allow Symfony 4.0 (#51)
* 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
1 parent af9499d commit 640f413

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
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
@@ -37,7 +37,7 @@ provide the context with which to resolve the documents.
3737
## Requirements
3838

3939
* PHP 7.1
40-
* Symfony 2.8 / 3.3 / ^3.4@dev
40+
* Symfony 2.8 / 3.3 / 3.4 / 4.0
4141
* See also the `require` section of [composer.json](composer.json)
4242

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

6060
Pull requests are welcome. Please see our
61-
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
61+
[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
6262
guide.
6363

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

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^5.6|^7.0",
14-
"symfony/framework-bundle": "^2.8|^3.3",
15-
"symfony/options-resolver": "^2.8|^3.3",
13+
"php": "^7.1",
14+
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
15+
"symfony/options-resolver": "^2.8 || ^3.3 || ^4.0",
1616
"symfony-cmf/resource": "^1.0",
17-
"symfony/symfony": "^3.4@dev"
17+
"symfony/symfony": "^2.8 || ^3.3 || ^4.0"
1818
},
1919
"require-dev": {
2020
"symfony-cmf/testing": "^2.1@dev",
21-
"symfony/phpunit-bridge": "^3.2",
21+
"symfony/phpunit-bridge": "^3.3 || ^4.0",
2222
"doctrine/phpcr-odm": "^1.4|^2.0"
2323
},
24-
"minimum-stability":"dev",
25-
"prefer-stable": true,
2624
"suggest": {
2725
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
2826
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents"
2927
},
3028
"autoload": {
31-
"psr-4": { "Symfony\\Cmf\\Bundle\\ResourceBundle\\": "src/" }
29+
"psr-4": {
30+
"Symfony\\Cmf\\Bundle\\ResourceBundle\\": "src/"
31+
}
3232
},
3333
"autoload-dev": {
3434
"psr-4": {

0 commit comments

Comments
 (0)