DevKit updates (#3780)

.travis.yml

@@ -56,11 +56,12 @@ before_install:
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp; fi;
   - composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN
   - composer global require phpunit/phpunit:@stable --no-update
+  - sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
 
 install:
   - travis_wait composer global update --prefer-dist --no-interaction
-  - travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+  - travis_wait composer update --prefer-dist --no-interaction --prefer-stable $COMPOSER_FLAGS
   - pip install -r Resources/doc/requirements.txt --user `whoami`
 
 before_script:

CONTRIBUTING.md

@@ -114,15 +114,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           | `2.x`   | |
+Bug fixes            | Yes                      | Patch           | `3.x`   | |
 Bug fixes            | No (Only if no choice)   | Major           | `master` | |
-Feature              | Yes                      | Minor           | `2.x`   | |
+Feature              | Yes                      | Minor           | `3.x`   | |
 Feature              | No (Only if no choice)   | Major           | `master` | |
-Deprecation          | Yes (Have to)            | Minor           | `2.x`   | |
+Deprecation          | Yes (Have to)            | Minor           | `3.x`   | |
 Deprecation removal  | No (Can't be)            | Major           | `master` | |
 
 Notes:
-  * Branch `2.x` is the branch of the **latest stable** minor release and
+  * Branch `3.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 deprecated the old one.

README.md

@@ -10,7 +10,7 @@ Symfony SonataAdminBundle
 [![Monthly Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/monthly)](https://packagist.org/packages/sonata-project/admin-bundle)
 [![Daily Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/daily)](https://packagist.org/packages/sonata-project/admin-bundle)
 
-[![Build Status](https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=master)](https://travis-ci.org/sonata-project/SonataAdminBundle)
+[![Build Status](https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=3.x)](https://travis-ci.org/sonata-project/SonataAdminBundle)
 
 ## Documentation