[10.x] Fix Accepting nullable Parameters, updated doc block, and null pointer exception handling in batchable trait (#50209)

saMahmoudzadeh · taylorotwell · web-flow · commit 4ebce1e453d6 · 2024-02-23T09:38:25.000-06:00
* fix(Reachable Trait): fix parameters type and doc block in With withFakeBatch method

* fix(Reachable Trait): fix null pointer exception

* fix(Batchable Trait): fix parameters type and doc block in With withFakeBatch method

* fix(Batchable Trait): fix null pointer exception

* Update Batchable.php

---------

Co-authored-by: Taylor Otwell &lt;taylor@laravel.com&gt;
diff --git a/src/Illuminate/Bus/Batchable.php b/src/Illuminate/Bus/Batchable.php
@@ -35,7 +35,7 @@ public function batch()
         }
 
         if ($this->batchId) {
-            return Container::getInstance()->make(BatchRepository::class)->find($this->batchId);
+            return Container::getInstance()->make(BatchRepository::class)?->find($this->batchId);
         }
     }
 
@@ -74,7 +74,7 @@ public function withBatchId(string $batchId)
      * @param  int  $failedJobs
      * @param  array  $failedJobIds
      * @param  array  $options
-     * @param  \Carbon\CarbonImmutable  $createdAt
+     * @param  \Carbon\CarbonImmutable|null  $createdAt
      * @param  \Carbon\CarbonImmutable|null  $cancelledAt
      * @param  \Carbon\CarbonImmutable|null  $finishedAt
      * @return array{0: $this, 1: \Illuminate\Support\Testing\Fakes\BatchFake}
@@ -86,7 +86,7 @@ public function withFakeBatch(string $id = '',
                                   int $failedJobs = 0,
                                   array $failedJobIds = [],
                                   array $options = [],
-                                  CarbonImmutable $createdAt = null,
+                                  ?CarbonImmutable $createdAt = null,
                                   ?CarbonImmutable $cancelledAt = null,
                                   ?CarbonImmutable $finishedAt = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function batch()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if ($this->batchId) {`
`38`		`- return Container::getInstance()->make(BatchRepository::class)->find($this->batchId);`
	`38`	`+ return Container::getInstance()->make(BatchRepository::class)?->find($this->batchId);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -74,7 +74,7 @@ public function withBatchId(string $batchId)`
`74`	`74`	`* @param int $failedJobs`
`75`	`75`	`* @param array $failedJobIds`
`76`	`76`	`* @param array $options`
`77`		`- * @param \Carbon\CarbonImmutable $createdAt`
	`77`	`+ * @param \Carbon\CarbonImmutable\|null $createdAt`
`78`	`78`	`* @param \Carbon\CarbonImmutable\|null $cancelledAt`
`79`	`79`	`* @param \Carbon\CarbonImmutable\|null $finishedAt`
`80`	`80`	`* @return array{0: $this, 1: \Illuminate\Support\Testing\Fakes\BatchFake}`
`@@ -86,7 +86,7 @@ public function withFakeBatch(string $id = '',`
`86`	`86`	`int $failedJobs = 0,`
`87`	`87`	`array $failedJobIds = [],`
`88`	`88`	`array $options = [],`
`89`		`- CarbonImmutable $createdAt = null,`
	`89`	`+ ?CarbonImmutable $createdAt = null,`
`90`	`90`	`?CarbonImmutable $cancelledAt = null,`
`91`	`91`	`?CarbonImmutable $finishedAt = null)`
`92`	`92`	`{`