[Debug] fix ErrorHandlerTest when context is not an array
Merge branch '2.3' into 2.4

* 2.3:
  [Debug] fix ErrorHandlerTest when context is not an array

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
Merge branch '2.4'

* 2.4:
  [Debug] fix ErrorHandlerTest when context is not an array