Skip to content

Commit 47b0df4

Browse files
ElectricMaxxxElectricMaxxx
authored
Allow Symfony 4.0 (#213)
* DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * DevKit updates * fix jsrouting bundle's version * allow 2.0 for jsroutingbundle * DevKit updates * fix version constraint * give it a try without jsrouting-bundle
1 parent 73085d6 commit 47b0df4

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 9 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=^4.0@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,23 +36,20 @@ env:
3636
matrix:
3737
include:
3838
- php: 7.1
39-
env: DEPS=dev SYMFONY_VERSION=^4.0@dev
39+
env: STABILITY=dev SYMFONY_VERSION=4.0.*
4040
- php: 7.1
41-
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
41+
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
4242
- php: 7.1
43-
env: SYMFONY_VERSION=3.3.*
43+
env: STABILITY=dev SYMFONY_VERSION=3.3.*
4444
- php: 7.1
45-
env: SYMFONY_VERSION=^3.4@dev
46-
45+
env: STABILITY=dev SYMFONY_VERSION=3.4.*
4746
fast_finish: true
4847
allow_failures:
4948

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

‎README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ when building Symfony full stack applications.
3232
## Requirements
3333

3434
* PHP 7.1
35-
* Symfony 2.8 / 3.3 / ^3.4@dev / ^4.0@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
@@ -67,16 +67,16 @@ Thanks to
6767

6868
This package is available under the [MIT license](src/Resources/meta/LICENSE).
6969

70-
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master
71-
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/Routing
72-
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master
73-
[travis_stable_link]: https://travis-ci.org/symfony-cmf/Routing
74-
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master
75-
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/Routing
76-
77-
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master
78-
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master
79-
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master
80-
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master
81-
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master
82-
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master
70+
[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master
71+
[travis_legacy_link]: https://travis-ci.org/symfony-cmf/routing
72+
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master
73+
[travis_stable_link]: https://travis-ci.org/symfony-cmf/routing
74+
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master
75+
[travis_unstable_link]: https://travis-ci.org/symfony-cmf/routing
76+
77+
[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master
78+
[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master
79+
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master
80+
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master
81+
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master
82+
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master

‎composer.json‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"name": "symfony-cmf/routing",
33
"type": "library",
44
"description": "Extends the Symfony routing component for dynamic routes and chaining several routers",
5-
"keywords": ["routing", "database"],
5+
"keywords": [
6+
"routing",
7+
"database"
8+
],
69
"homepage": "http://cmf.symfony.com",
710
"license": "MIT",
811
"authors": [
@@ -13,32 +16,33 @@
1316
],
1417
"require": {
1518
"php": "^7.1",
16-
"symfony/routing": "^2.8|^3.0",
17-
"symfony/http-kernel": "^2.8|^3.0",
19+
"symfony/routing": "^2.8 || ^3.3 || ^4.0",
20+
"symfony/http-kernel": "^2.8 || ^3.3 || ^4.0",
1821
"psr/log": "^1.0"
1922
},
2023
"require-dev": {
21-
"symfony/phpunit-bridge": "^3.2",
22-
"symfony/dependency-injection": "^2.8|^3.0",
23-
"symfony/config": "^2.8|^3.0",
24-
"symfony/event-dispatcher": "^2.8|^3.0",
25-
"friendsofsymfony/jsrouting-bundle": "^1.1",
24+
"symfony/phpunit-bridge": "^3.3 || ^4.0",
25+
"symfony/dependency-injection": "^2.8 || ^3.3 || ^4.0",
26+
"symfony/config": "^2.8 || ^3.3 || ^4.0",
27+
"symfony/event-dispatcher": "^2.8 || ^3.3 || ^4.0",
2628
"symfony-cmf/testing": "^2.1@dev"
2729
},
2830
"suggest": {
2931
"symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
3032
},
3133
"autoload": {
32-
"psr-4": { "Symfony\\Cmf\\Component\\Routing\\": "src/" }
34+
"psr-4": {
35+
"Symfony\\Cmf\\Component\\Routing\\": "src/"
36+
}
3337
},
3438
"autoload-dev": {
35-
"psr-4": { "Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/" }
39+
"psr-4": {
40+
"Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/"
41+
}
3642
},
3743
"extra": {
3844
"branch-alias": {
3945
"dev-master": "2.1-dev"
4046
}
41-
},
42-
"minimum-stability":"dev",
43-
"prefer-stable": true
47+
}
4448
}

0 commit comments

Comments
 (0)