Merge v1.x into v2.x (#1555)

mongodb · Dec 11, 2024 · 7c3bc10 · 7c3bc10
2 parents 4a3044b + 75f9566
commit 7c3bc10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Model/BSONDocument.php b/src/Model/BSONDocument.php
@@ -51,10 +51,10 @@ public function __clone()
      * by default.
      *
      * @see https://php.net/arrayobject.construct
-     * @param array<string, mixed> $input
+     * @param array<string, mixed>|stdClass $input
      * @psalm-param class-string<ArrayIterator<string,mixed>>|class-string<ArrayObject<string,mixed>> $iteratorClass
      */
-    public function __construct(array $input = [], int $flags = ArrayObject::ARRAY_AS_PROPS, string $iteratorClass = ArrayIterator::class)
+    public function __construct(array|stdClass $input = [], int $flags = ArrayObject::ARRAY_AS_PROPS, string $iteratorClass = ArrayIterator::class)
     {
         parent::__construct($input, $flags, $iteratorClass);
     }

diff --git a/tests/Model/BSONDocumentTest.php b/tests/Model/BSONDocumentTest.php
@@ -23,6 +23,13 @@ public function testConstructorDefaultsToPropertyAccess(): void
         $this->assertSame('bar', $document->foo);
     }
 
+    public function testConstructorWithStandardObject(): void
+    {
+        $object = (object) ['foo' => 'bar'];
+        $document = new BSONDocument($object);
+        $this->assertEquals($object, $document->bsonSerialize());
+    }
+
     public function testBsonSerializeCastsToObject(): void
     {
         $data = [0 => 'foo', 2 => 'bar'];