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

Author: mongodb-php-bot

.evergreen/config/generate-config.php

@@ -55,7 +55,7 @@
 
 // Test variants
 $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
-// TODO: Re-enable when 1.20.0 is released
+// TODO: Re-enable when 2.0.0 is released
 // $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
 // $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
 

tests/Operation/FindFunctionalTest.php

@@ -48,7 +48,9 @@ function () use ($modifiers): void {
                     ['modifiers' => $modifiers],
                 );
 
-                $operation->execute($this->getPrimaryServer());
+                $this->assertDeprecated(
+                    fn () => $operation->execute($this->getPrimaryServer()),
+                );
             },
             function (array $event) use ($expectedSort): void {
                 $this->assertEquals($expectedSort, $event['started']->getCommand()->sort ?? null);

tests/TestCase.php

@@ -37,6 +37,7 @@
 use function sprintf;
 use function strtr;
 
+use const E_DEPRECATED;
 use const E_USER_DEPRECATED;
 
 abstract class TestCase extends BaseTestCase
@@ -166,7 +167,7 @@ protected function assertDeprecated(callable $execution): void
 
         set_error_handler(function ($errno, $errstr) use (&$errors): void {
             $errors[] = $errstr;
-        }, E_USER_DEPRECATED);
+        }, E_USER_DEPRECATED | E_DEPRECATED);
 
         try {
             call_user_func($execution);

tests/UnifiedSpecTests/ExpectedError.php

@@ -7,7 +7,6 @@
 use MongoDB\Driver\Exception\ExecutionTimeoutException;
 use MongoDB\Driver\Exception\RuntimeException;
 use MongoDB\Driver\Exception\ServerException;
-use MongoDB\Driver\Exception\WriteException;
 use MongoDB\Tests\UnifiedSpecTests\Constraint\Matches;
 use PHPUnit\Framework\Assert;
 use stdClass;
@@ -157,14 +156,14 @@ public function assert(?Throwable $e = null): void
         }
 
         if (isset($this->matchesResultDocument)) {
-            assertThat($e, logicalOr(isInstanceOf(CommandException::class), isInstanceOf(WriteException::class)));
+            assertThat($e, logicalOr(isInstanceOf(CommandException::class), isInstanceOf(BulkWriteException::class)));
 
             if ($e instanceof CommandException) {
                 assertThat($e->getResultDocument(), $this->matchesResultDocument, 'CommandException result document matches');
-            } elseif ($e instanceof WriteException) {
+            } elseif ($e instanceof BulkWriteException) {
                 $writeErrors = $e->getWriteResult()->getErrorReplies();
                 assertCount(1, $writeErrors);
-                assertThat($writeErrors[0], $this->matchesResultDocument, 'WriteException result document matches');
+                assertThat($writeErrors[0], $this->matchesResultDocument, 'BulkWriteException result document matches');
             }
         }
 

tests/UnifiedSpecTests/ManagesFailPointsTrait.php

@@ -2,6 +2,7 @@
 
 namespace MongoDB\Tests\UnifiedSpecTests;
 
+use MongoDB\Driver\Exception\ConnectionException;
 use MongoDB\Driver\Server;
 use MongoDB\Operation\DatabaseCommand;
 use stdClass;
@@ -31,8 +32,14 @@ public function configureFailPoint(stdClass $failPoint, Server $server): void
     public function disableFailPoints(): void
     {
         foreach ($this->failPointsAndServers as [$failPoint, $server]) {
-            $operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
-            $operation->execute($server);
+            try {
+                $operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
+                $operation->execute($server);
+            } catch (ConnectionException) {
+                // Retry once in case the connection was dropped by the last operation
+                $operation = new DatabaseCommand('admin', ['configureFailPoint' => $failPoint, 'mode' => 'off']);
+                $operation->execute($server);
+            }
         }
 
         $this->failPointsAndServers = [];