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

Commit b65ccd3

Browse files
Allow Symfony 4.0 (#61)
* 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 95de338 commit b65ccd3

File tree

3 files changed

+27
-31
lines changed

3 files changed

+27
-31
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
@@ -32,7 +32,7 @@ KERNEL_CLASS="Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Fixtures\App\Kernel" .
3232
## Requirements
3333

3434
* PHP 7.1
35-
* Symfony 2.8 / 3.3 / ^3.4@dev
35+
* Symfony 2.8 / 3.3 / 3.4 / 4.0
3636
* See also the `require` section of [composer.json](composer.json)
3737

3838
## Documentation
@@ -53,7 +53,7 @@ For general support and questions, please use [StackOverflow](http://stackoverfl
5353
## Contributing
5454

5555
Pull requests are welcome. Please see our
56-
[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
56+
[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md)
5757
guide.
5858

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

composer.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,49 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^5.6|^7.0",
13+
"php": "^7.1",
1414
"symfony-cmf/resource-bundle": "^1.0",
1515
"jms/serializer-bundle": "^1.0 | ^2.0",
16-
"symfony/translation": "^2.8|^3.0"
16+
"symfony/translation": "^2.8 || ^3.3 || ^4.0"
1717
},
1818
"require-dev": {
1919
"symfony-cmf/testing": "^2.1@dev",
20-
"symfony/phpunit-bridge": "^3.3.10",
20+
"symfony/phpunit-bridge": "^3.3 || ^4.0",
2121
"doctrine/phpcr-odm": "^1.4|^2.0",
2222
"jms/serializer": "^1.2",
2323
"behat/behat": "^3.0.6",
24-
"behat/web-api-extension" : "^1.0@dev",
24+
"behat/web-api-extension": "^1.0@dev",
2525
"matthiasnoback/symfony-dependency-injection-test": "^1.1",
2626
"matthiasnoback/symfony-config-test": "^2.1",
27-
"symfony/twig-bundle": "^2.8|^3.3",
28-
"symfony/validator": "^2.8|^3.3",
29-
"symfony/security-bundle": "^2.8|^3.3",
30-
"symfony/asset": "^2.8|^3.3",
31-
"symfony/templating": "^2.8|^3.3",
32-
"symfony/form": "^2.8|^3.3",
33-
"symfony/web-server-bundle": "^2.8|^3.3",
34-
"symfony/translation": "^2.8|^3.3"
27+
"symfony/twig-bundle": "^2.8 || ^3.3 || ^4.0",
28+
"symfony/validator": "^2.8 || ^3.3 || ^4.0",
29+
"symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
30+
"symfony/asset": "^2.8 || ^3.3 || ^4.0",
31+
"symfony/templating": "^2.8 || ^3.3 || ^4.0",
32+
"symfony/form": "^2.8 || ^3.3 || ^4.0",
33+
"symfony/web-server-bundle": "^2.8 || ^3.3 || ^4.0",
34+
"symfony/translation": "^2.8 || ^3.3 || ^4.0"
3535
},
36-
"minimum-stability":"dev",
37-
38-
"prefer-stable": true,
3936
"suggest": {
4037
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.2)",
4138
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents"
4239
},
4340
"autoload": {
44-
"psr-4": { "Symfony\\Cmf\\Bundle\\ResourceRestBundle\\": "src" }
41+
"psr-4": {
42+
"Symfony\\Cmf\\Bundle\\ResourceRestBundle\\": "src"
43+
}
4544
},
4645
"autoload-dev": {
47-
"psr-4": { "Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\": "tests" }
46+
"psr-4": {
47+
"Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\": "tests"
48+
}
4849
},
4950
"extra": {
5051
"branch-alias": {
5152
"dev-master": "1.1-dev"
5253
}
5354
},
54-
"conflict":{
55+
"conflict": {
5556
"sebastian/environment": "<1.3.4",
5657
"sebastian/exporter": "<2.0.0"
5758
}

0 commit comments

Comments
 (0)