From 2479b98e82e96aa310e54bedb846951e34a9208b Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
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 @@
      <xi:fallback />
     </xi:include>
     
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='oop'])" />
 
    </classsynopsis>
 <!-- }}} -->
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 @@
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeimmutable')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeimmutable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='DateTimeImmutable'])" />
    </classsynopsis>
 <!-- }}} -->
 
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 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.datetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='DateTimeInterface'])" />
    </classsynopsis>
 <!-- }}} -->
 
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 @@
 
 <refentry xml:id="datetime.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
+  <refname>DateTime::diff</refname>
+  <refname>DateTimeImmutable::diff</refname>
   <refname>DateTimeInterface::diff</refname>
   <refname>date_diff</refname>
   <refpurpose>Returns the difference between two DateTime objects</refpurpose>
@@ -12,6 +14,16 @@
   &reftitle.description;
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>DateInterval</type><methodname>DateTime::diff</methodname>
+   <methodparam><type>DateTimeInterface</type><parameter>datetime2</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>absolute</parameter><initializer>false</initializer></methodparam>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <type>DateInterval</type><methodname>DateTimeImmutable::diff</methodname>
+   <methodparam><type>DateTimeInterface</type><parameter>datetime2</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>absolute</parameter><initializer>false</initializer></methodparam>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <type>DateInterval</type><methodname>DateTimeInterface::diff</methodname>
    <methodparam><type>DateTimeInterface</type><parameter>datetime2</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>absolute</parameter><initializer>false</initializer></methodparam>
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 @@
 
 <refentry xml:id="datetime.format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
+  <refname>DateTime::format</refname>
+  <refname>DateTimeImmutable::format</refname>
   <refname>DateTimeInterface::format</refname>
   <refname>date_format</refname>
   <refpurpose>Returns date formatted according to given format</refpurpose>
@@ -12,6 +14,14 @@
   &reftitle.description;
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>string</type><methodname>DateTime::format</methodname>
+   <methodparam><type>string</type><parameter>format</parameter></methodparam>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <type>string</type><methodname>DateTimeImmutable::format</methodname>
+   <methodparam><type>string</type><parameter>format</parameter></methodparam>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <type>string</type><methodname>DateTimeInterface::format</methodname>
    <methodparam><type>string</type><parameter>format</parameter></methodparam>
   </methodsynopsis>
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 @@
 
 <refentry xml:id="datetime.getoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
+  <refname>DateTime::getOffset</refname>
+  <refname>DateTimeImmutable::getOffset</refname>
   <refname>DateTimeInterface::getOffset</refname>
   <refname>date_offset_get</refname>
   <refpurpose>Returns the timezone offset</refpurpose>
@@ -12,6 +14,14 @@
   &reftitle.description;
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>int</type><methodname>DateTime::getOffset</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <type>int</type><methodname>DateTimeImmutable::getOffset</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <type>int</type><methodname>DateTimeInterface::getOffset</methodname>
    <void />
   </methodsynopsis>
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 @@
 
 <refentry xml:id="datetime.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
+  <refname>DateTime::getTimestamp</refname>
+  <refname>DateTimeImmutable::getTimestamp</refname>
   <refname>DateTimeInterface::getTimestamp</refname>
   <refname>date_timestamp_get</refname>
   <refpurpose>Gets the Unix timestamp</refpurpose>
@@ -12,6 +14,14 @@
   &reftitle.description;
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>int</type><methodname>DateTime::getTimestamp</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <type>int</type><methodname>DateTimeImmutable::getTimestamp</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <type>int</type><methodname>DateTimeInterface::getTimestamp</methodname>
    <void />
   </methodsynopsis>
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 @@
 
 <refentry xml:id="datetime.gettimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
+  <refname>DateTime::getTimezone</refname>
+  <refname>DateTimeImmutable::getTimezone</refname>
   <refname>DateTimeInterface::getTimezone</refname>
   <refname>date_timezone_get</refname>
   <refpurpose>Return time zone relative to given DateTime</refpurpose>
@@ -12,6 +14,14 @@
   &reftitle.description;
   <para>&style.oop;</para>
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>DateTimeZone</type><methodname>DateTime::getTimezone</methodname>
+   <void/>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <type>DateTimeZone</type><methodname>DateTimeImmutable::getTimezone</methodname>
+   <void/>
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <type>DateTimeZone</type><methodname>DateTimeInterface::getTimezone</methodname>
    <void/>
   </methodsynopsis>
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 @@
 
 <refentry xml:id="datetime.wakeup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
-  <refname>DateTimeInterface::__wakeup</refname>
+  <refname>DateTime::__wakeup</refname>
+  <refname>DateTimeImmutable::</refname>
+  <refname>DateTimeInterface::</refname>
   <refpurpose>The __wakeup handler</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="oop">
+   <modifier>public</modifier> <methodname>DateTime::__wakeup</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeImmutable">
+   <modifier>public</modifier> <methodname>DateTimeImmutable::__wakeup</methodname>
+   <void />
+  </methodsynopsis>
+  <methodsynopsis role="DateTimeInterface">
    <modifier>public</modifier> <methodname>DateTimeInterface::__wakeup</methodname>
    <void />
   </methodsynopsis>