Merge v1.20 into v1.x (#1424)

tests/Operation/WatchFunctionalTest.php

@@ -720,7 +720,7 @@ public function testInitialCursorIsNotClosed(): void
  * reports the cursor as alive. While the cursor ID is accessed through
  * ChangeStream, we'll need to use reflection to access the internal
  * Cursor and call isDead(). */
- $this->assertNotEquals('0', (string) $changeStream->getCursorId());
+ $this->assertNotEquals('0', (string) $changeStream->getCursorId(true));
 
  $rc = new ReflectionClass(ChangeStream::class);
  $rp = $rc->getProperty('iterator');
@@ -1370,11 +1370,11 @@ public function testOriginalReadPreferenceIsPreservedOnResume(): void
  }
 
  $changeStream = $operation->execute($secondary);
- $previousCursorId = $changeStream->getCursorId();
+ $previousCursorId = $changeStream->getCursorId(true);
  $this->forceChangeStreamResume();
 
  $changeStream->next();
- $this->assertNotSame($previousCursorId, $changeStream->getCursorId());
+ $this->assertNotSame($previousCursorId, $changeStream->getCursorId(true));
 
  $getCursor = Closure::bind(
  fn () => $this->iterator->getInnerIterator(),

tests/SpecTests/RetryableReads/Prose2_RetryOnMongosTest.php

@@ -7,7 +7,6 @@
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
-use MongoDB\Driver\Server;
 use MongoDB\Tests\SpecTests\FunctionalTestCase;
 
 use function assert;
@@ -65,7 +64,8 @@ public function testRetryOnDifferentMongos(): void
 
  // Step 4: Enable failed command event monitoring for client
  $subscriber = new class implements CommandSubscriber {
- public $commandFailedServers = [];
+ /** @var int[] */
+ public array $commandFailedServers = [];
 
  public function commandStarted(CommandStartedEvent $event): void
  {
@@ -77,7 +77,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void
 
  public function commandFailed(CommandFailedEvent $event): void
  {
- $this->commandFailedServers[] = $event->getServer();
+ $this->commandFailedServers[] = $event->getServerConnectionId();
  }
  };
 
@@ -130,21 +130,21 @@ public function testRetryOnSameMongos(): void
 
  // Step 4: Enable succeeded and failed command event monitoring
  $subscriber = new class implements CommandSubscriber {
- public Server $commandSucceededServer;
- public Server $commandFailedServer;
+ public ?int $commandSucceededServer = null;
+ public ?int $commandFailedServer = null;
 
  public function commandStarted(CommandStartedEvent $event): void
  {
  }
 
  public function commandSucceeded(CommandSucceededEvent $event): void
  {
- $this->commandSucceededServer = $event->getServer();
+ $this->commandSucceededServer = $event->getServerConnectionId();
  }
 
  public function commandFailed(CommandFailedEvent $event): void
  {
- $this->commandFailedServer = $event->getServer();
+ $this->commandFailedServer = $event->getServerConnectionId();
  }
  };
 

tests/SpecTests/RetryableWrites/Prose4_RetryOnDifferentMongosTest.php

@@ -67,7 +67,8 @@ public function testRetryOnDifferentMongos(): void
 
  // Step 4: Enable failed command event monitoring for client
  $subscriber = new class implements CommandSubscriber {
- public $commandFailedServers = [];
+ /** @var int[] */
+ public array $commandFailedServers = [];
 
  public function commandStarted(CommandStartedEvent $event): void
  {
@@ -79,7 +80,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void
 
  public function commandFailed(CommandFailedEvent $event): void
  {
- $this->commandFailedServers[] = $event->getServer();
+ $this->commandFailedServers[] = $event->getServerConnectionId();
  }
  };
 

tests/SpecTests/RetryableWrites/Prose5_RetryOnSameMongosTest.php

@@ -6,7 +6,6 @@
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
-use MongoDB\Driver\Server;
 use MongoDB\Tests\SpecTests\FunctionalTestCase;
 
 /**
@@ -50,21 +49,21 @@ public function testRetryOnSameMongos(): void
 
  // Step 4: Enable succeeded and failed command event monitoring
  $subscriber = new class implements CommandSubscriber {
- public Server $commandSucceededServer;
- public Server $commandFailedServer;
+ public ?int $commandSucceededServer = null;
+ public ?int $commandFailedServer = null;
 
  public function commandStarted(CommandStartedEvent $event): void
  {
  }
 
  public function commandSucceeded(CommandSucceededEvent $event): void
  {
- $this->commandSucceededServer = $event->getServer();
+ $this->commandSucceededServer = $event->getServerConnectionId();
  }
 
  public function commandFailed(CommandFailedEvent $event): void
  {
- $this->commandFailedServer = $event->getServer();
+ $this->commandFailedServer = $event->getServerConnectionId();
  }
  };
 
@@ -78,7 +77,7 @@ public function commandFailed(CommandFailedEvent $event): void
 
  /* Step 6: Assert that exactly one failed command event and one
  * succeeded command event occurred. Assert that both events occurred on
- * the same mongos. */
+ * the same mongos connection. */
  $this->assertNotNull($subscriber->commandSucceededServer);
  $this->assertNotNull($subscriber->commandFailedServer);
  $this->assertEquals($subscriber->commandSucceededServer, $subscriber->commandFailedServer);

tests/UnifiedSpecTests/EventCollector.php

@@ -17,7 +17,6 @@
 use function PHPUnit\Framework\assertIsObject;
 use function PHPUnit\Framework\assertIsString;
 use function PHPUnit\Framework\assertNotEmpty;
-use function sprintf;
 
 /**
  * EventCollector handles "storeEventsAsEntities" for client entities.
@@ -108,7 +107,7 @@ private function handleCommandMonitoringEvent(CommandStartedEvent|CommandSucceed
  'name' => self::getEventName($event),
  'observedAt' => microtime(true),
  'commandName' => $event->getCommandName(),
- 'connectionId' => self::getConnectionId($event),
+ 'connectionId' => $event->getServerConnectionId(),
  'requestId' => $event->getRequestId(),
  'operationId' => $event->getOperationId(),
  ];
@@ -132,13 +131,6 @@ private function handleCommandMonitoringEvent(CommandStartedEvent|CommandSucceed
  $this->eventList[] = $log;
  }
 
- private static function getConnectionId(CommandStartedEvent|CommandSucceededEvent|CommandFailedEvent $event): string
- {
- $server = $event->getServer();
-
- return sprintf('%s:%d', $server->getHost(), $server->getPort());
- }
-
  private static function getEventName(object $event): string
  {
  static $eventNamesByClass = null;