From 988d32f3730505a86e1f348c6682890d534aedec Mon Sep 17 00:00:00 2001 From: SonataCI Date: Mon, 4 Dec 2017 18:04:48 +0100 Subject: [PATCH] DevKit updates --- .github/ISSUE_TEMPLATE.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .travis.yml | 18 ++++++++++-------- CONTRIBUTING.md | 8 ++++---- README.md | 8 ++++---- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index e28a2fdde..748c2f298 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -48,5 +48,5 @@ $ php -v If it's an error message or piece of code, use code block tags, and make sure you provide the whole stack trace(s), not just the first error message you can see. - More details here: https://github.com/sonata-project/SonataUserBundle/blob/3.x/CONTRIBUTING.md#issues + More details here: https://github.com/sonata-project/SonataUserBundle/blob/4.x/CONTRIBUTING.md#issues --> diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8106ef50f..85327dd28 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,9 +3,9 @@ I am targeting this branch, because {reason}. diff --git a/.travis.yml b/.travis.yml index cdf272889..1101fc5e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: only: - master - - 3.x + - 4.x language: php @@ -35,7 +35,7 @@ matrix: include: - php: '7.2' env: TARGET=docs - - php: '5.6' + - php: '7.1' env: TARGET=lint - php: '7.1' env: COMPOSER_FLAGS="--prefer-lowest" @@ -43,14 +43,16 @@ matrix: env: SYMFONY=2.8.* - php: '7.2' env: SYMFONY=3.2.* - - php: '7.1' + - php: '7.2' env: SYMFONY=3.3.* - - php: '7.1' - env: SYMFONY='dev-master as 2.8.x-dev' + - php: '7.2' + env: SYMFONY=3.4.* + - php: '7.2' + env: SYMFONY='dev-master as 4.0.x-dev' - php: '7.2' env: FOS_USER=2.* - php: '7.2' - env: FOS_USER='dev-master as 1.3.x-dev' + env: FOS_USER='dev-master as 2.x-dev' - php: '7.2' env: SONATA_CORE=3.* - php: '7.2' @@ -64,8 +66,8 @@ matrix: allow_failures: - php: nightly - env: SYMFONY_DEPRECATIONS_HELPER=0 - - env: SYMFONY='dev-master as 2.8.x-dev' - - env: FOS_USER='dev-master as 1.3.x-dev' + - env: SYMFONY='dev-master as 4.0.x-dev' + - env: FOS_USER='dev-master as 2.x-dev' - env: SONATA_CORE='dev-master as 3.x-dev' - env: SONATA_ADMIN='dev-master as 3.x-dev' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e11f63ae0..2cc1a0025 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -207,15 +207,15 @@ Here is a short table resuming on which you have to start: Kind of modification | Backward Compatible (BC) | Type of release | Branch to target | Label | -------------------- | ------------------------ | --------------- | ----------------------- | ----- | -Bug fixes | Yes | Patch | `3.x` | | +Bug fixes | Yes | Patch | `4.x` | | Bug fixes | No (Only if no choice) | Major | `master` | | -Feature | Yes | Minor | `3.x` | | +Feature | Yes | Minor | `4.x` | | Feature | No (Only if no choice) | Major | `master` | | -Deprecation | Yes (Have to) | Minor | `3.x` | | +Deprecation | Yes (Have to) | Minor | `4.x` | | Deprecation removal | No (Can't be) | Major | `master` | | Notes: - * Branch `3.x` is the branch of the **latest stable** minor release and + * Branch `4.x` is the branch of the **latest stable** minor release and has to be used for Backward compatible PRs. * If you PR is not **Backward Compatible** but can be, it **must** be: * Changing a function/method signature? Prefer create a new one and deprecate the old one. diff --git a/README.md b/README.md index 6fc1f813d..e0c65869d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Symfony SonataUserBundle Branch | Travis | Coveralls | ------ | ------ | --------- | -3.x | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] | +4.x | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] | master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | ## Documentation @@ -30,12 +30,12 @@ If you think you found a bug or you have a feature idea to propose, feel free to This package is available under the [MIT license](LICENSE). -[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=3.x +[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=4.x [travis_stable_link]: https://travis-ci.org/sonata-project/SonataUserBundle [travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataUserBundle.svg?branch=master [travis_unstable_link]: https://travis-ci.org/sonata-project/SonataUserBundle -[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=3.x -[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=3.x +[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=4.x +[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=4.x [coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataUserBundle/badge.svg?branch=master [coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataUserBundle?branch=master