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

Commit f29ab2c

Browse files
Allow Symfony 4.0 (#298)
* 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 * allow phpcr-odm version 2.0 * DevKit updates
1 parent fd93d87 commit f29ab2c

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-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 @@ The MenuBundle provides menus from a doctrine object manager with the help of Kn
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: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"name": "symfony-cmf/menu-bundle",
33
"type": "symfony-bundle",
44
"description": "Symfony CMF Menu Bundle",
5-
"keywords": ["Symfony CMF", "menu"],
5+
"keywords": [
6+
"Symfony CMF",
7+
"menu"
8+
],
69
"homepage": "http://cmf.symfony.com",
710
"license": "MIT",
811
"authors": [
@@ -12,19 +15,19 @@
1215
}
1316
],
1417
"require": {
15-
"php": "^5.6|^7.0",
16-
"symfony/framework-bundle": "^2.8|^3.0",
18+
"php": "^7.1",
19+
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
1720
"knplabs/knp-menu-bundle": "^2.2.0",
1821
"knplabs/knp-menu": "^2.0.0"
1922
},
2023
"require-dev": {
21-
"symfony/monolog-bundle": "^2.3|^3.0",
22-
"symfony/phpunit-bridge": "^3.2",
23-
"symfony-cmf/routing-bundle": "^1.4|^2.0",
24+
"symfony/monolog-bundle": "~3.1",
25+
"symfony/phpunit-bridge": "^3.3 || ^4.0",
26+
"symfony-cmf/routing-bundle": "^1.4 || ^2.0",
2427
"symfony-cmf/testing": "^2.1@dev",
2528
"twig/twig": "^1.18|^2.0",
2629
"symfony-cmf/core-bundle": "^2.0",
27-
"doctrine/phpcr-odm": "^1.4.2"
30+
"doctrine/phpcr-odm": "^1.4.2 || ^2.0"
2831
},
2932
"suggest": {
3033
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)",
@@ -45,7 +48,5 @@
4548
"branch-alias": {
4649
"dev-master": "2.2-dev"
4750
}
48-
},
49-
"minimum-stability":"dev",
50-
"prefer-stable": true
51+
}
5152
}

0 commit comments

Comments
 (0)