DOCSP-51123: CC edits and cleanup

composer/composer.json

@@ -2,8 +2,8 @@
   "name": "mongodb/docs-php-library",
   "description": "MongoDB PHP Library Documentation",
   "require": {
-    "ext-mongodb": "^1.20",
-    "mongodb/mongodb": "^1.20"
+    "ext-mongodb": "^2.1",
+    "mongodb/mongodb": "^2.1"
   },
   "require-dev": {
     "doctrine/coding-standard": "^12.0",
@@ -15,4 +15,4 @@
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
   }
-}
+}

source/aggregation.txt

@@ -389,13 +389,6 @@ learn more, see the :ref:`php-atlas-search` guide.
 You can perform similarity searches on vector embeddings by using the
 Atlas Vector Search feature. To learn more, see the :ref:`php-vector-search` guide.
 
-.. TODO:
- Aggregation Tutorials
- ~~~~~~~~~~~~~~~~~~~~~
-
-.. To view step-by-step explanations of common aggregation tasks, see
-.. :ref:`php-aggregation-tutorials-landing`.
-
 API Documentation
 ~~~~~~~~~~~~~~~~~
 

source/connect.txt

@@ -411,6 +411,30 @@ connection to your MongoDB instance:
 
 To learn more about the {+stable-api+}, see the :ref:`php-stable-api` guide.
 
-.. TODO:
- Network Compression
- -------------------
+Network Compression
+-------------------
+
+The following code shows how to specify the Snappy, Zlib, and Zstandard
+compression algorithms for a connection:
+
+.. tabs::
+
+   .. tab:: MongoDB\\Client
+      :tabid: Client
+
+      .. literalinclude:: /includes/usage-examples/connect-code-examples.php
+         :language: php
+         :dedent:
+         :start-after: start-compression-client
+         :end-before: end-compression-client
+
+   .. tab:: Connection URI
+      :tabid: connectionstring
+
+      .. literalinclude:: /includes/usage-examples/connect-code-examples.php
+         :language: php
+         :dedent:
+         :start-after: start-compression-uri
+         :end-before: end-compression-uri
+
+To learn more about network compression, see the :ref:`php-network-compression` guide.

source/data-formats/modeling-bson-data.txt

@@ -57,7 +57,7 @@ these values into BSON documents when inserting them into a collection.
 The following example creates a BSON document that represents the preceding
 :ref:`sample BSON document <php-bson-sample>`:
 
-.. literalinclude:: /includes/bson.php
+.. literalinclude:: /includes/bson/interact-bson.php
     :language: php
     :dedent:
     :start-after: start-create-doc
@@ -73,7 +73,7 @@ to the :ref:`sample BSON document <php-bson-sample>`:
 - Adds a new ``restaurant_id`` field that has a value of ``12345``
 - Changes the ``name`` field value to ``"Galaxy Pizza"``
 
-.. literalinclude:: /includes/bson.php
+.. literalinclude:: /includes/bson/interact-bson.php
     :language: php
     :dedent:
     :start-after: start-modify-doc
@@ -142,7 +142,7 @@ Custom Type Map Example
 The following example sets the ``typeMap`` option for the ``restaurants`` collection
 that serializes arrays and BSON documents as ``MongoDB\Model\BSONDocument`` objects:
 
-.. literalinclude:: /includes/bson.php
+.. literalinclude:: /includes/bson/interact-bson.php
     :language: php
     :dedent:
     :start-after: start-type-map
@@ -170,7 +170,7 @@ Consider the following ``Person`` class definition, which implements the
 ``Persistable`` interface and specifies how to serialize and deserialize
 object fields as BSON values:
 
-.. literalinclude:: /includes/bson.php
+.. literalinclude:: /includes/bson/Person.php
     :language: php
     :dedent:
     :start-after: start-person-class
@@ -182,7 +182,7 @@ database, and reads it back as an object of the same type:
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/bson.php
+   .. input:: /includes/bson/interact-bson.php
       :start-after: start-person-serialize
       :end-before: end-person-serialize
       :language: php
@@ -245,24 +245,33 @@ and ``bsonUnserialize()`` methods in your class definition.
 Example
 ```````
 
-Consider the following ``User`` class definition, which specifies
-logic for serializing and deserializing its fields into BSON values.
-The class includes a ``role`` field, which has a backed enum value:
+Consider the following backed enum named ``Role``, which has two
+integer-valued cases:
 
-.. literalinclude:: /includes/bson.php
+.. literalinclude:: /includes/bson/Role.php
     :language: php
-    :emphasize-lines: 15, 24
     :dedent:
     :start-after: start-backed-enum
     :end-before: end-backed-enum
 
+This ``User`` class definition includes a ``role`` field with a ``Role`` enum
+value and specifies logic for serializing and deserializing its fields into BSON
+values:
+
+.. literalinclude:: /includes/bson/User.php
+    :language: php
+    :emphasize-lines: 5
+    :dedent:
+    :start-after: start-user-class
+    :end-before: end-user-class
+
 The following example constructs a ``User`` object with a ``role`` field,
 inserts it into the database, and reads it back as an object of the same type:
 
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/bson.php
+   .. input:: /includes/bson/interact-bson.php
       :start-after: start-enum-serialize
       :end-before: end-enum-serialize
       :language: php

source/get-started.txt

@@ -191,9 +191,8 @@ The connection string includes the hostname or IP address and
 port of your deployment, the authentication mechanism, user credentials 
 when applicable, and connection options.
 
-.. TODO:
- To connect to an instance or deployment not hosted on Atlas, see
- :ref:`php-connection-targets`.
+To connect to an instance or deployment not hosted on Atlas, see
+:ref:`php-connection-targets`.
 
 .. procedure::
    :style: connected

source/includes/bson/Person.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Bson;
+
+// start-person-class
+class Person implements MongoDB\BSON\Persistable
+{
+    private \MongoDB\BSON\ObjectId $id;
+    private \MongoDB\BSON\UTCDateTime $createdAt;
+
+    public function __construct(private string $name)
+    {
+        $this->id = new \MongoDB\BSON\ObjectId();
+        $this->createdAt = new \MongoDB\BSON\UTCDateTime();
+    }
+
+    public function bsonSerialize(): array
+    {
+        return [
+            '_id' => $this->id,
+            'name' => $this->name,
+            'createdAt' => $this->createdAt,
+        ];
+    }
+
+    public function bsonUnserialize(array $data): void
+    {
+        $this->id = $data['_id'];
+        $this->name = $data['name'];
+        $this->createdAt = $data['createdAt'];
+    }
+}
+// end-person-class

source/includes/bson/Role.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Bson;
+
+// start-backed-enum
+enum Role: int
+{
+    case USER = 1;
+    case ADMIN = 2;
+}
+// end-backed-enum

source/includes/bson/User.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Bson;
+
+// start-user-class
+class User implements MongoDB\BSON\Persistable
+{
+    public function __construct(
+        private string $username,
+        private Role $role,
+        private MongoDB\BSON\ObjectId $_id = new MongoDB\BSON\ObjectId(),
+    ) {
+    }
+
+    public function bsonSerialize(): array
+    {
+        return [
+            '_id' => $this->_id,
+            'username' => $this->username,
+            'role' => $this->role,
+        ];
+    }
+
+    public function bsonUnserialize(array $data): void
+    {
+        $this->_id = $data['_id'];
+        $this->username = $data['username'];
+        $this->role = Role::from($data['role']);
+    }
+}
+// end-user-class