diff --git a/.travis.yml b/.travis.yml index 974269ca..69fb36ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ cache: - $HOME/.composer/cache/files env: - matrix: SYMFONY_VERSION=^4.0@dev + matrix: SYMFONY_VERSION=4.0.* global: - SYMFONY_DEPRECATIONS_HELPER=0 - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" @@ -36,23 +36,20 @@ env: matrix: include: - php: 7.1 - env: DEPS=dev SYMFONY_VERSION=^4.0@dev + env: STABILITY=dev SYMFONY_VERSION=4.0.* - php: 7.1 - env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak + env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 - env: SYMFONY_VERSION=3.3.* + env: STABILITY=dev SYMFONY_VERSION=3.3.* - php: 7.1 - env: SYMFONY_VERSION=^3.4@dev - + env: STABILITY=dev SYMFONY_VERSION=3.4.* fast_finish: true allow_failures: - before_install: - - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi - phpenv config-rm xdebug.ini || true - composer self-update - - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi + - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi; - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) diff --git a/README.md b/README.md index f8cdf087..cc128ad3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ when building Symfony full stack applications. ## Requirements * PHP 7.1 -* Symfony 2.8 / 3.3 / ^3.4@dev / ^4.0@dev +* Symfony 2.8 / 3.3 / 3.4 / 4.0 * See also the `require` section of [composer.json](composer.json) ## Documentation @@ -53,7 +53,7 @@ For general support and questions, please use [StackOverflow](http://stackoverfl ## Contributing Pull requests are welcome. Please see our -[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md) +[CONTRIBUTING](https://github.com/symfony-cmf/blob/master/CONTRIBUTING.md) guide. Unit and/or functional tests exist for this package. See the @@ -67,16 +67,16 @@ Thanks to This package is available under the [MIT license](src/Resources/meta/LICENSE). -[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master -[travis_legacy_link]: https://travis-ci.org/symfony-cmf/Routing -[travis_stable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master -[travis_stable_link]: https://travis-ci.org/symfony-cmf/Routing -[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/Routing.svg?branch=master -[travis_unstable_link]: https://travis-ci.org/symfony-cmf/Routing - -[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master -[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master -[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master -[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master -[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/Routing/badge.svg?branch=master -[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/Routing?branch=master +[travis_legacy_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master +[travis_legacy_link]: https://travis-ci.org/symfony-cmf/routing +[travis_stable_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master +[travis_stable_link]: https://travis-ci.org/symfony-cmf/routing +[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/routing.svg?branch=master +[travis_unstable_link]: https://travis-ci.org/symfony-cmf/routing + +[coveralls_legacy_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master +[coveralls_legacy_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master +[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master +[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master +[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing/badge.svg?branch=master +[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing?branch=master diff --git a/composer.json b/composer.json index 35dfdced..16ce67de 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,10 @@ "name": "symfony-cmf/routing", "type": "library", "description": "Extends the Symfony routing component for dynamic routes and chaining several routers", - "keywords": ["routing", "database"], + "keywords": [ + "routing", + "database" + ], "homepage": "http://cmf.symfony.com", "license": "MIT", "authors": [ @@ -13,32 +16,33 @@ ], "require": { "php": "^7.1", - "symfony/routing": "^2.8|^3.0", - "symfony/http-kernel": "^2.8|^3.0", + "symfony/routing": "^2.8 || ^3.3 || ^4.0", + "symfony/http-kernel": "^2.8 || ^3.3 || ^4.0", "psr/log": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2", - "symfony/dependency-injection": "^2.8|^3.0", - "symfony/config": "^2.8|^3.0", - "symfony/event-dispatcher": "^2.8|^3.0", - "friendsofsymfony/jsrouting-bundle": "^1.1", + "symfony/phpunit-bridge": "^3.3 || ^4.0", + "symfony/dependency-injection": "^2.8 || ^3.3 || ^4.0", + "symfony/config": "^2.8 || ^3.3 || ^4.0", + "symfony/event-dispatcher": "^2.8 || ^3.3 || ^4.0", "symfony-cmf/testing": "^2.1@dev" }, "suggest": { "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)" }, "autoload": { - "psr-4": { "Symfony\\Cmf\\Component\\Routing\\": "src/" } + "psr-4": { + "Symfony\\Cmf\\Component\\Routing\\": "src/" + } }, "autoload-dev": { - "psr-4": { "Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/" } + "psr-4": { + "Symfony\\Cmf\\Component\\Routing\\Tests\\": "tests/" + } }, "extra": { "branch-alias": { "dev-master": "2.1-dev" } - }, - "minimum-stability":"dev", - "prefer-stable": true + } }