Merge branch 'v1.16'

mongodb · Sep 26, 2023 · 74d19f8 · 74d19f8
2 parents 510f812 + 72d8088
commit 74d19f8
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/src/functions.php b/src/functions.php
@@ -215,6 +215,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

diff --git a/tests/ExamplesTest.php b/tests/ExamplesTest.php
@@ -100,23 +100,23 @@ public static function provideExamples(): 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
         )
 
     [name] => alcaeus
     [emails] => Array
         (
-            [0] => MongoDB\Examples\PersistableEmail Object
+            [0] => MongoDB\Examples\Persistable\PersistableEmail Object
                 (
                     [type] => work
                     [address] => [email protected]
                 )
 
-            [1] => MongoDB\Examples\PersistableEmail Object
+            [1] => MongoDB\Examples\Persistable\PersistableEmail Object
                 (
                     [type] => private
                     [address] => [email protected]
@@ -150,26 +150,26 @@ public static function provideExamples(): 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] => [email protected]
+                    [type:MongoDB\Examples\Typemap\TypeMapEmail:private] => work
+                    [address:MongoDB\Examples\Typemap\TypeMapEmail:private] => [email protected]
                 )
 
-            [1] => MongoDB\Examples\TypeMapEmail Object
+            [1] => MongoDB\Examples\Typemap\TypeMapEmail Object
                 (
-                    [type:MongoDB\Examples\TypeMapEmail:private] => private
-                    [address:MongoDB\Examples\TypeMapEmail:private] => [email protected]
+                    [type:MongoDB\Examples\Typemap\TypeMapEmail:private] => private
+                    [address:MongoDB\Examples\Typemap\TypeMapEmail:private] => [email protected]
                 )
 
         )