Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test fails for bug68557

Author: Julien Pauli

ext/spl/tests/bug68557-win32.phpt

@@ -1,11 +1,5 @@
 --TEST--
 Bug #68557 (SplFileInfo::getPathname() may be broken)
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. Not for Windows');
-}
-?>
 --FILE--
 <?php
 mkdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
@@ -15,19 +9,25 @@ touch(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b');
 $d = new DirectoryIterator(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
 
 $d->seek(0);
-var_dump($d->current()->getPathname());
+$path0 = $d->current()->getPathname();
 
 $d->seek(1);
-var_dump($d->current()->getPathname());
+$path1 = $d->current()->getPathname();
+
+$d->seek(2);
+$path2 = $d->current()->getPathname();
 
 $d->seek(0);
-var_dump($d->current()->getPathname());
+var_dump($path0 === $d->current()->getPathname());
 
 $d->seek(1);
-var_dump($d->current()->getPathname());
+var_dump($path1 === $d->current()->getPathname());
 
 $d->seek(2);
-var_dump($d->current()->getPathname());
+var_dump($path2 === $d->current()->getPathname());
+
+$d->seek(0);
+var_dump($path0 === $d->current()->getPathname());
 ?>
 --CLEAN--
 <?php
@@ -36,9 +36,7 @@ unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b');
 rmdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
 ?>
 --EXPECTF--
-string(%d) "%s/tmp/b"
-string(%d) "%s/tmp/a"
-string(%d) "%s/tmp/b"
-string(%d) "%s/tmp/a"
-string(%d) "%s/tmp/.."
-
+bool(true)
+bool(true)
+bool(true)
+bool(true)