Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit e30800df2cc4 · 2019-07-04T19:06:45.000+02:00
* 3.4:
  bump phpunit-bridge cache ids
diff --git a/phpunit b/phpunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/ded5bdfc4267e9e7c6e7f39c6bde66d23fc7b32f
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/da3d101c8db7e7612069406c4ca6b1986b6f4942
 
 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";
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -11,7 +11,7 @@
  */
 
 // Please update when phpunit needs to be reinstalled with fresh deps:
-// Cache-Id-Version: 2019-06-26 11:00 UTC
+// Cache-Id-Version: 2019-07-04 18:00 UTC
 
 error_reporting(-1);
 
