Updated table name resolver to return null.

tomshaw · Feb 11, 2024 · c1eef14 · c1eef14
1 parent 80fe64d
commit c1eef14
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -336,17 +336,17 @@ parameters:
 			path: src/DataExport.php
 
 		-
-			message: "#^Access to an undefined property Illuminate\\\\Database\\\\Eloquent\\\\Builder\\:\\:\\$from\\.$#"
+			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Pagination\\\\LengthAwarePaginator\\:\\:getCollection\\(\\)\\.$#"
 			count: 1
 			path: src/DataSource.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Pagination\\\\LengthAwarePaginator\\:\\:getCollection\\(\\)\\.$#"
+			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Pagination\\\\LengthAwarePaginator\\:\\:setCollection\\(\\)\\.$#"
 			count: 1
 			path: src/DataSource.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Pagination\\\\LengthAwarePaginator\\:\\:setCollection\\(\\)\\.$#"
+			message: "#^Call to function is_null\\(\\) with array will always evaluate to false\\.$#"
 			count: 1
 			path: src/DataSource.php
 

diff --git a/src/DataSource.php b/src/DataSource.php
@@ -69,6 +69,10 @@ public function filter(array $filters): void
                 return [$this->resolveTableNames($key) => $value];
             })->toArray();
 
+            if (is_null($values)) {
+                continue;
+            }
+
             match ($type) {
                 'text' => $this->handleText($values),
                 'number' => $this->handleNumber($values),
@@ -84,7 +88,7 @@ public function filter(array $filters): void
         }
     }
 
-    private function resolveTableNames($columnName): string
+    private function resolveTableNames($columnName): ?string
     {
         $baseTable = $this->query->getModel()->getTable();
 
@@ -102,7 +106,7 @@ private function resolveTableNames($columnName): string
             }
         }
 
-        return $this->query->from.'.'.$columnName;
+        return null;
     }
 
     private function handleText(array $values): void