Merge branch '5.4' into 6.3

* 5.4:
  Make tests green again

Author: nicolas-grekas

Tests/Dumper/CliDumperTest.php

@@ -460,6 +460,10 @@ public function testDumpArrayWithColor($value, $flags, $expectedOut)
 
     public function testCollapse()
     {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot be run on Windows.');
+        }
+
         $stub = new Stub();
         $stub->type = Stub::TYPE_OBJECT;
         $stub->class = 'stdClass';