Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 37118bdcd62a · 2019-06-26T12:03:39.000+02:00
* 3.4:
  Bump phpunit-bridge
diff --git a/composer.json b/composer.json
@@ -101,7 +101,7 @@
         "ocramius/proxy-manager": "^2.1",
         "predis/predis": "~1.1",
         "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
-        "symfony/phpunit-bridge": "~3.4|~4.0",
+        "symfony/phpunit-bridge": "~3.4|~4.0|~5.0",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },
diff --git a/phpunit b/phpunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/32c5fa570117630dad45c21528b93d26bad02bc1
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/ded5bdfc4267e9e7c6e7f39c6bde66d23fc7b32f
 
 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: 2018-11-20 15:30 UTC
+// Cache-Id-Version: 2019-06-26 11:00 UTC
 
 error_reporting(-1);
 
