Merge branch '2.7' into 2.8

* 2.7:
  [VarDumper] fix tests when xdebug is enabled

Author: nicolas-grekas

src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php

@@ -145,6 +145,10 @@ class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
      */
     public function testGenerator()
     {
+        if (extension_loaded('xdebug')) {
+            $this->markTestSkipped('xdebug is active');
+        }
+
         $g = new GeneratorDemo();
         $g = $g->baz();
         $r = new \ReflectionGenerator($g);

src/Symfony/Component/VarDumper/Tests/VarClonerTest.php

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