From eb9333f44a9b0e2ae98ef535d9e7f18c491dfeb3 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:13:15 -0500 Subject: [PATCH 1/7] Remove trailing comma --- source/includes/3.6-drivers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/includes/3.6-drivers.rst b/source/includes/3.6-drivers.rst index 701c42fa0b2..345e76ad7c4 100644 --- a/source/includes/3.6-drivers.rst +++ b/source/includes/3.6-drivers.rst @@ -1,4 +1,4 @@ -- Java 3.6, +- Java 3.6 - Python 3.6 - C 1.9 - Node 3.0 From 76d4365717d88039932e8e42bafb4953f37238e6 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:31:39 -0500 Subject: [PATCH 2/7] PHP does not support DBRefs Although the legacy PHP driver did provide a MongoDBRef class, the current driver and library have no special API for DBRef objects (see: PHPLIB-24). --- source/reference/database-references.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/reference/database-references.txt b/source/reference/database-references.txt index 8253b754a0c..34d27b74163 100644 --- a/source/reference/database-references.txt +++ b/source/reference/database-references.txt @@ -229,9 +229,8 @@ Driver Support for DBRefs * - **PHP** - - The PHP driver supports DBRefs, including the optional ``$db`` - reference, using `the MongoDBRef - `_ class. + - The PHP driver contains no support for DBRefs. You can traverse + references manually. * - **Python** From 2945fe4bd9cec199c2311c3812e279c7771a6926 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:36:24 -0500 Subject: [PATCH 3/7] Update createIndexes example for PHP This example was linking to the current PHP driver but showing syntax from the legacy driver. Updated to correctly link to the current PHP library API. Keeping "PHP Driver" language in place for consistency, despite the fact that this is handled by the library. These examples may change later with DRIVERS-448, but this is a quick fix. --- source/includes/driver-example-indexes-1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/includes/driver-example-indexes-1.rst b/source/includes/driver-example-indexes-1.rst index afcf3734119..0c56e350f87 100644 --- a/source/includes/driver-example-indexes-1.rst +++ b/source/includes/driver-example-indexes-1.rst @@ -218,13 +218,13 @@ - id: php content: | To create an index using the - `PHP driver `_, use - `MongoCollection::createIndex() `_. + `PHP driver `_, use + :phpmethod:`MongoDB\\Collection::createIndex() `. .. class:: copyable-code .. code-block:: php - $collection->createIndex(array(), array()); + $collection->createIndex(, ); The following example creates a single key descending index on the ``name`` field: @@ -232,9 +232,9 @@ .. class:: copyable-code .. code-block:: php - $collection->createIndex(array('name' => -1)); + $collection->createIndex(['name' => -1]); - The `MongoCollection::createIndex() `_ + The :phpmethod:`MongoDB\\Collection::createIndex() ` method only creates an index if an index of the same specification does not already exist. From 3f009754403a8e0b2ea0ad2df7c24ce45f0638cb Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:41:18 -0500 Subject: [PATCH 4/7] Update link to PHP driver in SSL docs This links to the MongoDB\Driver\Manager constructor, as is done in the Kerberos docs. --- source/tutorial/configure-ssl-clients.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/tutorial/configure-ssl-clients.txt b/source/tutorial/configure-ssl-clients.txt index 79108f26e0d..0c43742b3d1 100644 --- a/source/tutorial/configure-ssl-clients.txt +++ b/source/tutorial/configure-ssl-clients.txt @@ -141,7 +141,7 @@ The MongoDB Drivers support encrypted communication. See: - `Java Driver `_ - `Node.js Driver `_ - `Perl Driver `_ -- `PHP Driver `_ +- `PHP Driver `_ - `Python Driver `_ - `Ruby Driver `_ - `Scala Driver `_ From 2f86ebb96c4dc672aa5537ed33763965088973ff Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:42:36 -0500 Subject: [PATCH 5/7] Update links to PHP driver and library in drivers table The ecosystem page explains the relation between the driver and library. Based on their design, documentation for both are relevant to users. They are also installed independently, perhaps unlike other languages that also have separate high- and low-level packages (e.g. mongodb-core for Node.js). --- source/includes/driver-table.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/includes/driver-table.rst b/source/includes/driver-table.rst index 151815cf4f4..b0f4033d3ab 100644 --- a/source/includes/driver-table.rst +++ b/source/includes/driver-table.rst @@ -38,9 +38,12 @@ - `Current Perl Driver API `_ * - :ecosystem:`PHP ` - - `PHP Driver Releases `_ - - `PHP Driver Source Code `_ - - `Current PHP Driver API `_ + - `PHP Driver Releases `_, + `PHP Library Releases `_ + - `PHP Driver Source Code `_, + `PHP Library Source Code `_ + - `Current PHP Driver API `_, + `Current PHP Library API `_ * - :ecosystem:`Python ` - `Python Driver Releases `_ From 706d37cea75b12971a20fd2854d576165ed38644 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 18:54:23 -0500 Subject: [PATCH 6/7] List legacy and current PHP drivers in 3.0 compat table This table is included in the current SCRAM documentation, in addition to the older 3.0 release notes, so it makes sense to mention the current PHP driver here. --- source/includes/list-table-3.0-driver-compatibility.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/includes/list-table-3.0-driver-compatibility.rst b/source/includes/list-table-3.0-driver-compatibility.rst index 49188aeb268..ca9d8b5f660 100644 --- a/source/includes/list-table-3.0-driver-compatibility.rst +++ b/source/includes/list-table-3.0-driver-compatibility.rst @@ -23,7 +23,8 @@ - `1.0.0 `__ * - :ecosystem:`PHP ` - - `1.6 `_ + - `ext-mongo 1.6 `_, + `ext-mongodb 1.0 `_ * - :ecosystem:`Python ` - `2.8 `_ From bb801ce88acee1fcfd1d76aed6506473988cb044 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 7 Mar 2018 19:01:52 -0500 Subject: [PATCH 7/7] Clarify references to legacy PHP driver --- source/release-notes/3.0.txt | 2 +- source/release-notes/drivers-write-concern.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/release-notes/3.0.txt b/source/release-notes/3.0.txt index 04f024ca085..051b7aebb11 100644 --- a/source/release-notes/3.0.txt +++ b/source/release-notes/3.0.txt @@ -454,7 +454,7 @@ replica sets: - Ruby Driver 2.0 - Node.JS Driver 2.0 -The C, C++, Perl, and PHP drivers, as well as the earlier versions of +The C, C++, Perl, and legacy PHP drivers, as well as the earlier versions of the Ruby, Python, and Node.JS drivers, discover and monitor replica set members serially, and thus are not suitable for use with large replica sets. diff --git a/source/release-notes/drivers-write-concern.txt b/source/release-notes/drivers-write-concern.txt index 4c87b29c1db..d3fc758927d 100644 --- a/source/release-notes/drivers-write-concern.txt +++ b/source/release-notes/drivers-write-concern.txt @@ -71,6 +71,6 @@ driver-specific changes. - Java, version 2.10.0 - Node.js, version 1.2 - Perl, version 0.501.1 -- PHP, version 1.4 +- Legacy PHP, version 1.4 - Python, version 2.4 - Ruby, version 1.8