helly Wed Feb 13 12:01:16 2008 UTC
Added files:
/php-src/ext/spl/tests dit_002.phpt
Modified files:
/php-src/ext/spl spl.php spl_directory.c spl_directory.h
Log:
- Make this behave like in <= 5.2.5 and test for it
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl.php?r1=1.83&r2=1.84&diff_format=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.83 php-src/ext/spl/spl.php:1.84
--- php-src/ext/spl/spl.php:1.83 Mon Feb 4 21:37:43 2008
+++ php-src/ext/spl/spl.php Wed Feb 13 12:01:16 2008
@@ -1030,8 +1030,8 @@
*/
class RecursiveDirectoryIterator extends DirectoryIterator implements
RecursiveIterator
{
- const CURRENT_AS_SELF 0x00000000; /* make
RecursiveDirectoryTree::current() return getSelf() */
- const CURRENT_AS_FILEINFO 0x00000010; /* make
RecursiveDirectoryTree::current() return SplFileInfo */
+ const CURRENT_AS_FILEINFO 0x00000000; /* make
RecursiveDirectoryTree::current() return SplFileInfo */
+ const CURRENT_AS_SELF 0x00000010; /* make
RecursiveDirectoryTree::current() return getSelf() */
const CURRENT_AS_PATHNAME 0x00000020; /* make
RecursiveDirectoryTree::current() return getPathname() */
const KEY_AS_PATHNAME 0x00000000; /* make
RecursiveDirectoryTree::key() return getPathname() */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.148&r2=1.149&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.148
php-src/ext/spl/spl_directory.c:1.149
--- php-src/ext/spl/spl_directory.c:1.148 Mon Feb 4 19:39:07 2008
+++ php-src/ext/spl/spl_directory.c Wed Feb 13 12:01:16 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.148 2008/02/04 19:39:07 helly Exp $ */
+/* $Id: spl_directory.c,v 1.149 2008/02/13 12:01:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -602,7 +602,7 @@
php_set_error_handling(EH_THROW, spl_ce_RuntimeException TSRMLS_CC);
if (ctor_flags & DIT_CTOR_FLAGS) {
- flags = 0;
+ flags =
SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO;
parsed = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"t|l", &path, &len, &path_type, &flags);
} else {
flags =
SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
@@ -1214,6 +1214,28 @@
}
/* }}} */
+/* {{{ proto int FilesystemIterator::getFlags() U
+ Get handling flags */
+SPL_METHOD(FilesystemIterator, getFlags)
+{
+ spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ RETURN_LONG(intern->flags);
+} /* }}} */
+
+/* {{{ proto void FilesystemIterator::setFlags(long $flags) U
+ Set handling flags */
+SPL_METHOD(FilesystemIterator, setFlags)
+{
+ spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+ long flags;
+
+ zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags);
+
+ intern->flags &=
~(SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK);
+ intern->flags |=
((SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK) & flags);
+} /* }}} */
+
/* {{{ proto bool RecursiveDirectoryIterator::hasChildren([bool $allow_links =
false]) U
Returns whether current entry is a directory and not '.' or '..' */
SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
@@ -1703,12 +1725,19 @@
ZEND_ARG_INFO(0, allow_links)
ZEND_END_ARG_INFO()
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_setFlags, 0, 0, 0)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
static const zend_function_entry spl_FilesystemIterator_functions[] = {
SPL_ME(FilesystemIterator, __construct, arginfo_r_dir___construct,
ZEND_ACC_PUBLIC)
SPL_ME(FilesystemIterator, rewind, NULL, ZEND_ACC_PUBLIC)
SPL_ME(FilesystemIterator, next, NULL, ZEND_ACC_PUBLIC)
SPL_ME(FilesystemIterator, key, NULL, ZEND_ACC_PUBLIC)
SPL_ME(FilesystemIterator, current, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(FilesystemIterator, getFlags, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(FilesystemIterator, setFlags, arginfo_r_dir_setFlags,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.41&r2=1.42&diff_format=u
Index: php-src/ext/spl/spl_directory.h
diff -u php-src/ext/spl/spl_directory.h:1.41
php-src/ext/spl/spl_directory.h:1.42
--- php-src/ext/spl/spl_directory.h:1.41 Mon Feb 4 21:37:43 2008
+++ php-src/ext/spl/spl_directory.h Wed Feb 13 12:01:16 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.h,v 1.41 2008/02/04 21:37:43 helly Exp $ */
+/* $Id: spl_directory.h,v 1.42 2008/02/13 12:01:16 helly Exp $ */
#ifndef SPL_DIRECTORY_H
#define SPL_DIRECTORY_H
@@ -118,8 +118,8 @@
#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_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_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_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)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/dit_002.phpt
+++ php-src/ext/spl/tests/dit_002.phpt
--TEST--
SPL: DirectoryIterator defaults
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
$classes = array(
'DirectoryIterator' => 0,
'FilesystemIterator' => 1,
'RecursiveDirectoryIterator' => 1,
'GlobIterator' => 1,
);
foreach ($classes as $class => $flags) {
echo "===$class===\n";
$ref = new ReflectionClass($class);
$obj = $ref->newInstance('glob://*');
echo get_class($obj->current()) . "\n";
if ($flags)
{
var_dump($obj->getFlags());
$flags = array(
FilesystemIterator::CURRENT_AS_FILEINFO => 0,
FilesystemIterator::CURRENT_AS_SELF => 0,
FilesystemIterator::CURRENT_AS_PATHNAME => 1,
);
foreach($flags as $flag => $isstring) {
$obj->setFlags($flag);
$obj->rewind();
var_dump($obj->getFlags());
if ($isstring) {
$val = $obj->current();
if (is_string($val) || is_unicode($val)) {
var_dump(true);
} else {
var_dump($val);
}
} else {
echo get_class($obj->current()) . "\n";
}
}
}
}
?>
===DONE===
--EXPECT--
===DirectoryIterator===
DirectoryIterator
===FilesystemIterator===
SplFileInfo
int(0)
int(0)
SplFileInfo
int(16)
FilesystemIterator
int(32)
bool(true)
===RecursiveDirectoryIterator===
SplFileInfo
int(0)
int(0)
SplFileInfo
int(16)
RecursiveDirectoryIterator
int(32)
bool(true)
===GlobIterator===
SplFileInfo
int(0)
int(0)
SplFileInfo
int(16)
GlobIterator
int(32)
bool(true)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
