Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit fde2874c511c · 2017-11-22T09:57:45.000+01:00
* 4.0:
  [Bridge/PhpUnit] Fix blacklist
  Force phpunit-bridge update
  Update github PR template
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | master / 2.7, 2.8, 3.3, or 3.4 <!-- see comment below -->
+| Branch?       | master for features / 2.7 up to 4.0 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
 | BC breaks?    | yes/no
@@ -14,6 +14,5 @@
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-- Please fill in this template according to the PR you're about to submit.
 - Replace this comment by a description of what your PR is solving.
 -->
diff --git a/phpunit b/phpunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/6d344ad9be7566f875488aa14d905449716c06cf
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/3646664aa952fe13e9a612a726cbb38e02249793
 
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
