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

.evergreen/config/functions.yml

@@ -84,19 +84,15 @@ functions:
         content_type: ${content_type|application/x-gzip}
         permissions: public-read
         local_file: ${build_id}.tar.gz
-        remote_file: mongo-php-driver/${build_variant}/${revision}/${task_name}/${version}.tar.gz
-        # TODO: Use separate folder for the library once it exists
-#        remote_file: ${project}/${build_variant}/${revision}/${task_name}/${version}.tar.gz
+        remote_file: mongo-php-driver/${build_variant}/${revision}/${task_name}/${version_id}.tar.gz
 
   "fetch extension":
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         bucket: mciuploads
-        # TODO: Use separate folder for the library once it exists
-        remote_file: mongo-php-driver/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz
-#        remote_file: ${project}/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz
+        remote_file: mongo-php-driver/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version_id}.tar.gz
         local_file: build.tar.gz
     - command: archive.targz_extract
       params:

composer.json

@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^12.0",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^9.6.11",
         "rector/rector": "^1.1",
         "squizlabs/php_codesniffer": "^3.7",
         "vimeo/psalm": "^5.13"

src/Collection.php

@@ -78,7 +78,11 @@
 use function array_key_exists;
 use function current;
 use function is_array;
+use function sprintf;
 use function strlen;
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
 
 class Collection
 {
@@ -921,6 +925,8 @@ public function listSearchIndexes(array $options = []): Iterator
      */
     public function mapReduce(JavascriptInterface $map, JavascriptInterface $reduce, string|array|object $out, array $options = []): MapReduceResult
     {
+        @trigger_error(sprintf('The %s method is deprecated and will be removed in a version 2.0.', __METHOD__), E_USER_DEPRECATED);
+
         $hasOutputCollection = ! is_mapreduce_output_inline($out);
 
         // Check if the out option is inline because we will want to coerce a primary read preference if not

src/Model/IndexInfo.php

@@ -89,7 +89,7 @@ public function getName(): string
      */
     public function getNamespace(): string
     {
-        @trigger_error('MongoDB 4.4 drops support for the namespace in indexes, the method "IndexInfo::getNamespace()" will be removed in a future release', E_USER_DEPRECATED);
+        @trigger_error('MongoDB 4.4 drops support for the namespace in indexes, the method "IndexInfo::getNamespace()" will be removed in version 2.0', E_USER_DEPRECATED);
 
         return (string) $this->info['ns'];
     }
@@ -117,7 +117,7 @@ public function is2dSphere(): bool
      */
     public function isGeoHaystack(): bool
     {
-        @trigger_error('MongoDB 5.0 removes support for "geoHaystack" indexes, the method "IndexInfo::isGeoHaystack()" will be removed in a future release', E_USER_DEPRECATED);
+        @trigger_error('MongoDB 5.0 removes support for "geoHaystack" indexes, the method "IndexInfo::isGeoHaystack()" will be removed in version 2.0', E_USER_DEPRECATED);
 
         return array_search('geoHaystack', $this->getKey(), true) !== false;
     }

src/Operation/CreateCollection.php

@@ -228,7 +228,7 @@ public function __construct(private string $databaseName, private string $collec
         }
 
         if (isset($this->options['autoIndexId'])) {
-            trigger_error('The "autoIndexId" option is deprecated and will be removed in a future release', E_USER_DEPRECATED);
+            trigger_error('The "autoIndexId" option is deprecated and will be removed in version 2.0', E_USER_DEPRECATED);
         }
 
         if (isset($this->options['pipeline']) && ! is_pipeline($this->options['pipeline'], true /* allowEmpty */)) {

src/Operation/Find.php

@@ -36,9 +36,6 @@
 use function is_string;
 use function MongoDB\document_to_array;
 use function MongoDB\is_document;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
 
 /**
  * Operation for the find command.
@@ -282,14 +279,6 @@ public function __construct(private string $databaseName, private string $collec
             unset($this->options['readConcern']);
         }
 
-        if (isset($this->options['snapshot'])) {
-            trigger_error('The "snapshot" option is deprecated and will be removed in a future release', E_USER_DEPRECATED);
-        }
-
-        if (isset($this->options['maxScan'])) {
-            trigger_error('The "maxScan" option is deprecated and will be removed in a future release', E_USER_DEPRECATED);
-        }
-
         if (isset($this->options['codec']) && isset($this->options['typeMap'])) {
             throw InvalidArgumentException::cannotCombineCodecAndTypeMap();
         }

tests/Collection/CollectionFunctionalTest.php

@@ -433,7 +433,9 @@ public function testMapReduce(): void
         $reduce = new Javascript('function(key, values) { return Array.sum(values); }');
         $out = ['inline' => 1];
 
-        $result = $this->collection->mapReduce($map, $reduce, $out);
+        $result = $this->assertDeprecated(
+            fn () => $this->collection->mapReduce($map, $reduce, $out),
+        );
 
         $this->assertInstanceOf(MapReduceResult::class, $result);
         $expected = [

tests/GridFS/BucketFunctionalTest.php

@@ -919,8 +919,6 @@ public function testResolveStreamContextForRead(): void
         fclose($stream);
 
         $method = new ReflectionMethod($this->bucket, 'resolveStreamContext');
-        $method->setAccessible(true);
-
         $context = $method->invokeArgs($this->bucket, ['gridfs://bucket/filename', 'rb', []]);
 
         $this->assertIsArray($context);
@@ -935,8 +933,6 @@ public function testResolveStreamContextForRead(): void
     public function testResolveStreamContextForWrite(): void
     {
         $method = new ReflectionMethod($this->bucket, 'resolveStreamContext');
-        $method->setAccessible(true);
-
         $context = $method->invokeArgs($this->bucket, ['gridfs://bucket/filename', 'wb', []]);
 
         $this->assertIsArray($context);

tests/Operation/FindTest.php

@@ -55,24 +55,6 @@ public static function provideInvalidConstructorOptions()
         ]);
     }
 
-    public function testSnapshotOptionIsDeprecated(): void
-    {
-        $this->assertDeprecated(function (): void {
-            new Find($this->getDatabaseName(), $this->getCollectionName(), [], ['snapshot' => true]);
-        });
-
-        $this->assertDeprecated(function (): void {
-            new Find($this->getDatabaseName(), $this->getCollectionName(), [], ['snapshot' => false]);
-        });
-    }
-
-    public function testMaxScanOptionIsDeprecated(): void
-    {
-        $this->assertDeprecated(function (): void {
-            new Find($this->getDatabaseName(), $this->getCollectionName(), [], ['maxScan' => 1]);
-        });
-    }
-
     /** @dataProvider provideInvalidConstructorCursorTypeOptions */
     public function testConstructorCursorTypeOption($cursorType): void
     {

tests/Operation/WatchFunctionalTest.php

@@ -25,6 +25,7 @@
 use MongoDB\Operation\InsertOne;
 use MongoDB\Operation\Watch;
 use MongoDB\Tests\CommandObserver;
+use PHPUnit\Framework\Constraint\ObjectHasProperty;
 use PHPUnit\Framework\ExpectationFailedException;
 use ReflectionClass;
 use stdClass;
@@ -724,10 +725,7 @@ public function testInitialCursorIsNotClosed(): void
         $this->assertNotEquals(0, $changeStream->getCursorId());
 
         $rc = new ReflectionClass(ChangeStream::class);
-        $rp = $rc->getProperty('iterator');
-        $rp->setAccessible(true);
-
-        $iterator = $rp->getValue($changeStream);
+        $iterator = $rc->getProperty('iterator')->getValue($changeStream);
 
         $this->assertInstanceOf('IteratorIterator', $iterator);
 
@@ -1225,7 +1223,6 @@ public function testSessionFreed(): void
 
         $rc = new ReflectionClass($changeStream);
         $rp = $rc->getProperty('resumeCallable');
-        $rp->setAccessible(true);
 
         $this->assertIsCallable($rp->getValue($changeStream));
 
@@ -1282,19 +1279,19 @@ function (array $event) use (&$aggregateCommands): void {
             $aggregateCommands[0]['pipeline'][0]->{'$changeStream'},
             $this->logicalNot(
                 $this->logicalOr(
-                    $this->objectHasAttribute('resumeAfter'),
-                    $this->objectHasAttribute('startAfter'),
-                    $this->objectHasAttribute('startAtOperationTime'),
+                    new ObjectHasProperty('resumeAfter'),
+                    new ObjectHasProperty('startAfter'),
+                    new ObjectHasProperty('startAtOperationTime'),
                 ),
             ),
         );
 
         $this->assertThat(
             $aggregateCommands[1]['pipeline'][0]->{'$changeStream'},
             $this->logicalOr(
-                $this->objectHasAttribute('resumeAfter'),
-                $this->objectHasAttribute('startAfter'),
-                $this->objectHasAttribute('startAtOperationTime'),
+                new ObjectHasProperty('resumeAfter'),
+                new ObjectHasProperty('startAfter'),
+                new ObjectHasProperty('startAtOperationTime'),
             ),
         );
 

tests/TestCase.php

@@ -161,7 +161,7 @@ final public static function provideInvalidStringValues(): array
         return self::wrapValuesForDataProvider(self::getInvalidStringValues());
     }
 
-    protected function assertDeprecated(callable $execution): void
+    protected function assertDeprecated(callable $execution)
     {
         $errors = [];
 
@@ -170,12 +170,14 @@ protected function assertDeprecated(callable $execution): void
         }, E_USER_DEPRECATED | E_DEPRECATED);
 
         try {
-            call_user_func($execution);
+            $result = call_user_func($execution);
         } finally {
             restore_error_handler();
         }
 
         $this->assertCount(1, $errors);
+
+        return $result;
     }
 
     protected static function createOptionDataProvider(array $options): array