From b252443a2b6df720f5acbfa42cb3f2b39dc84296 Mon Sep 17 00:00:00 2001
From: Andreas Braun <alcaeus@users.noreply.github.com>
Date: Mon, 24 Jul 2023 09:21:36 +0200
Subject: [PATCH 1/2] PHPLIB-1208: Use separate namespaces for examples (#1139)

---
 examples/aggregate.php        |  2 +-
 examples/bulk.php             |  2 +-
 examples/changestream.php     |  2 +-
 examples/command_logger.php   |  2 +-
 examples/persistable.php      |  2 +-
 examples/typemap.php          |  2 +-
 examples/with_transaction.php |  2 +-
 tests/ExamplesTest.php        | 28 ++++++++++++++--------------
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/examples/aggregate.php b/examples/aggregate.php
index d1ee69450..58ce7eb9e 100644
--- a/examples/aggregate.php
+++ b/examples/aggregate.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\Aggregate;
 
 use MongoDB\Client;
 
diff --git a/examples/bulk.php b/examples/bulk.php
index 316594f00..d9b3e997c 100644
--- a/examples/bulk.php
+++ b/examples/bulk.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\Bulk;
 
 use MongoDB\Client;
 use MongoDB\Driver\WriteConcern;
diff --git a/examples/changestream.php b/examples/changestream.php
index 8c871f59c..714506b9d 100644
--- a/examples/changestream.php
+++ b/examples/changestream.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\ChangeStream;
 
 use MongoDB\Client;
 
diff --git a/examples/command_logger.php b/examples/command_logger.php
index 9d3f7c0fe..e29d6179c 100644
--- a/examples/command_logger.php
+++ b/examples/command_logger.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\CommandLogger;
 
 use MongoDB\Client;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
diff --git a/examples/persistable.php b/examples/persistable.php
index 6e23a16bb..130462d84 100644
--- a/examples/persistable.php
+++ b/examples/persistable.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\Persistable;
 
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\Persistable;
diff --git a/examples/typemap.php b/examples/typemap.php
index 9dc96b016..d9e540b96 100644
--- a/examples/typemap.php
+++ b/examples/typemap.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\Typemap;
 
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\Unserializable;
diff --git a/examples/with_transaction.php b/examples/with_transaction.php
index 15eba6524..2bc99a31f 100644
--- a/examples/with_transaction.php
+++ b/examples/with_transaction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace MongoDB\Examples;
+namespace MongoDB\Examples\WithTransaction;
 
 use MongoDB\Client;
 use MongoDB\Driver\Session;
diff --git a/tests/ExamplesTest.php b/tests/ExamplesTest.php
index 997bc3312..e6e2c8b50 100644
--- a/tests/ExamplesTest.php
+++ b/tests/ExamplesTest.php
@@ -90,9 +90,9 @@ public function dataExamples(): Generator
         ];
 
         $expectedOutput = <<<'OUTPUT'
-MongoDB\Examples\PersistableEntry Object
+MongoDB\Examples\Persistable\PersistableEntry Object
 (
-    [id:MongoDB\Examples\PersistableEntry:private] => MongoDB\BSON\ObjectId Object
+    [id:MongoDB\Examples\Persistable\PersistableEntry:private] => MongoDB\BSON\ObjectId Object
         (
             [oid] => %s
         )
@@ -100,13 +100,13 @@ public function dataExamples(): Generator
     [name] => alcaeus
     [emails] => Array
         (
-            [0] => MongoDB\Examples\PersistableEmail Object
+            [0] => MongoDB\Examples\Persistable\PersistableEmail Object
                 (
                     [type] => work
                     [address] => alcaeus@example.com
                 )
 
-            [1] => MongoDB\Examples\PersistableEmail Object
+            [1] => MongoDB\Examples\Persistable\PersistableEmail Object
                 (
                     [type] => private
                     [address] => secret@example.com
@@ -123,26 +123,26 @@ public function dataExamples(): Generator
         ];
 
         $expectedOutput = <<<'OUTPUT'
-MongoDB\Examples\TypeMapEntry Object
+MongoDB\Examples\Typemap\TypeMapEntry Object
 (
-    [id:MongoDB\Examples\TypeMapEntry:private] => MongoDB\BSON\ObjectId Object
+    [id:MongoDB\Examples\Typemap\TypeMapEntry:private] => MongoDB\BSON\ObjectId Object
         (
             [oid] => %s
         )
 
-    [name:MongoDB\Examples\TypeMapEntry:private] => alcaeus
-    [emails:MongoDB\Examples\TypeMapEntry:private] => Array
+    [name:MongoDB\Examples\Typemap\TypeMapEntry:private] => alcaeus
+    [emails:MongoDB\Examples\Typemap\TypeMapEntry:private] => Array
         (
-            [0] => MongoDB\Examples\TypeMapEmail Object
+            [0] => MongoDB\Examples\Typemap\TypeMapEmail Object
                 (
-                    [type:MongoDB\Examples\TypeMapEmail:private] => work
-                    [address:MongoDB\Examples\TypeMapEmail:private] => alcaeus@example.com
+                    [type:MongoDB\Examples\Typemap\TypeMapEmail:private] => work
+                    [address:MongoDB\Examples\Typemap\TypeMapEmail:private] => alcaeus@example.com
                 )
 
-            [1] => MongoDB\Examples\TypeMapEmail Object
+            [1] => MongoDB\Examples\Typemap\TypeMapEmail Object
                 (
-                    [type:MongoDB\Examples\TypeMapEmail:private] => private
-                    [address:MongoDB\Examples\TypeMapEmail:private] => secret@example.com
+                    [type:MongoDB\Examples\Typemap\TypeMapEmail:private] => private
+                    [address:MongoDB\Examples\Typemap\TypeMapEmail:private] => secret@example.com
                 )
 
         )

From 72d80889eb7567c0da4e7d4ddbdcf66dfea90ac3 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Tue, 26 Sep 2023 11:44:10 -0400
Subject: [PATCH 2/2] PHPLIB-1137: Mark is_document() as internal (#1176)

This was missed in 88731a55c3dfd97b38ce0360f53b5b2674209754
---
 src/functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/functions.php b/src/functions.php
index 4acec021c..0a9b882ec 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -192,6 +192,7 @@ function get_encrypted_fields_from_server(string $databaseName, string $collecti
  * This method returns true for any array or object, but specifically excludes
  * BSON PackedArray instances
  *
+ * @internal
  * @param mixed $document
  */
 function is_document($document): bool