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 :)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4db2871f79d701bd6db9d101d027982e4a910e4c..e0906fc9e9a5dfa1b9c1bd4edf09391b07c1a047 100644 (file)
--- 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 4512d69ddc97b2a1742bcb38073cee7af194fb17..0ef2cf6348dabee7addfbb37715d1c9c3b2ef199 100644 (file)
--- 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 2ca32ace2b6da9b4af2352cc3c165bf8189ca552..073e3b0f50e2a2c516c212e1f96b4359140ec7f8 100644 (file)
--- 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)                |
    +----------------------------------------------------------------------+