Improve mirror callbacks

Author: abnegate

src/Database/Mirror.php

@@ -589,17 +589,14 @@ public function createDocuments(
         array $documents,
         int $batchSize = self::INSERT_BATCH_SIZE,
         ?callable $onNext = null,
+        ?callable $onError = null,
     ): int {
-        $modified = 0;
-
-        $this->source->createDocuments(
+        $modified = $this->source->createDocuments(
             $collection,
             $documents,
             $batchSize,
-            function ($doc) use ($onNext, &$modified) {
-                $onNext && $onNext($doc);
-                $modified++;
-            },
+            $onNext,
+            $onError,
         );
 
         if (
@@ -638,7 +635,6 @@ function ($doc) use ($onNext, &$modified) {
                     $collection,
                     $clones,
                     $batchSize,
-                    null,
                 )
             );
 
@@ -715,18 +711,13 @@ public function updateDocuments(
         ?callable $onNext = null,
         ?callable $onError = null,
     ): int {
-        $modified = 0;
-
-        $this->source->updateDocuments(
+        $modified = $this->source->updateDocuments(
             $collection,
             $updates,
             $queries,
             $batchSize,
-            function ($doc, $old) use ($onNext, &$modified) {
-                $onNext && $onNext($doc, $old);
-                $modified++;
-            },
-            $onError
+            $onNext,
+            $onError,
         );
 
         if (
@@ -754,14 +745,13 @@ function ($doc, $old) use ($onNext, &$modified) {
                 );
             }
 
-            $modified = $this->destination->withPreserveDates(
+            $this->destination->withPreserveDates(
                 fn () =>
                 $this->destination->updateDocuments(
                     $collection,
                     $clone,
                     $queries,
                     $batchSize,
-                    null,
                 )
             );
 
@@ -788,15 +778,12 @@ public function upsertDocuments(
         ?callable $onNext = null,
         ?callable $onError = null,
     ): int {
-        $modified = 0;
-        $this->source->upsertDocuments(
+        $modified = $this->source->upsertDocuments(
             $collection,
             $documents,
             $batchSize,
-            function ($doc, $old) use ($onNext, &$modified) {
-                $onNext && $onNext($doc, $old);
-                $modified++;
-            }
+            $onNext,
+            $onError,
         );
 
         if (
@@ -829,13 +816,12 @@ function ($doc, $old) use ($onNext, &$modified) {
                 $clones[] = $clone;
             }
 
-            $modified = $this->destination->withPreserveDates(
+            $this->destination->withPreserveDates(
                 fn () =>
                 $this->destination->upsertDocuments(
                     $collection,
                     $clones,
                     $batchSize,
-                    null,
                 )
             );
 
@@ -850,8 +836,9 @@ function ($doc, $old) use ($onNext, &$modified) {
                 }
             }
         } catch (\Throwable $err) {
-            $this->logError('createDocuments', $err);
+            $this->logError('upsertDocuments', $err);
         }
+
         return $modified;
     }
 
@@ -905,17 +892,12 @@ public function deleteDocuments(
         ?callable $onNext = null,
         ?callable $onError = null,
     ): int {
-        $modified = 0;
-
-        $this->source->deleteDocuments(
+        $modified = $this->source->deleteDocuments(
             $collection,
             $queries,
             $batchSize,
-            function ($doc, $old) use (&$modified, $onNext) {
-                $onNext && $onNext($doc, $old);
-                $modified++;
-            },
-            $onError
+            $onNext,
+            $onError,
         );
 
         if (
@@ -940,11 +922,10 @@ function ($doc, $old) use (&$modified, $onNext) {
                 );
             }
 
-            $modified = $this->destination->deleteDocuments(
+            $this->destination->deleteDocuments(
                 $collection,
                 $queries,
                 $batchSize,
-                null,
             );
 
             foreach ($this->writeFilters as $filter) {