Merge branch '5.2' into 5.3

* 5.2:
  [VarDumper] fix tests
  [Intl] fix bad merge

Author: nicolas-grekas

Tests/Caster/SplCasterTest.php

@@ -50,12 +50,12 @@ public function getCastFileInfoTests()
 %A}
 EOTXT
             ],
-            ['https://example.com/about', <<<'EOTXT'
+            ['http://example.com/about', <<<'EOTXT'
 SplFileInfo {
-%Apath: "https://example.com"
+%Apath: "http://example.com"
   filename: "about"
   basename: "about"
-  pathname: "https://example.com/about"
+  pathname: "http://example.com/about"
   extension: ""
   realPath: false
 %A}