From 34522882060a722244458f07ed9d2fe2c17d0bf5 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Thu, 30 Nov 2017 05:57:11 +0100 Subject: [PATCH 01/17] DevKit updates --- .travis.yml | 2 +- README.md | 2 +- composer.json | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 974269ca..5144e276 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ matrix: include: - php: 7.1 env: DEPS=dev SYMFONY_VERSION=^4.0@dev - - php: 7.1 + - php: 7.0 env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 env: SYMFONY_VERSION=3.3.* diff --git a/README.md b/README.md index f8cdf087..1f7dc07e 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ when building Symfony full stack applications. ## Requirements -* PHP 7.1 +* PHP 7.0 / 7.1 * Symfony 2.8 / 3.3 / ^3.4@dev / ^4.0@dev * See also the `require` section of [composer.json](composer.json) diff --git a/composer.json b/composer.json index 35dfdced..c09a29f0 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": [ @@ -12,7 +15,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.0", "symfony/routing": "^2.8|^3.0", "symfony/http-kernel": "^2.8|^3.0", "psr/log": "^1.0" @@ -29,16 +32,20 @@ "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", + "minimum-stability": "dev", "prefer-stable": true } From 1f6a52367e956304deec5bcfcec89bf5aa5e60b1 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Thu, 30 Nov 2017 08:05:16 +0100 Subject: [PATCH 02/17] DevKit updates --- .travis.yml | 2 +- README.md | 2 +- composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5144e276..974269ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ matrix: include: - php: 7.1 env: DEPS=dev SYMFONY_VERSION=^4.0@dev - - php: 7.0 + - php: 7.1 env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 env: SYMFONY_VERSION=3.3.* diff --git a/README.md b/README.md index 1f7dc07e..f8cdf087 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ when building Symfony full stack applications. ## Requirements -* PHP 7.0 / 7.1 +* PHP 7.1 * Symfony 2.8 / 3.3 / ^3.4@dev / ^4.0@dev * See also the `require` section of [composer.json](composer.json) diff --git a/composer.json b/composer.json index c09a29f0..5d034a6d 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.0", + "php": "^7.1", "symfony/routing": "^2.8|^3.0", "symfony/http-kernel": "^2.8|^3.0", "psr/log": "^1.0" From b81dbe487aa06168dd73af67c5f3e5e56554a2dc Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Thu, 30 Nov 2017 15:00:23 +0100 Subject: [PATCH 03/17] DevKit updates --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 5d034a6d..7a7e5394 100644 --- a/composer.json +++ b/composer.json @@ -16,16 +16,16 @@ ], "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": "^2.8 || ^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", + "friendsofsymfony/jsrouting-bundle": "^2.8 || ^3.3 || ^4.0", "symfony-cmf/testing": "^2.1@dev" }, "suggest": { From 7c8a69012470269faa0fc94b0115427fd60b4b57 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Thu, 30 Nov 2017 21:09:16 +0100 Subject: [PATCH 04/17] DevKit updates --- .travis.yml | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 974269ca..7bec4033 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,13 +36,13 @@ env: matrix: include: - php: 7.1 - env: DEPS=dev SYMFONY_VERSION=^4.0@dev + env: DEPS=dev SYMFONY_VERSION=^4.0 - php: 7.1 env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 env: SYMFONY_VERSION=3.3.* - php: 7.1 - env: SYMFONY_VERSION=^3.4@dev + env: SYMFONY_VERSION=^3.4 fast_finish: true allow_failures: diff --git a/README.md b/README.md index f8cdf087..4819cd59 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 From e489a7c620a622b27af9ff3e2928992b26b129f8 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Thu, 30 Nov 2017 21:45:54 +0100 Subject: [PATCH 05/17] DevKit updates --- .travis.yml | 6 +++--- README.md | 2 +- composer.json | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bec4033..ca6b85fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ cache: - $HOME/.composer/cache/files env: - matrix: SYMFONY_VERSION=^4.0 + matrix: SYMFONY_VERSION=4.0.* global: - SYMFONY_DEPRECATIONS_HELPER=0 - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" @@ -36,13 +36,13 @@ env: matrix: include: - php: 7.1 - env: DEPS=dev SYMFONY_VERSION=^4.0 + env: DEPS=dev SYMFONY_VERSION=4.0.* - php: 7.1 env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 env: SYMFONY_VERSION=3.3.* - php: 7.1 - env: SYMFONY_VERSION=^3.4 + env: SYMFONY_VERSION=3.4.* fast_finish: true allow_failures: diff --git a/README.md b/README.md index 4819cd59..aaf35cd6 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 / ^4.0 +* Symfony 2.8 / 3.3 / 3.4 / 4.0 * See also the `require` section of [composer.json](composer.json) ## Documentation diff --git a/composer.json b/composer.json index 7a7e5394..626783f8 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,5 @@ "branch-alias": { "dev-master": "2.1-dev" } - }, - "minimum-stability": "dev", - "prefer-stable": true + } } From ba7b0f4c5e928a783e3a44c1a162c50b8b9545aa Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 05:09:25 +0100 Subject: [PATCH 06/17] DevKit updates --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca6b85fa..7a95149a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,14 +40,12 @@ matrix: - php: 7.1 env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 - env: SYMFONY_VERSION=3.3.* + env: DEPS=dev SYMFONY_VERSION=3.3.* - php: 7.1 - env: SYMFONY_VERSION=3.4.* - + env: DEPS=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 From 4d9edc87ddf2a1d0a00805fd5839a1c7e2ab3128 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 05:14:22 +0100 Subject: [PATCH 07/17] DevKit updates --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a95149a..73b66d5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,6 @@ matrix: 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 From f7f9ec862412419596d5b5dbbd5bdbe342275382 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 05:22:09 +0100 Subject: [PATCH 08/17] DevKit updates --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 626783f8..36930a34 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/log": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^2.8 || ^3.3 || ^4.0", + "symfony/phpunit-bridge": "^3.3", "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", From 3427605120b0b7112b1259135165e45a8cb200d6 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 05:25:17 +0100 Subject: [PATCH 09/17] DevKit updates --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 36930a34..626783f8 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/log": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.3", + "symfony/phpunit-bridge": "^2.8 || ^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", From 53f516c09d76647f49e1cb5ff22bc762005c9889 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 09:29:07 +0100 Subject: [PATCH 10/17] DevKit updates --- .travis.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73b66d5e..9203b824 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ matrix: - php: 7.1 env: DEPS=dev SYMFONY_VERSION=4.0.* - php: 7.1 - env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak + env: DEPS=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak - php: 7.1 env: DEPS=dev SYMFONY_VERSION=3.3.* - php: 7.1 diff --git a/composer.json b/composer.json index 626783f8..d65e5a95 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/log": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^2.8 || ^3.3 || ^4.0", + "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", From 4873ffc9d181177caf7e3b941066805382cf4513 Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 16:30:53 +0100 Subject: [PATCH 11/17] DevKit updates --- .travis.yml | 10 +++++----- README.md | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9203b824..2872c71f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,20 +36,20 @@ env: matrix: include: - php: 7.1 - env: DEPS=dev SYMFONY_VERSION=4.0.* + env: STABILITY=dev SYMFONY_VERSION=4.0.* - php: 7.1 - env: DEPS=dev 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: DEPS=dev SYMFONY_VERSION=3.3.* + env: STABILITY=dev SYMFONY_VERSION=3.3.* - php: 7.1 - env: DEPS=dev SYMFONY_VERSION=3.4.* + env: STABILITY=dev SYMFONY_VERSION=3.4.* fast_finish: true allow_failures: before_install: - 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}; 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 aaf35cd6..460dea30 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,11 @@ 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_legacy_link]: https://travis-ci.org/symfony-cmf/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_stable_link]: https://travis-ci.org/symfony-cmf/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 +[travis_unstable_link]: https://travis-ci.org/symfony-cmf/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 From a98631af0fd76d26ac206736ff7cbcaf6f86ad8f Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 16:33:33 +0100 Subject: [PATCH 12/17] DevKit updates --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 460dea30..849d1af7 100644 --- a/README.md +++ b/README.md @@ -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/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/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/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/Routing.svg?branch=master +[travis_legacy_link]: https://travis-ci.org/symfony-cmf/routing +[travis_stable_badge]: https://travis-ci.org/Routing.svg?branch=master +[travis_stable_link]: https://travis-ci.org/symfony-cmf/routing +[travis_unstable_badge]: https://travis-ci.org/Routing.svg?branch=master +[travis_unstable_link]: https://travis-ci.org/symfony-cmf/routing + +[coveralls_legacy_badge]: https://coveralls.io/repos/github/Routing/badge.svg?branch=master +[coveralls_legacy_link]: https://coveralls.io/github/Routing?branch=master +[coveralls_stable_badge]: https://coveralls.io/repos/github/Routing/badge.svg?branch=master +[coveralls_stable_link]: https://coveralls.io/github/Routing?branch=master +[coveralls_unstable_badge]: https://coveralls.io/repos/github/Routing/badge.svg?branch=master +[coveralls_unstable_link]: https://coveralls.io/github/Routing?branch=master From 747d21a5dd54a96461bda15b3df3409f7e0f17ed Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Fri, 1 Dec 2017 17:01:49 +0100 Subject: [PATCH 13/17] fix jsrouting bundle's version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d65e5a95..dcdb84ce 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "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", - "friendsofsymfony/jsrouting-bundle": "^2.8 || ^3.3 || ^4.0", + "friendsofsymfony/jsrouting-bundle": "^1.1", "symfony-cmf/testing": "^2.1@dev" }, "suggest": { From 858f8be8a688245b911f04cb739d9bb916be341f Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Fri, 1 Dec 2017 17:03:53 +0100 Subject: [PATCH 14/17] allow 2.0 for jsroutingbundle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dcdb84ce..0042e61f 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "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", - "friendsofsymfony/jsrouting-bundle": "^1.1", + "friendsofsymfony/jsrouting-bundle": "^1.1 || ^ 2.0", "symfony-cmf/testing": "^2.1@dev" }, "suggest": { From 2dfcb104dab08971d6f491a9e48857ab0943de9c Mon Sep 17 00:00:00 2001 From: electricmaxxx Date: Fri, 1 Dec 2017 18:01:59 +0100 Subject: [PATCH 15/17] DevKit updates --- .travis.yml | 2 +- README.md | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2872c71f..69fb36ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ matrix: before_install: - phpenv config-rm xdebug.ini || true - composer self-update - - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; 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 849d1af7..cc128ad3 100644 --- a/README.md +++ b/README.md @@ -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/Routing.svg?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/Routing.svg?branch=master +[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/Routing.svg?branch=master +[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/Routing/badge.svg?branch=master -[coveralls_legacy_link]: https://coveralls.io/github/Routing?branch=master -[coveralls_stable_badge]: https://coveralls.io/repos/github/Routing/badge.svg?branch=master -[coveralls_stable_link]: https://coveralls.io/github/Routing?branch=master -[coveralls_unstable_badge]: https://coveralls.io/repos/github/Routing/badge.svg?branch=master -[coveralls_unstable_link]: https://coveralls.io/github/Routing?branch=master +[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 From 24886390f2451ba8ba4a7722bc01c5fddcac25c4 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Fri, 1 Dec 2017 23:53:22 +0100 Subject: [PATCH 16/17] fix version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0042e61f..fd2316c1 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "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", - "friendsofsymfony/jsrouting-bundle": "^1.1 || ^ 2.0", + "friendsofsymfony/jsrouting-bundle": "^1.1 || ^2.0", "symfony-cmf/testing": "^2.1@dev" }, "suggest": { From 7afbd57ce5f94d31959289b6ce83e8474d944f50 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Sat, 2 Dec 2017 11:12:52 +0100 Subject: [PATCH 17/17] give it a try without jsrouting-bundle --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index fd2316c1..16ce67de 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,6 @@ "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", - "friendsofsymfony/jsrouting-bundle": "^1.1 || ^2.0", "symfony-cmf/testing": "^2.1@dev" }, "suggest": {