Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 17c6e705cb1b · 2019-09-02T16:41:27.000+02:00
* 3.4:
  Cleanup tests
  [Finder] Prevent unintentional file locks in Windows
  [DomCrawler] Fix FileFormField PHPDoc
  Fix #33395 PHP 5.3 compatibility
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
@@ -322,7 +322,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 (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError';

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