Merge branch '2.7' into 2.8

* 2.7:
  [VarDumper] fix tests when xdebug is enabled
This commit is contained in:
Nicolas Grekas 2016-12-06 17:04:15 +01:00
commit fb4a583bc8
2 changed files with 8 additions and 0 deletions

View File

@ -145,6 +145,10 @@ EOTXT
*/
public function testGenerator()
{
if (extension_loaded('xdebug')) {
$this->markTestSkipped('xdebug is active');
}
$g = new GeneratorDemo();
$g = $g->baz();
$r = new \ReflectionGenerator($g);

View File

@ -137,6 +137,10 @@ EOTXT;
public function testJsonCast()
{
if (ini_get('xdebug.overload_var_dump') == 2) {
$this->markTestSkipped('xdebug is active');
}
$data = (array) json_decode('{"1":{}}');
$cloner = new VarCloner();