Re-order BulkWriteCommandBuilder methods to satisfy PedantryTest

Author: jmikola

src/BulkWriteCommandBuilder.php

@@ -67,27 +67,7 @@ public static function createWithCollection(Collection $collection, array $optio
         );
     }
 
-    public function withCollection(Collection $collection): self
-    {
-        /* Prohibit mixing Collections associated with different Manager
-         * objects. This is not technically necessary, since the Collection is
-         * only used to derive a namespace and encoding options; however, it
-         * may prevent a user from inadvertently mixing writes destined for
-         * different deployments. */
-        if ($this->manager !== $collection->getManager()) {
-            throw new InvalidArgumentException('$collection is associated with a different MongoDB\Driver\Manager');
-        }
-
-        return new self(
-            $this->bulkWriteCommand,
-            $this->manager,
-            $collection->getNamespace(),
-            $collection->getBuilderEncoder(),
-            $collection->getCodec(),
-        );
-    }
-
-    public function deleteOne(array|object $filter, ?array $options = null): self
+    public function deleteMany(array|object $filter, ?array $options = null): self
     {
         $filter = $this->builderEncoder->encodeIfSupported($filter);
 
@@ -99,12 +79,12 @@ public function deleteOne(array|object $filter, ?array $options = null): self
             throw InvalidArgumentException::expectedDocumentOrStringType('"hint" option', $options['hint']);
         }
 
-        $this->bulkWriteCommand->deleteOne($this->namespace, $filter, $options);
+        $this->bulkWriteCommand->deleteMany($this->namespace, $filter, $options);
 
         return $this;
     }
 
-    public function deleteMany(array|object $filter, ?array $options = null): self
+    public function deleteOne(array|object $filter, ?array $options = null): self
     {
         $filter = $this->builderEncoder->encodeIfSupported($filter);
 
@@ -116,7 +96,7 @@ public function deleteMany(array|object $filter, ?array $options = null): self
             throw InvalidArgumentException::expectedDocumentOrStringType('"hint" option', $options['hint']);
         }
 
-        $this->bulkWriteCommand->deleteMany($this->namespace, $filter, $options);
+        $this->bulkWriteCommand->deleteOne($this->namespace, $filter, $options);
 
         return $this;
     }
@@ -175,7 +155,7 @@ public function replaceOne(array|object $filter, array|object $replacement, ?arr
         return $this;
     }
 
-    public function updateOne(array|object $filter, array|object $update, ?array $options = null): self
+    public function updateMany(array|object $filter, array|object $update, ?array $options = null): self
     {
         $filter = $this->builderEncoder->encodeIfSupported($filter);
         $update = $this->builderEncoder->encodeIfSupported($update);
@@ -196,20 +176,16 @@ public function updateOne(array|object $filter, array|object $update, ?array $op
             throw InvalidArgumentException::expectedDocumentOrStringType('"hint" option', $options['hint']);
         }
 
-        if (isset($options['sort']) && ! is_document($options['sort'])) {
-            throw InvalidArgumentException::expectedDocumentType('"sort" option', $options['sort']);
-        }
-
         if (isset($options['upsert']) && ! is_bool($options['upsert'])) {
             throw InvalidArgumentException::invalidType('"upsert" option', $options['upsert'], 'boolean');
         }
 
-        $this->bulkWriteCommand->updateOne($this->namespace, $filter, $update, $options);
+        $this->bulkWriteCommand->updateMany($this->namespace, $filter, $update, $options);
 
         return $this;
     }
 
-    public function updateMany(array|object $filter, array|object $update, ?array $options = null): self
+    public function updateOne(array|object $filter, array|object $update, ?array $options = null): self
     {
         $filter = $this->builderEncoder->encodeIfSupported($filter);
         $update = $this->builderEncoder->encodeIfSupported($update);
@@ -230,12 +206,36 @@ public function updateMany(array|object $filter, array|object $update, ?array $o
             throw InvalidArgumentException::expectedDocumentOrStringType('"hint" option', $options['hint']);
         }
 
+        if (isset($options['sort']) && ! is_document($options['sort'])) {
+            throw InvalidArgumentException::expectedDocumentType('"sort" option', $options['sort']);
+        }
+
         if (isset($options['upsert']) && ! is_bool($options['upsert'])) {
             throw InvalidArgumentException::invalidType('"upsert" option', $options['upsert'], 'boolean');
         }
 
-        $this->bulkWriteCommand->updateMany($this->namespace, $filter, $update, $options);
+        $this->bulkWriteCommand->updateOne($this->namespace, $filter, $update, $options);
 
         return $this;
     }
+
+    public function withCollection(Collection $collection): self
+    {
+        /* Prohibit mixing Collections associated with different Manager
+         * objects. This is not technically necessary, since the Collection is
+         * only used to derive a namespace and encoding options; however, it
+         * may prevent a user from inadvertently mixing writes destined for
+         * different deployments. */
+        if ($this->manager !== $collection->getManager()) {
+            throw new InvalidArgumentException('$collection is associated with a different MongoDB\Driver\Manager');
+        }
+
+        return new self(
+            $this->bulkWriteCommand,
+            $this->manager,
+            $collection->getNamespace(),
+            $collection->getBuilderEncoder(),
+            $collection->getCodec(),
+        );
+    }
 }