Fix FileSystemIterator without SKIP_DOTS

There were two separate bugs here:
 * The get_iterator implementation did not match the Iterator
   implementation. In particular, get_iterator did not respect
   SKIP_DOTS.
 * The constructor did not honor an explicitly omitted SKIP_DOTS
   flag. It could still be unset through setFlags() though.

Author: nikic

ext/spl/spl_directory.c

@@ -706,22 +706,16 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
 	spl_filesystem_object *intern;
 	zend_string *path;
 	int parsed;
-	zend_long flags;
+	zend_long flags = (ctor_flags & ~DIT_CTOR_FLAGS);
 	zend_error_handling error_handling;
 
 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) {
-		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
+		flags |= SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
 		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &path, &flags);
 	} else {
-		flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
+		flags |= SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
 		parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "P", &path);
 	}
-	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) {
-		flags |= SPL_FILE_DIR_SKIPDOTS;
-	}
-	if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_UNIXPATHS)) {
-		flags |= SPL_FILE_DIR_UNIXPATHS;
-	}
 	if (parsed == FAILURE) {
 		RETURN_THROWS();
 	}
@@ -1763,11 +1757,12 @@ static void spl_filesystem_tree_it_move_forward(zend_object_iterator *iter)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
 	spl_filesystem_object   *object   = spl_filesystem_iterator_to_object(iterator);
+	bool skip_dots = SPL_HAS_FLAG(object->flags, SPL_FILE_DIR_SKIPDOTS);
 
 	object->u.dir.index++;
 	do {
 		spl_filesystem_dir_read(object);
-	} while (spl_filesystem_is_dot(object->u.dir.entry.d_name));
+	} while (skip_dots && spl_filesystem_is_dot(object->u.dir.entry.d_name));
 	if (object->file_name) {
 		zend_string_release(object->file_name);
 		object->file_name = NULL;
@@ -1784,14 +1779,15 @@ static void spl_filesystem_tree_it_rewind(zend_object_iterator *iter)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
 	spl_filesystem_object   *object   = spl_filesystem_iterator_to_object(iterator);
+	bool skip_dots = SPL_HAS_FLAG(object->flags, SPL_FILE_DIR_SKIPDOTS);
 
 	object->u.dir.index = 0;
 	if (object->u.dir.dirp) {
 		php_stream_rewinddir(object->u.dir.dirp);
 	}
 	do {
 		spl_filesystem_dir_read(object);
-	} while (spl_filesystem_is_dot(object->u.dir.entry.d_name));
+	} while (skip_dots && spl_filesystem_is_dot(object->u.dir.entry.d_name));
 	if (!Z_ISUNDEF(iterator->current)) {
 		zval_ptr_dtor(&iterator->current);
 		ZVAL_UNDEF(&iterator->current);

ext/spl/tests/filesystemiterator_no_skip_dots.phpt

@@ -0,0 +1,33 @@
+--TEST--
+FileSystemIterator without SKIP_DOTS
+--FILE--
+<?php
+
+$dir = __DIR__ . '/filesystemiterator_no_skip_dots';
+mkdir($dir);
+touch($dir . '/file');
+
+$it = new FileSystemIterator($dir, 0);
+$files = [];
+foreach ($it as $f) {
+    $files[] = $f->getFileName();
+}
+sort($files);
+var_dump($files);
+
+?>
+--CLEAN--
+<?php
+$dir = __DIR__ . '/filesystemiterator_no_skip_dots';
+unlink($dir . '/file');
+rmdir($dir);
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  string(1) "."
+  [1]=>
+  string(2) ".."
+  [2]=>
+  string(4) "file"
+}