From 806e937f285b0b47c9605a376740afe99421c45b Mon Sep 17 00:00:00 2001 From: Markus Fischer Date: Mon, 10 Jun 2002 07:53:22 +0000 Subject: [PATCH] - Update docs for new constants and correct since when the first parameter can be ommited. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@85235 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/calendar/constants.xml | 51 +++++++++++++++++++- reference/calendar/functions/easter-date.xml | 12 +++-- reference/calendar/functions/easter-days.xml | 20 ++++++-- 3 files changed, 75 insertions(+), 8 deletions(-) diff --git a/reference/calendar/constants.xml b/reference/calendar/constants.xml index 6104a1ab9a..0ea91ad29a 100644 --- a/reference/calendar/constants.xml +++ b/reference/calendar/constants.xml @@ -1,5 +1,5 @@ - +
&reftitle.constants; &extension.constants; @@ -155,6 +155,55 @@ + + + + + + The following constants are available since PHP 4.3.0 : + + + + + CAL_EASTER_DEFAULT + (integer) + + + + + + + + + + CAL_EASTER_ROMAN + (integer) + + + + + + + + + + CAL_EASTER_ALWAYS_GREGORIAN + (integer) + + + + + + + + + + CAL_EASTER_ALWAYS_JULIAN + (integer) + + + + diff --git a/reference/calendar/functions/easter-date.xml b/reference/calendar/functions/easter-date.xml index ddabd0c4af..d16b728385 100644 --- a/reference/calendar/functions/easter-date.xml +++ b/reference/calendar/functions/easter-date.xml @@ -1,5 +1,5 @@ - + @@ -12,12 +12,16 @@ Description inteaster_date - intyear + intyear Returns the UNIX timestamp corresponding to midnight on Easter of - the given year. If no year is specified, the current year is - assumed. + the given year. + + + Since PHP 4.3.0, the year + parameter is optional and defaults to the current year according to the + localtime if ommited. Warning: This function will generate diff --git a/reference/calendar/functions/easter-days.xml b/reference/calendar/functions/easter-days.xml index 8955439b65..17c2d71849 100644 --- a/reference/calendar/functions/easter-days.xml +++ b/reference/calendar/functions/easter-days.xml @@ -1,5 +1,5 @@ - + @@ -13,13 +13,27 @@ Description inteaster_days - intyear + intyear + intmethod Returns the number of days after March 21 on which Easter falls - for a given year. If no year is specified, the current year is + for a given year. If no year is specified, the current year is assumed. + + Since PHP 4.3.0, the year + parameter is optional and defaults to the current year according to the + localtime if ommited. + + + The method parameter was also introduced in + PHP 4.3.0 and allows to calculate easter dates based + on the Gregorian calendar during the years 1582 - 1752 when set to + CAL_EASTER_ROMAN. See the calendar constants for more valid + constants. + This function can be used instead of easter_date to calculate Easter for years