Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 50d2c05459de · 2017-05-21T11:46:38.000+02:00
* 2.7:
  update phpunit-bridge cache-id
  respect optional error handler arguments
  [Intl] Fix bin/common.php PHP7 compatibility
diff --git a/Resources/bin/common.php b/Resources/bin/common.php
@@ -68,7 +68,7 @@ function get_icu_version_from_genrb($genrb)
     return $matches[1];
 }
 
-set_exception_handler(function (\Exception $exception) {
+set_exception_handler(function (\Throwable $exception) {
     echo "\n";
 
     $cause = $exception;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function get_icu_version_from_genrb($genrb)`
`68`	`68`	`return $matches[1];`
`69`	`69`	`}`
`70`	`70`
`71`		`-set_exception_handler(function (\Exception $exception) {`
	`71`	`+set_exception_handler(function (\Throwable $exception) {`
`72`	`72`	`echo "\n";`
`73`	`73`
`74`	`74`	`$cause = $exception;`