Merge 3.x into master

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,11 +24,13 @@ Closes #{put_issue_number_here}
 <!-- MANDATORY
     Fill the changelog part inside the code block.
     Follow this schema: http://keepachangelog.com/
+    This will end up on https://github.com/sonata-project/SonataNotificationBundle/releases,
+    please keep it short and clear and to the point
 -->
 
 <!-- 
     If you are updating something that doesn't require
-    a release, you can delete whole Changelog section.
+    a release, you can delete the whole Changelog section.
     (eg. update to docs, tests)
 -->
 

.travis.yml

@@ -32,6 +32,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataNotificationBundle.git
+    - PHPUNIT_VERSION=5.7
 
 matrix:
   fast_finish: true

.travis/install_test.sh

@@ -3,12 +3,6 @@ set -ev
 
 mkdir --parents "${HOME}/bin"
 
-# PHPUnit install
-if [ "${TRAVIS_BRANCH}" = 'master' ]; then
-    PHPUNIT_VERSION=7
-else
-    PHPUNIT_VERSION=5.7
-fi
 wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
 chmod u+x "${HOME}/bin/phpunit"