Using is_countable to avoid count with null

spatie · Sep 20, 2023 · 4ee229e · 4ee229e
1 parent 26c70be
commit 4ee229e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Payloads/ModelPayload.php b/src/Payloads/ModelPayload.php
@@ -34,7 +34,7 @@ public function getContent(): array
 
         $relations = $this->model->relationsToArray();
 
-        if (count($relations)) {
+        if (is_countable($relations) ? count($relations) : 0) {
             $content['relations'] = ArgumentConverter::convertToPrimitive($relations);
         }
 

diff --git a/tests/RayTest.php b/tests/RayTest.php
@@ -126,7 +126,7 @@
     expect($payloads[0]['payloads'][0]['content']['values']['APP_ENV'])->toEqual('local');
     expect($payloads[0]['payloads'][0]['content']['values']['DB_DATABASE'])->toEqual('ray_test');
     expect($payloads[0]['payloads'][0]['content']['values']['SESSION_LIFETIME'])->toEqual('120');
-    expect(count($payloads[0]['payloads'][0]['content']['values']))->toBeGreaterThanOrEqual(17);
+    expect(is_countable($payloads[0]['payloads'][0]['content']['values']) ? count($payloads[0]['payloads'][0]['content']['values']) : 0)->toBeGreaterThanOrEqual(17);
 });
 
 it('sends a filtered environment payload', function () {