Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit ed8c7311771c · 2017-10-25T11:57:07.000+02:00
* 3.3:
  Fix phpunit bridge
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -254,8 +254,10 @@ public static function collectDeprecations($outputFile)
                 if ($previousErrorHandler) {
                     return $previousErrorHandler($type, $msg, $file, $line, $context);
                 }
+                static $autoload = true;
 
-                $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
+                $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', $autoload) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
+                $autoload = false;
 
                 return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,10 @@ public static function collectDeprecations($outputFile)`
`254`	`254`	`if ($previousErrorHandler) {`
`255`	`255`	`return $previousErrorHandler($type, $msg, $file, $line, $context);`
`256`	`256`	`}`
	`257`	`+ static $autoload = true;`
`257`	`258`
`258`		`- $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';`
	`259`	`+ $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', $autoload) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';`
	`260`	`+ $autoload = false;`
`259`	`261`
`260`	`262`	`return $ErrorHandler::handleError($type, $msg, $file, $line, $context);`
`261`	`263`	`}`