Import Laravel tests

Author: GromNaN

src/Bus/MongoBatchRepository.php

@@ -17,10 +17,13 @@
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Laravel\Collection;
 use MongoDB\Laravel\Connection;
+use MongoDB\Operation\FindOneAndUpdate;
 use Override;
 
 use function date_default_timezone_get;
 use function is_string;
+use function serialize;
+use function unserialize;
 
 // Extending DatabaseBatchRepository is necessary so methods pruneUnfinished and pruneCancelled
 // are called by PruneBatchesCommand
@@ -68,19 +71,7 @@ public function find(string $batchId): ?Batch
             ],
         );
 
-        return $this->factory->make(
-            $this,
-            $batch['_id'],
-            $batch['name'],
-            $batch['total_jobs'],
-            $batch['pending_jobs'],
-            $batch['failed_jobs'],
-            $batch['failed_job_ids'],
-            $batch['options'],
-            $this->toCarbon($batch['created_at']),
-            $this->toCarbon($batch['cancelled_at']),
-            $this->toCarbon($batch['finished_at']),
-        );
+        return $batch ? $this->toBatch($batch) : null;
     }
 
     #[Override]
@@ -92,7 +83,8 @@ public function store(PendingBatch $batch): Batch
             'pending_jobs' => 0,
             'failed_jobs' => 0,
             'failed_job_ids' => [],
-            'options' => $batch->options,
+            // Serialization is required for Closures
+            'options' => serialize($batch->options),
             'created_at' => new UTCDateTime(Carbon::now()),
             'cancelled_at' => null,
             'finished_at' => null,
@@ -126,11 +118,12 @@ public function decrementPendingJobs(string $batchId, string $jobId): UpdatedBat
         $values = $this->collection->findOneAndUpdate(
             ['_id' => $batchId],
             [
-                '$dec' => ['pending_jobs' => 1],
+                '$inc' => ['pending_jobs' => -1],
                 '$pull' => ['failed_job_ids' => $jobId],
             ],
             [
                 'projection' => ['pending_jobs' => 1, 'failed_jobs' => 1],
+                'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER,
             ],
         );
 
@@ -147,11 +140,12 @@ public function incrementFailedJobs(string $batchId, string $jobId): UpdatedBatc
         $values = $this->collection->findOneAndUpdate(
             ['_id' => $batchId],
             [
-                '$inc' => ['pending_jobs' => 1],
+                '$inc' => ['failed_jobs' => 1],
                 '$push' => ['failed_job_ids' => $jobId],
             ],
             [
                 'projection' => ['pending_jobs' => 1, 'failed_jobs' => 1],
+                'returnDocument' => FindOneAndUpdate::RETURN_DOCUMENT_AFTER,
             ],
         );
 
@@ -251,16 +245,16 @@ protected function toBatch($batch): Batch
     {
         return $this->factory->make(
             $this,
-            $batch->id,
-            $batch->name,
-            $batch->total_jobs,
-            $batch->pending_jobs,
-            $batch->failed_jobs,
-            $batch->failed_job_ids,
-            $batch->options,
-            $this->toCarbon($batch->created_at),
-            $this->toCarbon($batch->cancelled_at),
-            $this->toCarbon($batch->finished_at),
+            $batch['_id'],
+            $batch['name'],
+            $batch['total_jobs'],
+            $batch['pending_jobs'],
+            $batch['failed_jobs'],
+            $batch['failed_job_ids'],
+            unserialize($batch['options']),
+            $this->toCarbon($batch['created_at']),
+            $this->toCarbon($batch['cancelled_at']),
+            $this->toCarbon($batch['finished_at']),
         );
     }
 

tests/Bus/Fixtures/ChainHeadJob.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Bus\Fixtures;
+
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class ChainHeadJob implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use Batchable;
+}

tests/Bus/Fixtures/SecondTestJob.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Bus\Fixtures;
+
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class SecondTestJob implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use Batchable;
+}

tests/Bus/Fixtures/ThirdTestJob.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Bus\Fixtures;
+
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class ThirdTestJob implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use Batchable;
+}