From 2479b98e82e96aa310e54bedb846951e34a9208b Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 17 May 2013 18:17:21 +0000 Subject: [PATCH] Don't inherit from DateTimeInterface git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330270 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/datetime/datetime.xml | 3 +-- reference/datetime/datetimeimmutable.xml | 4 +--- reference/datetime/datetimeinterface.xml | 2 +- reference/datetime/datetimeinterface/diff.xml | 12 ++++++++++++ reference/datetime/datetimeinterface/format.xml | 10 ++++++++++ reference/datetime/datetimeinterface/getoffset.xml | 10 ++++++++++ .../datetime/datetimeinterface/gettimestamp.xml | 10 ++++++++++ reference/datetime/datetimeinterface/gettimezone.xml | 10 ++++++++++ reference/datetime/datetimeinterface/wakeup.xml | 12 +++++++++++- 9 files changed, 66 insertions(+), 7 deletions(-) diff --git a/reference/datetime/datetime.xml b/reference/datetime/datetime.xml index e64b1dd210..2ae8676234 100644 --- a/reference/datetime/datetime.xml +++ b/reference/datetime/datetime.xml @@ -115,8 +115,7 @@ - &InheritedMethods; - + diff --git a/reference/datetime/datetimeimmutable.xml b/reference/datetime/datetimeimmutable.xml index d774d9a7e6..064d7e3b5d 100644 --- a/reference/datetime/datetimeimmutable.xml +++ b/reference/datetime/datetimeimmutable.xml @@ -40,9 +40,7 @@ &Methods; - - &InheritedMethods; - + diff --git a/reference/datetime/datetimeinterface.xml b/reference/datetime/datetimeinterface.xml index bffd1ea8ff..61b30d7c0f 100644 --- a/reference/datetime/datetimeinterface.xml +++ b/reference/datetime/datetimeinterface.xml @@ -33,7 +33,7 @@ &Methods; - + diff --git a/reference/datetime/datetimeinterface/diff.xml b/reference/datetime/datetimeinterface/diff.xml index 6d9dc9475c..a74a6c69db 100644 --- a/reference/datetime/datetimeinterface/diff.xml +++ b/reference/datetime/datetimeinterface/diff.xml @@ -3,6 +3,8 @@ + DateTime::diff + DateTimeImmutable::diff DateTimeInterface::diff date_diff Returns the difference between two DateTime objects @@ -12,6 +14,16 @@ &reftitle.description; &style.oop; + public DateIntervalDateTime::diff + DateTimeInterfacedatetime2 + boolabsolutefalse + + + public DateIntervalDateTimeImmutable::diff + DateTimeInterfacedatetime2 + boolabsolutefalse + + public DateIntervalDateTimeInterface::diff DateTimeInterfacedatetime2 boolabsolutefalse diff --git a/reference/datetime/datetimeinterface/format.xml b/reference/datetime/datetimeinterface/format.xml index d14210b3c5..10a70b1a17 100644 --- a/reference/datetime/datetimeinterface/format.xml +++ b/reference/datetime/datetimeinterface/format.xml @@ -3,6 +3,8 @@ + DateTime::format + DateTimeImmutable::format DateTimeInterface::format date_format Returns date formatted according to given format @@ -12,6 +14,14 @@ &reftitle.description; &style.oop; + public stringDateTime::format + stringformat + + + public stringDateTimeImmutable::format + stringformat + + public stringDateTimeInterface::format stringformat diff --git a/reference/datetime/datetimeinterface/getoffset.xml b/reference/datetime/datetimeinterface/getoffset.xml index a3457d45f3..9feb070353 100644 --- a/reference/datetime/datetimeinterface/getoffset.xml +++ b/reference/datetime/datetimeinterface/getoffset.xml @@ -3,6 +3,8 @@ + DateTime::getOffset + DateTimeImmutable::getOffset DateTimeInterface::getOffset date_offset_get Returns the timezone offset @@ -12,6 +14,14 @@ &reftitle.description; &style.oop; + public intDateTime::getOffset + + + + public intDateTimeImmutable::getOffset + + + public intDateTimeInterface::getOffset diff --git a/reference/datetime/datetimeinterface/gettimestamp.xml b/reference/datetime/datetimeinterface/gettimestamp.xml index 3eed13d69d..0cb66ec40a 100644 --- a/reference/datetime/datetimeinterface/gettimestamp.xml +++ b/reference/datetime/datetimeinterface/gettimestamp.xml @@ -3,6 +3,8 @@ + DateTime::getTimestamp + DateTimeImmutable::getTimestamp DateTimeInterface::getTimestamp date_timestamp_get Gets the Unix timestamp @@ -12,6 +14,14 @@ &reftitle.description; &style.oop; + public intDateTime::getTimestamp + + + + public intDateTimeImmutable::getTimestamp + + + public intDateTimeInterface::getTimestamp diff --git a/reference/datetime/datetimeinterface/gettimezone.xml b/reference/datetime/datetimeinterface/gettimezone.xml index ca423b2342..a32bf3b74a 100644 --- a/reference/datetime/datetimeinterface/gettimezone.xml +++ b/reference/datetime/datetimeinterface/gettimezone.xml @@ -3,6 +3,8 @@ + DateTime::getTimezone + DateTimeImmutable::getTimezone DateTimeInterface::getTimezone date_timezone_get Return time zone relative to given DateTime @@ -12,6 +14,14 @@ &reftitle.description; &style.oop; + public DateTimeZoneDateTime::getTimezone + + + + public DateTimeZoneDateTimeImmutable::getTimezone + + + public DateTimeZoneDateTimeInterface::getTimezone diff --git a/reference/datetime/datetimeinterface/wakeup.xml b/reference/datetime/datetimeinterface/wakeup.xml index 7c1bf4b5c1..cdf0421f2b 100644 --- a/reference/datetime/datetimeinterface/wakeup.xml +++ b/reference/datetime/datetimeinterface/wakeup.xml @@ -3,13 +3,23 @@ - DateTimeInterface::__wakeup + DateTime::__wakeup + DateTimeImmutable:: + DateTimeInterface:: The __wakeup handler &reftitle.description; + public DateTime::__wakeup + + + + public DateTimeImmutable::__wakeup + + + public DateTimeInterface::__wakeup