verify that given filter exists - fixing null exception

KaulSe · KaulSe · commit 6fb27ae057dc · 2022-12-08T01:46:47.000+01:00
diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php
@@ -115,7 +115,11 @@ public function setFilterDefaults(): void
 
     public function getAppliedFilters(): array
     {
-        return $this->{$this->getTableName()}['filters'] ?? [];
+        $validFilterKeys = collect($this->getFilters())->map(fn($filter) => $filter->getKey())->toArray();
+
+        return collect($this->{$this->getTableName()}['filters'] ?? [])
+            ->filter(fn ($value, $key) => in_array($key, $validFilterKeys, true))
+            ->toArray();
     }
 
     public function hasAppliedFiltersWithValues(): bool

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ public function setFilterDefaults(): void`
`115`	`115`
`116`	`116`	`public function getAppliedFilters(): array`
`117`	`117`	`{`
`118`		`- return $this->{$this->getTableName()}['filters'] ?? [];`
	`118`	`+ $validFilterKeys = collect($this->getFilters())->map(fn($filter) => $filter->getKey())->toArray();`
	`119`	`+`
	`120`	`+ return collect($this->{$this->getTableName()}['filters'] ?? [])`
	`121`	`+ ->filter(fn ($value, $key) => in_array($key, $validFilterKeys, true))`
	`122`	`+ ->toArray();`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`public function hasAppliedFiltersWithValues(): bool`