From: Felipe Pena <felipe@php.net>
Date: Thu, 28 Feb 2008 15:28:00 +0000 (+0000)
Subject: Fixed tests
X-Git-Tag: RELEASE_2_0_0a1~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748677148c412eda1eeb9b17cce2dd1308eaef20;p=php

Fixed tests
---

diff --git a/ext/standard/tests/file/get_current_user.phpt b/ext/standard/tests/file/get_current_user.phpt
index f9e2e50b9a..ce45552ad6 100644
--- a/ext/standard/tests/file/get_current_user.phpt
+++ b/ext/standard/tests/file/get_current_user.phpt
@@ -9,12 +9,12 @@ var_dump(get_current_user());
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for get_current_user() in %s on line %d
+Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 string(%d) %s
 Done
 --UEXPECTF--
-Warning: Wrong parameter count for get_current_user() in %s on line %d
+Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 unicode(%d) %s
 Done
diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt
index e75bd6d374..e3ad8ded22 100644
--- a/ext/standard/tests/general_functions/rand.phpt
+++ b/ext/standard/tests/general_functions/rand.phpt
@@ -54,10 +54,10 @@ Warning: mt_srand() expects parameter 1 to be long, array given in %s on line %d
 NULL
 int(%d)
 
-Warning: Wrong parameter count for getrandmax() in %s on line %d
+Warning: getrandmax() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 int(%d)
 
-Warning: Wrong parameter count for mt_getrandmax() in %s on line %d
+Warning: mt_getrandmax() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/math/getrandmax_error.phpt b/ext/standard/tests/math/getrandmax_error.phpt
index 9f244a2a6a..6cc87ff468 100644
--- a/ext/standard/tests/math/getrandmax_error.phpt
+++ b/ext/standard/tests/math/getrandmax_error.phpt
@@ -5,5 +5,5 @@ Test getrandmax() - wrong params test getrandmax()
 var_dump($biggest_int = getrandmax(true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for getrandmax() in %s on line 2
+Warning: getrandmax() expects exactly 0 parameters, 1 given in %s on line 2
 NULL
diff --git a/ext/standard/tests/math/mt_getrandmax_error.phpt b/ext/standard/tests/math/mt_getrandmax_error.phpt
index b30da3a91c..f360d12aec 100644
--- a/ext/standard/tests/math/mt_getrandmax_error.phpt
+++ b/ext/standard/tests/math/mt_getrandmax_error.phpt
@@ -5,5 +5,5 @@ Test mt_getrandmax() - wrong paramas mt_getrandmax()
 var_dump(mt_getrandmax(true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for mt_getrandmax() in %s on line 2
-NULL
\ No newline at end of file
+Warning: mt_getrandmax() expects exactly 0 parameters, 1 given in %s on line 2
+NULL
diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt
index 161dce0e15..080d922c6e 100644
--- a/ext/standard/tests/strings/setlocale_error.phpt
+++ b/ext/standard/tests/strings/setlocale_error.phpt
@@ -61,7 +61,7 @@ bool(false)
 
 -- Testing setlocale() function with invalid category --
 
-Warning: setlocale(): Passing locale category name as string is deprecated. Use the LC_* -constants instead in %s on line %d
+Deprecated: setlocale(): Passing locale category name as string is deprecated. Use the LC_* -constants instead in %s on line %d
 
 Warning: setlocale(): Invalid locale category name TEST, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME in %s on line %d
 bool(false)
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index c121f74e72..fa18133194 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -7,16 +7,14 @@ if (!extension_loaded("reflection")) {
 	die("skip");
 }
 ?>
---INI--
-date.timezone=
 --FILE--
 <?php
 
 $php = getenv('TEST_PHP_EXECUTABLE');
 
-var_dump(`$php -n --re unknown`);
-var_dump(`$php -n --re ""`);
-var_dump(`$php -n --re pcre`);
+var_dump(`"$php" -n --re unknown`);
+var_dump(`"$php" -n --re ""`);
+var_dump(`"$php" -n --re date`);
 
 echo "Done\n";
 ?>
@@ -25,77 +23,339 @@ string(44) "Exception: Extension unknown does not exist
 "
 string(37) "Exception: Extension  does not exist
 "
-string(%d) "Extension [ <persistent> extension #%d pcre version <no_version> ] {
+string(9650) "Extension [ <persistent> extension #20 date version 6.0.0-dev ] {
+
+  - Dependencies {
+    Dependency [ session (Optional) ]
+  }
 
   - INI {
-    Entry [ pcre.backtrack_limit <ALL> ]
-      Current = '%d'
+    Entry [ date.timezone <ALL> ]
+      Current = ''
+    }
+    Entry [ date.default_latitude <ALL> ]
+      Current = '31.7667'
+    }
+    Entry [ date.default_longitude <ALL> ]
+      Current = '35.2333'
     }
-    Entry [ pcre.recursion_limit <ALL> ]
-      Current = '%d'
+    Entry [ date.sunset_zenith <ALL> ]
+      Current = '90.583333'
+    }
+    Entry [ date.sunrise_zenith <ALL> ]
+      Current = '90.583333'
     }
   }
 
-  - Constants [13] {
-    Constant [ integer PREG_PATTERN_ORDER ] { 1 }
-    Constant [ integer PREG_SET_ORDER ] { 2 }
-    Constant [ integer PREG_OFFSET_CAPTURE ] { 256 }
-    Constant [ integer PREG_SPLIT_NO_EMPTY ] { 1 }
-    Constant [ integer PREG_SPLIT_DELIM_CAPTURE ] { 2 }
-    Constant [ integer PREG_SPLIT_OFFSET_CAPTURE ] { 4 }
-    Constant [ integer PREG_GREP_INVERT ] { 1 }
-    Constant [ integer PREG_NO_ERROR ] { 0 }
-    Constant [ integer PREG_INTERNAL_ERROR ] { 1 }
-    Constant [ integer PREG_BACKTRACK_LIMIT_ERROR ] { 2 }
-    Constant [ integer PREG_RECURSION_LIMIT_ERROR ] { 3 }
-    Constant [ integer PREG_BAD_UTF8_ERROR ] { 4 }
-    Constant [ string PCRE_VERSION ] { %s }
+  - Constants [14] {
+    Constant [ string DATE_ATOM ] { Y-m-d\TH:i:sP }
+    Constant [ string DATE_COOKIE ] { l, d-M-y H:i:s T }
+    Constant [ string DATE_ISO8601 ] { Y-m-d\TH:i:sO }
+    Constant [ string DATE_RFC822 ] { D, d M y H:i:s O }
+    Constant [ string DATE_RFC850 ] { l, d-M-y H:i:s T }
+    Constant [ string DATE_RFC1036 ] { D, d M y H:i:s O }
+    Constant [ string DATE_RFC1123 ] { D, d M Y H:i:s O }
+    Constant [ string DATE_RFC2822 ] { D, d M Y H:i:s O }
+    Constant [ string DATE_RFC3339 ] { Y-m-d\TH:i:sP }
+    Constant [ string DATE_RSS ] { D, d M Y H:i:s O }
+    Constant [ string DATE_W3C ] { Y-m-d\TH:i:sP }
+    Constant [ integer SUNFUNCS_RET_TIMESTAMP ] { 0 }
+    Constant [ integer SUNFUNCS_RET_STRING ] { 1 }
+    Constant [ integer SUNFUNCS_RET_DOUBLE ] { 2 }
   }
 
   - Functions {
-    Function [ <internal:pcre> function preg_match ] {
+    Function [ <internal:date> function strtotime ] {
 
-      - Parameters [3] {
-        Parameter #0 [ <required> $param0 ]
-        Parameter #1 [ <required> $param1 ]
-        Parameter #2 [ <required> &$param2 ]
+      - Parameters [2] {
+        Parameter #0 [ <required> $time ]
+        Parameter #1 [ <optional> $now ]
+      }
+    }
+    Function [ <internal:date> function date ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $format ]
+        Parameter #1 [ <optional> $timestamp ]
       }
     }
-    Function [ <internal:pcre> function preg_match_all ] {
+    Function [ <internal:date> function idate ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $format ]
+        Parameter #1 [ <optional> $timestamp ]
+      }
+    }
+    Function [ <internal:date> function gmdate ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $format ]
+        Parameter #1 [ <optional> $timestamp ]
+      }
+    }
+    Function [ <internal:date> function mktime ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <optional> $hour ]
+        Parameter #1 [ <optional> $min ]
+        Parameter #2 [ <optional> $sec ]
+        Parameter #3 [ <optional> $mon ]
+        Parameter #4 [ <optional> $day ]
+        Parameter #5 [ <optional> $year ]
+      }
+    }
+    Function [ <internal:date> function gmmktime ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <optional> $hour ]
+        Parameter #1 [ <optional> $min ]
+        Parameter #2 [ <optional> $sec ]
+        Parameter #3 [ <optional> $mon ]
+        Parameter #4 [ <optional> $day ]
+        Parameter #5 [ <optional> $year ]
+      }
+    }
+    Function [ <internal:date> function checkdate ] {
 
       - Parameters [3] {
-        Parameter #0 [ <required> $param0 ]
-        Parameter #1 [ <required> $param1 ]
-        Parameter #2 [ <required> &$param2 ]
+        Parameter #0 [ <required> $month ]
+        Parameter #1 [ <required> $day ]
+        Parameter #2 [ <required> $year ]
       }
     }
-    Function [ <internal:pcre> function preg_replace ] {
+    Function [ <internal:date> function strftime ] {
 
-      - Parameters [5] {
-        Parameter #0 [ <required> $param0 ]
-        Parameter #1 [ <required> $param1 ]
-        Parameter #2 [ <required> $param2 ]
-        Parameter #3 [ <required> $param3 ]
-        Parameter #4 [ <required> &$param4 ]
+      - Parameters [2] {
+        Parameter #0 [ <required> $format ]
+        Parameter #1 [ <optional> $timestamp ]
       }
     }
-    Function [ <internal:pcre> function preg_replace_callback ] {
+    Function [ <internal:date> function gmstrftime ] {
 
-      - Parameters [5] {
-        Parameter #0 [ <required> $param0 ]
-        Parameter #1 [ <required> $param1 ]
-        Parameter #2 [ <required> $param2 ]
-        Parameter #3 [ <required> $param3 ]
-        Parameter #4 [ <required> &$param4 ]
+      - Parameters [2] {
+        Parameter #0 [ <required> $format ]
+        Parameter #1 [ <optional> $timestamp ]
       }
     }
-    Function [ <internal:pcre> function preg_split ] {
+    Function [ <internal:date> function time ] {
+
+      - Parameters [0] {
+      }
     }
-    Function [ <internal:pcre> function preg_quote ] {
+    Function [ <internal:date> function localtime ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <optional> $timestamp ]
+        Parameter #1 [ <optional> $associative_array ]
+      }
     }
-    Function [ <internal:pcre> function preg_grep ] {
+    Function [ <internal:date> function getdate ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <optional> $timestamp ]
+      }
+    }
+    Function [ <internal:date> function date_create ] {
+    }
+    Function [ <internal:date> function date_create_from_format ] {
+    }
+    Function [ <internal:date> function date_parse ] {
+    }
+    Function [ <internal:date> function date_parse_from_format ] {
+    }
+    Function [ <internal:date> function date_get_last_errors ] {
+    }
+    Function [ <internal:date> function date_format ] {
+    }
+    Function [ <internal:date> function date_format_locale ] {
+    }
+    Function [ <internal:date> function date_modify ] {
+    }
+    Function [ <internal:date> function date_timezone_get ] {
+    }
+    Function [ <internal:date> function date_timezone_set ] {
+    }
+    Function [ <internal:date> function date_offset_get ] {
+    }
+    Function [ <internal:date> function date_time_set ] {
+    }
+    Function [ <internal:date> function date_date_set ] {
+    }
+    Function [ <internal:date> function date_isodate_set ] {
+    }
+    Function [ <internal:date> function date_timestamp_set ] {
+    }
+    Function [ <internal:date> function date_timestamp_get ] {
+    }
+    Function [ <internal:date> function timezone_open ] {
+    }
+    Function [ <internal:date> function timezone_name_get ] {
+    }
+    Function [ <internal:date> function timezone_name_from_abbr ] {
+    }
+    Function [ <internal:date> function timezone_offset_get ] {
+    }
+    Function [ <internal:date> function timezone_transitions_get ] {
+    }
+    Function [ <internal:date> function timezone_identifiers_list ] {
+    }
+    Function [ <internal:date> function timezone_abbreviations_list ] {
+    }
+    Function [ <internal:date> function date_default_timezone_set ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> $timezone_identifier ]
+      }
     }
-    Function [ <internal:pcre> function preg_last_error ] {
+    Function [ <internal:date> function date_default_timezone_get ] {
+
+      - Parameters [0] {
+      }
+    }
+    Function [ <internal:date> function date_sunrise ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> $time ]
+        Parameter #1 [ <optional> $format ]
+        Parameter #2 [ <optional> $latitude ]
+        Parameter #3 [ <optional> $longitude ]
+        Parameter #4 [ <optional> $zenith ]
+        Parameter #5 [ <optional> $gmt_offset ]
+      }
+    }
+    Function [ <internal:date> function date_sunset ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> $time ]
+        Parameter #1 [ <optional> $format ]
+        Parameter #2 [ <optional> $latitude ]
+        Parameter #3 [ <optional> $longitude ]
+        Parameter #4 [ <optional> $zenith ]
+        Parameter #5 [ <optional> $gmt_offset ]
+      }
+    }
+    Function [ <internal:date> function date_sun_info ] {
+
+      - Parameters [3] {
+        Parameter #0 [ <required> $time ]
+        Parameter #1 [ <required> $latitude ]
+        Parameter #2 [ <required> $longitude ]
+      }
+    }
+  }
+
+  - Classes [2] {
+    Class [ <internal:date> class DateTime ] {
+
+      - Constants [11] {
+        Constant [ string ATOM ] { Y-m-d\TH:i:sP }
+        Constant [ string COOKIE ] { l, d-M-y H:i:s T }
+        Constant [ string ISO8601 ] { Y-m-d\TH:i:sO }
+        Constant [ string RFC822 ] { D, d M y H:i:s O }
+        Constant [ string RFC850 ] { l, d-M-y H:i:s T }
+        Constant [ string RFC1036 ] { D, d M y H:i:s O }
+        Constant [ string RFC1123 ] { D, d M Y H:i:s O }
+        Constant [ string RFC2822 ] { D, d M Y H:i:s O }
+        Constant [ string RFC3339 ] { Y-m-d\TH:i:sP }
+        Constant [ string RSS ] { D, d M Y H:i:s O }
+        Constant [ string W3C ] { Y-m-d\TH:i:sP }
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [2] {
+        Method [ <internal:date> static public method createFromFormat ] {
+        }
+
+        Method [ <internal:date> static public method getLastErrors ] {
+        }
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [11] {
+        Method [ <internal:date, ctor> public method __construct ] {
+        }
+
+        Method [ <internal:date> public method format ] {
+        }
+
+        Method [ <internal:date> public method modify ] {
+        }
+
+        Method [ <internal:date> public method getTimezone ] {
+        }
+
+        Method [ <internal:date> public method setTimezone ] {
+        }
+
+        Method [ <internal:date> public method getOffset ] {
+        }
+
+        Method [ <internal:date> public method setTime ] {
+        }
+
+        Method [ <internal:date> public method setDate ] {
+        }
+
+        Method [ <internal:date> public method setISODate ] {
+        }
+
+        Method [ <internal:date> public method setTimestamp ] {
+        }
+
+        Method [ <internal:date> public method getTimestamp ] {
+        }
+      }
+    }
+
+    Class [ <internal:date> class DateTimeZone ] {
+
+      - Constants [13] {
+        Constant [ integer AFRICA ] { 1 }
+        Constant [ integer AMERICA ] { 2 }
+        Constant [ integer ANTARCTICA ] { 4 }
+        Constant [ integer ARCTIC ] { 8 }
+        Constant [ integer ASIA ] { 16 }
+        Constant [ integer ATLANTIC ] { 32 }
+        Constant [ integer AUSTRALIA ] { 64 }
+        Constant [ integer EUROPE ] { 128 }
+        Constant [ integer INDIAN ] { 256 }
+        Constant [ integer PACIFIC ] { 512 }
+        Constant [ integer UTC ] { 1024 }
+        Constant [ integer ALL ] { 2047 }
+        Constant [ integer ALL_WITH_BC ] { 4095 }
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [2] {
+        Method [ <internal:date> static public method listAbbreviations ] {
+        }
+
+        Method [ <internal:date> static public method listIdentifiers ] {
+        }
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [4] {
+        Method [ <internal:date, ctor> public method __construct ] {
+        }
+
+        Method [ <internal:date> public method getName ] {
+        }
+
+        Method [ <internal:date> public method getOffset ] {
+        }
+
+        Method [ <internal:date> public method getTransitions ] {
+        }
+      }
     }
   }
 }