- Really last flag change (got confused with code)

diff --git a/ext/spl/examples/tree.php b/ext/spl/examples/tree.php
index d0c201b700663b7142113ca7f8b659e5cad9ad5d..c86daddbad5b72640a4525c73f0daba958bb1b00 100755 (executable)
--- a/ext/spl/examples/tree.php
+++ b/ext/spl/examples/tree.php
@@ -37,4 +37,4 @@ foreach(new DirectoryGraphIterator($argv[1]) as $file)
        echo $file . "\n";
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/ext/spl/spl.php b/ext/spl/spl.php
index 287f14aefaa348ac0a4a093ce08d31c1dcdd889f..8ffaa7f3b9fe6e5541eb850dda87343def23b48e 100755 (executable)
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -1030,8 +1030,8 @@ class DirectoryIterator extends SplFileInfo implements Iterator
  */
 class RecursiveDirectoryIterator extends DirectoryIterator implements RecursiveIterator
 {
-       const CURRENT_AS_FILEINFO   0x00000000; /* make RecursiveDirectoryTree::current() return SplFileInfo */
-       const CURRENT_AS_SELF       0x00000010; /* make RecursiveDirectoryTree::current() return getSelf() */
+       const CURRENT_AS_SELF       0x00000000; /* make RecursiveDirectoryTree::current() return getSelf() */
+       const CURRENT_AS_FILEINFO   0x00000010; /* make RecursiveDirectoryTree::current() return SplFileInfo */
        const CURRENT_AS_PATHNAME   0x00000020; /* make RecursiveDirectoryTree::current() return getPathname() */
 
        const KEY_AS_PATHNAME       0x00000000; /* make RecursiveDirectoryTree::key() return getPathname() */

diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h
index 2d3d1a674ec3f85ecbc04a1a5427e8423f54d3cf..8a171e1695434e7eb2d426cfb10bd1de4a08eb9f 100755 (executable)
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
@@ -118,8 +118,8 @@ static inline spl_filesystem_object* spl_filesystem_iterator_to_object(spl_files
 #define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000006 /* skip empty lines */
 #define SPL_FILE_OBJECT_READ_CSV           0x00000008 /* read via fgetcsv */
 
-#define SPL_FILE_DIR_CURRENT_AS_FILEINFO   0x00000000 /* make RecursiveDirectoryTree::current() return SplFileInfo */
-#define SPL_FILE_DIR_CURRENT_AS_SELF       0x00000010 /* make RecursiveDirectoryTree::current() return getSelf() */
+#define SPL_FILE_DIR_CURRENT_AS_SELF       0x00000000 /* make RecursiveDirectoryTree::current() return getSelf() */
+#define SPL_FILE_DIR_CURRENT_AS_FILEINFO   0x00000010 /* make RecursiveDirectoryTree::current() return SplFileInfo */
 #define SPL_FILE_DIR_CURRENT_AS_PATHNAME   0x00000020 /* make RecursiveDirectoryTree::current() return getPathname() */
 #define SPL_FILE_DIR_CURRENT_MODE_MASK     0x000000F0 /* mask RecursiveDirectoryTree::current() */
 #define SPL_FILE_DIR_CURRENT(intern,mode)  ((intern->flags&SPL_FILE_DIR_CURRENT_MODE_MASK)==mode)