Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit dfe140a1a912 · 2019-09-02T16:51:55.000+02:00
* 4.3:
  [4.3] Cleanup tests
  Cleanup tests
  [Finder] Prevent unintentional file locks in Windows
  [FrameworkBundle] Fix about command not showing .env vars
  [DomCrawler] Fix FileFormField PHPDoc
  [Mailer] Remove the default dispatcher in AbstractTransport
  Fix #33395 PHP 5.3 compatibility
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
@@ -319,7 +319,7 @@ private function displayDeprecations($groups, $configuration)
     private static function getPhpUnitErrorHandler()
     {
         if (!isset(self::$isAtLeastPhpUnit83)) {
-            self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
+            self::$isAtLeastPhpUnit83 = class_exists('PHPUnit\Util\ErrorHandler') && method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
         }
         if (!self::$isAtLeastPhpUnit83) {
             return 'PHPUnit\Util\ErrorHandler::handleError';

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ private function displayDeprecations($groups, $configuration)`
`319`	`319`	`private static function getPhpUnitErrorHandler()`
`320`	`320`	`{`
`321`	`321`	`if (!isset(self::$isAtLeastPhpUnit83)) {`
`322`		`- self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');`
	`322`	`+ self::$isAtLeastPhpUnit83 = class_exists('PHPUnit\Util\ErrorHandler') && method_exists('PHPUnit\Util\ErrorHandler', '__invoke');`
`323`	`323`	`}`
`324`	`324`	`if (!self::$isAtLeastPhpUnit83) {`
`325`	`325`	`return 'PHPUnit\Util\ErrorHandler::handleError';`