Revert BC break on Collection::aggregate and watch

Author: GromNaN

psalm-baseline.xml

@@ -223,11 +223,6 @@
     <MixedPropertyTypeCoercion>
       <code><![CDATA[$options['builderEncoder'] ?? new BuilderEncoder()]]></code>
     </MixedPropertyTypeCoercion>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[$pipeline]]></code>
-      <code><![CDATA[$pipeline]]></code>
-      <code><![CDATA[$pipeline]]></code>
-    </PossiblyInvalidArgument>
   </file>
   <file src="src/Command/ListCollections.php">
     <MixedAssignment>

src/Collection.php

@@ -23,7 +23,6 @@
 use MongoDB\BSON\JavascriptInterface;
 use MongoDB\BSON\PackedArray;
 use MongoDB\Builder\BuilderEncoder;
-use MongoDB\Builder\Pipeline;
 use MongoDB\Codec\DocumentCodec;
 use MongoDB\Codec\Encoder;
 use MongoDB\Driver\CursorInterface;
@@ -222,9 +221,8 @@ public function __toString()
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
      */
-    public function aggregate(array|Pipeline $pipeline, array $options = [])
+    public function aggregate(array $pipeline, array $options = [])
     {
-        $pipeline = $this->builderEncoder->encodeIfSupported($pipeline);
         $hasWriteStage = is_last_pipeline_operator_write($pipeline);
 
         $options = $this->inheritReadPreference($options);
@@ -1098,9 +1096,8 @@ public function updateSearchIndex(string $name, array|object $definition, array
      * @return ChangeStream
      * @throws InvalidArgumentException for parameter/option parsing errors
      */
-    public function watch(array|Pipeline $pipeline = [], array $options = [])
+    public function watch(array $pipeline = [], array $options = [])
     {
-        $pipeline = $this->builderEncoder->encodeIfSupported($pipeline);
         $options = $this->inheritReadOptions($options);
         $options = $this->inheritCodecOrTypeMap($options);
 

tests/Collection/BuilderCollectionFunctionalTest.php

@@ -2,7 +2,6 @@
 
 namespace MongoDB\Tests\Collection;
 
-use MongoDB\Builder\Expression;
 use MongoDB\Builder\Pipeline;
 use MongoDB\Builder\Query;
 use MongoDB\Builder\Stage;
@@ -18,15 +17,7 @@ public function setUp(): void
 
     public function testAggregate(): void
     {
-        $this->collection->insertMany([['x' => 10], ['x' => 10], ['x' => 10]]);
-        $pipeline = new Pipeline(
-            Stage::bucketAuto(
-                groupBy: Expression::intFieldPath('x'),
-                buckets: 2,
-            ),
-        );
-        $results = $this->collection->aggregate($pipeline)->toArray();
-        $this->assertCount(2, $results);
+        $this->markTestSkipped('Not supported yet');
     }
 
     public function testBulkWriteDeleteMany(): void
@@ -254,21 +245,6 @@ public function testUpdateManyWithPipeline(): void
 
     public function testWatch(): void
     {
-        $this->skipIfChangeStreamIsNotSupported();
-
-        if ($this->isShardedCluster()) {
-            $this->markTestSkipped('Test does not apply on sharded clusters: need more than a single getMore call on the change stream.');
-        }
-
-        $pipeline = new Pipeline(
-            Stage::match(operationType: Query::eq('insert')),
-        );
-        $changeStream = $this->collection->watch($pipeline);
-        $changeStream->rewind();
-        $this->assertNull($changeStream->current());
-        $this->collection->insertOne(['x' => 3]);
-        $changeStream->next();
-        $this->assertTrue($changeStream->valid());
-        $this->assertEquals('insert', $changeStream->current()->operationType);
+        $this->markTestSkipped('Not supported yet');
     }
 }