Skip to content

Commit 04dc64f

Browse files
committed
Fix broken typehints
1 parent 6f25fcc commit 04dc64f

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

phpstan.neon

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ parameters:
2727
- src/Traits/Helpers/QueryHelpers.php
2828
- src/Views/Columns/Traits/HasSlot.php
2929
- src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
30-
- identifier: instanceof.alwaysTrue
31-
paths:
32-
- src/Views/Columns/Traits/HasFooter.php
33-
- src/Views/Columns/Traits/HasSecondaryHeader.php
3430
- identifier: function.alreadyNarrowedType
3531
paths:
3632
- src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
@@ -41,3 +37,6 @@ parameters:
4137
- src/Views/Filters/Traits/HasOptions.php
4238
- src/Views/Traits/Core/HasTheme.php
4339
- src/Views/Traits/Core/HasView.php
40+
- identifier: unset.possiblyHookedProperty
41+
paths:
42+
- src/Traits/Configuration/CollapsingColumnConfiguration.php

src/DataTransferObjects/Filters/FilterPillData.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getPillValue(): array|string|null
4343

4444
public function getHasCustomPillBlade(): bool
4545
{
46-
return $this->hasCustomPillBlade ?? false;
46+
return $this->hasCustomPillBlade;
4747
}
4848

4949
public function getCustomPillBlade(): ?string
@@ -53,32 +53,32 @@ public function getCustomPillBlade(): ?string
5353

5454
public function getCustomResetButtonAttributes(): array
5555
{
56-
return $this->customResetButtonAttributes ?? [];
56+
return $this->customResetButtonAttributes;
5757
}
5858

5959
public function getIsAnExternalLivewireFilter(): int
6060
{
61-
return intval($this->isAnExternalLivewireFilter ?? 0);
61+
return intval($this->isAnExternalLivewireFilter);
6262
}
6363

6464
public function getSeparator(): string
6565
{
66-
return $this->separator ?? ', ';
66+
return $this->separator;
6767
}
6868

6969
public function shouldUsePillsAsHtml(): int
7070
{
71-
return intval($this->renderPillsAsHtml ?? 0);
71+
return intval($this->renderPillsAsHtml);
7272
}
7373

7474
public function shouldUsePillsTitleAsHtml(): int
7575
{
76-
return intval($this->renderPillsTitleAsHtml ?? 0);
76+
return intval($this->renderPillsTitleAsHtml);
7777
}
7878

7979
public function shouldWatchForEvents(): int
8080
{
81-
return intval($this->watchForEvents ?? 0);
81+
return intval($this->watchForEvents);
8282
}
8383

8484
public function isPillValueAnArray(): bool

src/DataTransferObjects/Filters/StandardFilterPillData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getPillValue(): string
2828

2929
public function shouldUsePillsAsHtml(): bool
3030
{
31-
return $this->renderPillsAsHtml ?? false;
31+
return $this->renderPillsAsHtml;
3232
}
3333

3434
public function toArray(): array

src/Views/Columns/Traits/HasFooter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function getNewFooterContents(mixed $rows): string|HtmlString
111111

112112
public function getFooterFilter(?Filter $filter, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string
113113
{
114-
if ($filter !== null && $filter instanceof Filter) {
114+
if ($filter !== null) {
115115
return $filter->setFilterPosition('footer')->setGenericDisplayData($filterGenericData)->render();
116116
} else {
117117
throw new DataTableConfigurationException('The footer callback must be a closure, filter object, or filter key if using footerFilter().');

src/Views/Columns/Traits/HasSecondaryHeader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function getNewSecondaryHeaderContents(mixed $rows): string|HtmlString
108108

109109
public function getSecondaryHeaderFilter(?Filter $filter, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string
110110
{
111-
if ($filter !== null && $filter instanceof Filter) {
111+
if ($filter !== null) {
112112
return $filter->setFilterPosition('header')->setGenericDisplayData($filterGenericData)->render();
113113
} else {
114114
throw new DataTableConfigurationException('The secondary header callback must be a closure, filter object, or filter key if using secondaryHeaderFilter().');

src/Views/Columns/Traits/Helpers/LivewireComponentColumnHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected function implodeAttributes(array $attributes): string
7878
/**
7979
* getBlade Render
8080
*/
81-
protected function getBlade(array $attributes, string $key)
81+
protected function getBlade(array $attributes, string $key): string
8282
{
8383
return Blade::render(
8484
'<livewire:dynamic-component :component="$component" :key="$key" '.$this->implodeAttributes($attributes).' />',

0 commit comments

Comments
 (0)