diff options
| author | John Coggeshall <john@php.net> | 2002-11-13 13:31:33 +0000 |
|---|---|---|
| committer | John Coggeshall <john@php.net> | 2002-11-13 13:31:33 +0000 |
| commit | 253cecd43aad193622daa237acf2bb173d99d68c (patch) | |
| tree | 144b03231a6433cb2093fb3852dfb9f1e9632324 | |
| parent | ae51b7f4db379c07f5ef82cb6409f9fe233a70bb (diff) | |
| download | php-git-253cecd43aad193622daa237acf2bb173d99d68c.tar.gz | |
Added GLOB_ONLYDIR and GLOB_BRACE for compatiable systems for the glob()
function.
Modified the layout and some minor logic in the experimental webHarness()
test class
Added Whitespace accidently to array.c :)
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | ext/standard/dir.c | 6 | ||||
| -rw-r--r-- | run-tests2.php | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4db2871f79..e0906fc9e9 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3250,7 +3250,7 @@ PHP_FUNCTION(array_filter) } if (Z_TYPE_PP(input) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument shouldbe an array"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should be an array"); return; } diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 4512d69ddc..0ef2cf6348 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -133,6 +133,12 @@ PHP_MINIT_FUNCTION(dir) REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_CS|CONST_PERSISTENT); #ifdef HAVE_GLOB +#ifdef GLOB_BRACE + REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef GLOB_ONLYDIR + REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_CS | CONST_PERSISTENT); +#endif #ifdef GLOB_MARK REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS | CONST_PERSISTENT); #endif diff --git a/run-tests2.php b/run-tests2.php index 2ca32ace2b..073e3b0f50 100644 --- a/run-tests2.php +++ b/run-tests2.php @@ -18,7 +18,7 @@ | Marcus Boerger <helly@php.net> | | Derick Rethans <derick@php.net> | | Sander Roobol <sander@php.net> | - | John Coggeshall <john@php.net | + | John Coggeshall <john@php.net> | | (based on version by: Stig Bakken <ssb@fast.no>) | | (based on the PHP 3 test framework by Rasmus Lerdorf) | +----------------------------------------------------------------------+ |