Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  split test for bug #68557 for windows

Author: weltling

ext/spl/tests/bug68557-win32.phpt

@@ -0,0 +1,44 @@
+--TEST--
+Bug #68557 (SplFileInfo::getPathname() may be broken)
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+    die('skip.. only for Windows');
+}
+?>
+--FILE--
+<?php
+mkdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
+touch(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'a');
+touch(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b');
+
+$d = new DirectoryIterator(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
+
+$d->seek(0);
+var_dump($d->current()->getPathname());
+
+$d->seek(1);
+var_dump($d->current()->getPathname());
+
+$d->seek(0);
+var_dump($d->current()->getPathname());
+
+$d->seek(1);
+var_dump($d->current()->getPathname());
+
+$d->seek(2);
+var_dump($d->current()->getPathname());
+?>
+--CLEAN--
+<?php
+unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'a');
+unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b');
+rmdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp');
+?>
+--EXPECTF--
+string(%d) "%s\tmp\."
+string(%d) "%s\tmp\.."
+string(%d) "%s\tmp\."
+string(%d) "%s\tmp\.."
+string(%d) "%s\tmp\a"
+

ext/spl/tests/bug68557.phpt

@@ -1,5 +1,11 @@
 --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');
@@ -34,4 +40,5 @@ string(%d) "%s/tmp/b"
 string(%d) "%s/tmp/a"
 string(%d) "%s/tmp/b"
 string(%d) "%s/tmp/a"
-string(%d) "%s/tmp/.."
+string(%d) "%s/tmp/.."
+