Fix Collection::upsert() inconsistency w/ update() & delete()

ChangeLog.md

@@ -3,6 +3,10 @@ MongoDB for XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Fixed `upsert()` inconsistency with `update()` and `delete()` in how
+  it handles the *query* parameter
+  (@thekid)
+
 ## 2.1.0 / 2023-09-10
 
 * Merged PR #43: Retry "Exception: not primary" when writing (fixes #42)

src/main/php/com/mongodb/Collection.class.php

@@ -86,7 +86,7 @@ public function upsert($query, $arg, Options... $options): Update {
     $result= $this->proto->write($options, [
       'update'    => $this->name,
       'updates'   => [[
-        'q'      => $query instanceof ObjectId ? ['_id' => $query] : $query,
+        'q'      => is_array($query) ? $query : ['_id' => $query],
         'u'      => $arg,
         'upsert' => true,
         'multi'  => false

src/test/php/com/mongodb/unittest/CollectionTest.class.php

@@ -99,10 +99,10 @@ public function insert_many() {
     Assert::equals([2, ['one', 'two']], [$result->inserted(), $result->ids()]);
   }
 
-  #[Test]
-  public function upsert_when_updating() {
+  #[Test, Values([[['_id' => 'one']], ['one']])]
+  public function upsert_when_updating($query) {
     $result= $this->newFixture($this->ok(['n' => 1, 'nModified' => 1]))->upsert(
-      ['_id' => 'one'],
+      $query,
       new Document(['_id' => 'one', 'name' => 'A'])
     );