From 238822c757eb20854e5c6e66a3a39f390832d28c Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@php.net>
Date: Fri, 20 Jan 2017 16:51:04 +0000
Subject: [PATCH] MongoDB\BSON classes implement JsonSerializable in 1.2.0+

https://jira.mongodb.org/browse/PHPC-459


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341742 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongodb/bson/binary.xml             |  7 +-
 .../mongodb/bson/binary/jsonserialize.xml     | 71 ++++++++++++++++++
 reference/mongodb/bson/decimal128.xml         |  7 +-
 .../mongodb/bson/decimal128/jsonserialize.xml | 72 +++++++++++++++++++
 reference/mongodb/bson/javascript.xml         |  7 +-
 .../mongodb/bson/javascript/jsonserialize.xml | 72 +++++++++++++++++++
 reference/mongodb/bson/maxkey.xml             |  7 +-
 .../mongodb/bson/maxkey/jsonserialize.xml     | 71 ++++++++++++++++++
 reference/mongodb/bson/minkey.xml             |  7 +-
 .../mongodb/bson/minkey/jsonserialize.xml     | 71 ++++++++++++++++++
 reference/mongodb/bson/objectid.xml           |  7 +-
 .../mongodb/bson/objectid/jsonserialize.xml   | 72 +++++++++++++++++++
 reference/mongodb/bson/regex.xml              |  7 +-
 .../mongodb/bson/regex/jsonserialize.xml      | 71 ++++++++++++++++++
 reference/mongodb/bson/timestamp.xml          |  7 +-
 .../mongodb/bson/timestamp/jsonserialize.xml  | 72 +++++++++++++++++++
 reference/mongodb/bson/utcdatetime.xml        |  7 +-
 .../bson/utcdatetime/jsonserialize.xml        | 72 +++++++++++++++++++
 reference/mongodb/versions.xml                |  9 +++
 19 files changed, 707 insertions(+), 9 deletions(-)
 create mode 100644 reference/mongodb/bson/binary/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/decimal128/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/javascript/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/maxkey/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/minkey/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/objectid/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/regex/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/timestamp/jsonserialize.xml
 create mode 100644 reference/mongodb/bson/utcdatetime/jsonserialize.xml

diff --git a/reference/mongodb/bson/binary.xml b/reference/mongodb/bson/binary.xml
index d81da420af..575ad8e0be 100644
--- a/reference/mongodb/bson/binary.xml
+++ b/reference/mongodb/bson/binary.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
@@ -164,7 +168,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/binary/jsonserialize.xml b/reference/mongodb/bson/binary/jsonserialize.xml
new file mode 100644
index 0000000000..d9a5f8b419
--- /dev/null
+++ b/reference/mongodb/bson/binary/jsonserialize.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-binary.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\Binary::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Binary::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the <classname>MongoDB\BSON\Binary</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/decimal128.xml b/reference/mongodb/bson/decimal128.xml
index 33188b03a7..80d23a5335 100644
--- a/reference/mongodb/bson/decimal128.xml
+++ b/reference/mongodb/bson/decimal128.xml
@@ -48,6 +48,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
 
@@ -73,7 +77,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/decimal128/jsonserialize.xml b/reference/mongodb/bson/decimal128/jsonserialize.xml
new file mode 100644
index 0000000000..84ae8255ce
--- /dev/null
+++ b/reference/mongodb/bson/decimal128/jsonserialize.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-decimal128.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\Decimal128::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Decimal128::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the
+   <classname>MongoDB\BSON\Decimal128</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/javascript.xml b/reference/mongodb/bson/javascript.xml
index 5a5bed55f3..3418d58230 100644
--- a/reference/mongodb/bson/javascript.xml
+++ b/reference/mongodb/bson/javascript.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -62,7 +66,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/javascript/jsonserialize.xml b/reference/mongodb/bson/javascript/jsonserialize.xml
new file mode 100644
index 0000000000..48aad77097
--- /dev/null
+++ b/reference/mongodb/bson/javascript/jsonserialize.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-javascript.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\Javascript::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Javascript::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the
+   <classname>MongoDB\BSON\Javascript</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/maxkey.xml b/reference/mongodb/bson/maxkey.xml
index e9b7eb4265..624752a78d 100644
--- a/reference/mongodb/bson/maxkey.xml
+++ b/reference/mongodb/bson/maxkey.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -62,7 +66,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/maxkey/jsonserialize.xml b/reference/mongodb/bson/maxkey/jsonserialize.xml
new file mode 100644
index 0000000000..cc68422f43
--- /dev/null
+++ b/reference/mongodb/bson/maxkey/jsonserialize.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-maxkey.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\MaxKey::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\MaxKey::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the <classname>MongoDB\BSON\MaxKey</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/minkey.xml b/reference/mongodb/bson/minkey.xml
index a84dd3324b..8a9234ca73 100644
--- a/reference/mongodb/bson/minkey.xml
+++ b/reference/mongodb/bson/minkey.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -62,7 +66,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/minkey/jsonserialize.xml b/reference/mongodb/bson/minkey/jsonserialize.xml
new file mode 100644
index 0000000000..e37170fd68
--- /dev/null
+++ b/reference/mongodb/bson/minkey/jsonserialize.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-minkey.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\MinKey::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\MinKey::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the <classname>MongoDB\BSON\MinKey</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/objectid.xml b/reference/mongodb/bson/objectid.xml
index d93b06a3c3..88bdedfe8e 100644
--- a/reference/mongodb/bson/objectid.xml
+++ b/reference/mongodb/bson/objectid.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -62,7 +66,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/objectid/jsonserialize.xml b/reference/mongodb/bson/objectid/jsonserialize.xml
new file mode 100644
index 0000000000..54c803d54d
--- /dev/null
+++ b/reference/mongodb/bson/objectid/jsonserialize.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-objectid.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\ObjectID::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\ObjectID::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the
+   <classname>MongoDB\BSON\ObjectID</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/regex.xml b/reference/mongodb/bson/regex.xml
index 363aff25fc..e56bde1eb1 100644
--- a/reference/mongodb/bson/regex.xml
+++ b/reference/mongodb/bson/regex.xml
@@ -37,6 +37,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -62,7 +66,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/regex/jsonserialize.xml b/reference/mongodb/bson/regex/jsonserialize.xml
new file mode 100644
index 0000000000..6da8e42473
--- /dev/null
+++ b/reference/mongodb/bson/regex/jsonserialize.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-regex.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\Regex::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Regex::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the <classname>MongoDB\BSON\Regex</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/timestamp.xml b/reference/mongodb/bson/timestamp.xml
index d95f6952e7..aa4672009d 100644
--- a/reference/mongodb/bson/timestamp.xml
+++ b/reference/mongodb/bson/timestamp.xml
@@ -39,6 +39,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -64,7 +68,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/timestamp/jsonserialize.xml b/reference/mongodb/bson/timestamp/jsonserialize.xml
new file mode 100644
index 0000000000..e92177c815
--- /dev/null
+++ b/reference/mongodb/bson/timestamp/jsonserialize.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-timestamp.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\Timestamp::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Timestamp::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the
+   <classname>MongoDB\BSON\Timestamp</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/bson/utcdatetime.xml b/reference/mongodb/bson/utcdatetime.xml
index 3149b6b4ea..2f39f172d8 100644
--- a/reference/mongodb/bson/utcdatetime.xml
+++ b/reference/mongodb/bson/utcdatetime.xml
@@ -38,6 +38,10 @@
      <oointerface>
       <interfacename>Serializable</interfacename>
      </oointerface>
+
+     <oointerface>
+      <interfacename>JsonSerializable</interfacename>
+     </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
     
@@ -63,7 +67,8 @@
        <row>
         <entry>1.2.0</entry>
         <entry>
-         Implements <interfacename>Serializable</interfacename>.
+         Implements <interfacename>Serializable</interfacename> and
+         <interfacename>JsonSerializable</interfacename>.
         </entry>
        </row>
       </tbody>
diff --git a/reference/mongodb/bson/utcdatetime/jsonserialize.xml b/reference/mongodb/bson/utcdatetime/jsonserialize.xml
new file mode 100644
index 0000000000..9df8a717ef
--- /dev/null
+++ b/reference/mongodb/bson/utcdatetime/jsonserialize.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 337902 $ --> 
+
+<refentry xml:id="mongodb-bson-utcdatetime.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>MongoDB\BSON\UTCDateTime::jsonSerialize</refname>
+  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\UTCDateTime::jsonSerialize</methodname>
+   <void />
+  </methodsynopsis>
+  <para>
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns data which can be serialized by <function>json_encode</function> to
+   produce the <link xlink:href="&url.mongodb.docs.extendedjson;">extended
+   JSON</link> representation of the
+   <classname>MongoDB\BSON\UTCDateTime</classname>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="errors">
+  &reftitle.errors;
+  <simplelist>
+   &mongodb.throws.argumentparsing;
+  </simplelist>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <simplelist>
+   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
+   <member><function>json_encode</function></member>
+   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/mongodb/versions.xml b/reference/mongodb/versions.xml
index 6090b4dec3..2b2a6d226d 100644
--- a/reference/mongodb/versions.xml
+++ b/reference/mongodb/versions.xml
@@ -135,12 +135,14 @@
  <function name='mongodb\bson\binary::__tostring' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\binary::gettype' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\binary::getdata' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\binary::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\binary::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\binary::unserialize' from='mongodb &gt;=1.2.0'/>
 
  <function name='mongodb\bson\decimal128' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\decimal128::__construct' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\decimal128::__tostring' from='mongodb &gt;=1.2.0'/>
+ <function name='mongodb\bson\decimal128::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\decimal128::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\decimal128::unserialize' from='mongodb &gt;=1.2.0'/>
 
@@ -149,16 +151,19 @@
  <function name='mongodb\bson\javascript::__tostring' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\javascript::getcode' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\javascript::getscope' from='mongodb &gt;=1.2.0'/>
+ <function name='mongodb\bson\javascript::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\javascript::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\javascript::unserialize' from='mongodb &gt;=1.2.0'/>
 
  <function name='mongodb\bson\maxkey' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\maxkey::__construct' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\maxkey::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\maxkey::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\maxkey::unserialize' from='mongodb &gt;=1.2.0'/>
  
  <function name='mongodb\bson\minkey' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\minkey::__construct' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\minkey::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\minkey::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\minkey::unserialize' from='mongodb &gt;=1.2.0'/>
 
@@ -166,6 +171,7 @@
  <function name='mongodb\bson\objectid::__construct' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\objectid::__tostring' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\objectid::gettimestamp' from='mongodb &gt;=1.2.0'/>
+ <function name='mongodb\bson\objectid::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\objectid::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\objectid::unserialize' from='mongodb &gt;=1.2.0'/>
 
@@ -174,18 +180,21 @@
  <function name='mongodb\bson\regex::__tostring' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\regex::getflags' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\regex::getpattern' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\regex::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\regex::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\regex::unserialize' from='mongodb &gt;=1.2.0'/>
 
  <function name='mongodb\bson\timestamp' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\timestamp::__construct' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\timestamp::__tostring' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\timestamp::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\timestamp::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\timestamp::unserialize' from='mongodb &gt;=1.2.0'/>
 
  <function name='mongodb\bson\utcdatetime' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\utcdatetime::__construct' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\utcdatetime::__tostring' from='mongodb &gt;=1.0.0'/>
+ <function name='mongodb\bson\utcdatetime::jsonserialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\utcdatetime::todatetime' from='mongodb &gt;=1.0.0'/>
  <function name='mongodb\bson\utcdatetime::serialize' from='mongodb &gt;=1.2.0'/>
  <function name='mongodb\bson\utcdatetime::unserialize' from='mongodb &gt;=1.2.0'/>