Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 5b51491c189e · 2017-12-12T09:25:59.000+01:00
* 2.8:
  fix merge
diff --git a/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt b/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -33,7 +33,7 @@ array(1) {
   [0]=>
   string(37) "Error and exception handlers do match"
 }
-object(Symfony\Component\Debug\Exception\FatalErrorException)#4 (8) {
+object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (%d) {
   ["message":protected]=>
   string(199) "Error: Class Symfony\Component\Debug\Broken contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (Serializable::serialize, Serializable::unserialize)"
 %a

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ array(1) {`
`33`	`33`	`[0]=>`
`34`	`34`	`string(37) "Error and exception handlers do match"`
`35`	`35`	`}`
`36`		`-object(Symfony\Component\Debug\Exception\FatalErrorException)#4 (8) {`
	`36`	`+object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (%d) {`
`37`	`37`	`["message":protected]=>`
`38`	`38`	`string(199) "Error: Class Symfony\Component\Debug\Broken contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (Serializable::serialize, Serializable::unserialize)"`
`39`	`39`	`%a`