Skip to content

Commit 741343b

Browse files
committed
Minor tweaks to Footer/SecondaryHeader to ensure presence of callback prior to executing
1 parent 04dc64f commit 741343b

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

src/Views/Columns/Traits/HasFooter.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,20 @@ public function getFooterCallback()
5353

5454
public function footerCallbackIsString(): bool
5555
{
56+
if(!$this->hasFooterCallback())
57+
{
58+
return false;
59+
}
5660
return is_string($this->getFooterCallback());
5761
}
5862

5963
public function footerCallbackIsFilter(): bool
6064
{
65+
if(!$this->hasFooterCallback())
66+
{
67+
return false;
68+
}
69+
6170
$callback = $this->getFooterCallback();
6271

6372
return $callback instanceof Filter;
@@ -66,9 +75,10 @@ public function footerCallbackIsFilter(): bool
6675
public function getFooterContents(mixed $rows, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string|HtmlString
6776
{
6877
$value = null;
69-
$callback = $this->getFooterCallback();
70-
7178
if ($this->hasFooterCallback()) {
79+
80+
$callback = $this->getFooterCallback();
81+
7282
if (is_callable($callback)) {
7383
$value = call_user_func($callback, $rows);
7484

src/Views/Columns/Traits/HasSecondaryHeader.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,21 @@ public function getSecondaryHeaderCallback(): mixed
5050

5151
public function secondaryHeaderCallbackIsString(): bool
5252
{
53+
if(!$this->hasSecondaryHeaderCallback())
54+
{
55+
return false;
56+
}
57+
5358
return is_string($this->getSecondaryHeaderCallback());
5459
}
5560

5661
public function secondaryHeaderCallbackIsFilter(): bool
5762
{
63+
if(!$this->hasSecondaryHeaderCallback())
64+
{
65+
return false;
66+
}
67+
5868
$callback = $this->getSecondaryHeaderCallback();
5969

6070
return $callback instanceof Filter;
@@ -63,9 +73,11 @@ public function secondaryHeaderCallbackIsFilter(): bool
6373
public function getSecondaryHeaderContents(mixed $rows, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string|HtmlString
6474
{
6575
$value = null;
66-
$callback = $this->getSecondaryHeaderCallback();
6776

6877
if ($this->hasSecondaryHeaderCallback()) {
78+
79+
$callback = $this->getSecondaryHeaderCallback();
80+
6981
if (is_callable($callback)) {
7082
$value = call_user_func($callback, $rows);
7183
if ($this->isHtml()) {

0 commit comments

Comments
 (0)