From f27cca7f0941753f36063e9d5ee44c9643dd4d35 Mon Sep 17 00:00:00 2001 From: paulwer Date: Mon, 30 Jan 2023 12:08:39 +0100 Subject: [PATCH] default value for sort input & fixes for strlen --- app/Filters/BankIntegrationFilters.php | 2 +- app/Filters/BankTransactionFilters.php | 2 +- app/Filters/BankTransactionRuleFilters.php | 2 +- app/Filters/ClientFilters.php | 4 ++-- app/Filters/CompanyGatewayFilters.php | 2 +- app/Filters/CreditFilters.php | 2 +- app/Filters/DesignFilters.php | 2 +- app/Filters/ExpenseCategoryFilters.php | 2 +- app/Filters/ExpenseFilters.php | 2 +- app/Filters/PaymentFilters.php | 2 +- app/Filters/PaymentTermFilters.php | 2 +- app/Filters/ProductFilters.php | 2 +- app/Filters/ProjectFilters.php | 2 +- app/Filters/PurchaseOrderFilters.php | 2 +- app/Filters/QuoteFilters.php | 2 +- app/Filters/RecurringExpenseFilters.php | 2 +- app/Filters/RecurringInvoiceFilters.php | 2 +- app/Filters/RecurringQuoteFilters.php | 2 +- app/Filters/SubscriptionFilters.php | 2 +- app/Filters/SystemLogFilters.php | 10 +++++----- app/Filters/TaskFilters.php | 2 +- app/Filters/TaskStatusFilters.php | 2 +- app/Filters/TaxRateFilters.php | 2 +- app/Filters/TokenFilters.php | 2 +- app/Filters/UserFilters.php | 5 +++-- app/Filters/VendorFilters.php | 2 +- app/Filters/WebhookFilters.php | 2 +- 27 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php index 95646a3f0..1932b0995 100644 --- a/app/Filters/BankIntegrationFilters.php +++ b/app/Filters/BankIntegrationFilters.php @@ -91,7 +91,7 @@ class BankIntegrationFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php index 20aeed293..4830277be 100644 --- a/app/Filters/BankTransactionFilters.php +++ b/app/Filters/BankTransactionFilters.php @@ -124,7 +124,7 @@ class BankTransactionFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php index 5cfe21f7e..ce8d1c58d 100644 --- a/app/Filters/BankTransactionRuleFilters.php +++ b/app/Filters/BankTransactionRuleFilters.php @@ -62,7 +62,7 @@ class BankTransactionRuleFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php index 9278ff2a3..0c89b7e44 100644 --- a/app/Filters/ClientFilters.php +++ b/app/Filters/ClientFilters.php @@ -60,7 +60,7 @@ class ClientFilters extends QueryFilters { $parts = explode(':', $balance); - if (! is_array($parts)) { + if (!is_array($sort_col) || count($sort_col) != 2) { return $this->builder; } @@ -139,7 +139,7 @@ class ClientFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/CompanyGatewayFilters.php b/app/Filters/CompanyGatewayFilters.php index 14656aa7d..fd7ec9c5f 100644 --- a/app/Filters/CompanyGatewayFilters.php +++ b/app/Filters/CompanyGatewayFilters.php @@ -43,7 +43,7 @@ class CompanyGatewayFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php index c1f1f89cf..b95e18b14 100644 --- a/app/Filters/CreditFilters.php +++ b/app/Filters/CreditFilters.php @@ -100,7 +100,7 @@ class CreditFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/DesignFilters.php b/app/Filters/DesignFilters.php index 9fcd17677..3985fb6a1 100644 --- a/app/Filters/DesignFilters.php +++ b/app/Filters/DesignFilters.php @@ -44,7 +44,7 @@ class DesignFilters extends QueryFilters * * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/ExpenseCategoryFilters.php b/app/Filters/ExpenseCategoryFilters.php index 9dd9c54d5..3ed24beac 100644 --- a/app/Filters/ExpenseCategoryFilters.php +++ b/app/Filters/ExpenseCategoryFilters.php @@ -41,7 +41,7 @@ class ExpenseCategoryFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php index cb2fa3181..e04cc216e 100644 --- a/app/Filters/ExpenseFilters.php +++ b/app/Filters/ExpenseFilters.php @@ -147,7 +147,7 @@ class ExpenseFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php index e51f0cbfe..f3c21072d 100644 --- a/app/Filters/PaymentFilters.php +++ b/app/Filters/PaymentFilters.php @@ -77,7 +77,7 @@ class PaymentFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/PaymentTermFilters.php b/app/Filters/PaymentTermFilters.php index dea2ab363..26400394c 100644 --- a/app/Filters/PaymentTermFilters.php +++ b/app/Filters/PaymentTermFilters.php @@ -42,7 +42,7 @@ class PaymentTermFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/ProductFilters.php b/app/Filters/ProductFilters.php index 03dc74f15..5357073f3 100644 --- a/app/Filters/ProductFilters.php +++ b/app/Filters/ProductFilters.php @@ -58,7 +58,7 @@ class ProductFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php index fb32fd691..c15454644 100644 --- a/app/Filters/ProjectFilters.php +++ b/app/Filters/ProjectFilters.php @@ -53,7 +53,7 @@ class ProjectFilters extends QueryFilters * @param string sort formatted as column|asc * @return Illuminate\Eloquent\Query\Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php index 7b766ca92..7fb0c7594 100644 --- a/app/Filters/PurchaseOrderFilters.php +++ b/app/Filters/PurchaseOrderFilters.php @@ -115,7 +115,7 @@ class PurchaseOrderFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php index 9c87a2b72..23bb09ba8 100644 --- a/app/Filters/QuoteFilters.php +++ b/app/Filters/QuoteFilters.php @@ -126,7 +126,7 @@ class QuoteFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php index ffd82427e..f8e0c2ba6 100644 --- a/app/Filters/RecurringExpenseFilters.php +++ b/app/Filters/RecurringExpenseFilters.php @@ -55,7 +55,7 @@ class RecurringExpenseFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php index 0291200b4..07884685e 100644 --- a/app/Filters/RecurringInvoiceFilters.php +++ b/app/Filters/RecurringInvoiceFilters.php @@ -98,7 +98,7 @@ class RecurringInvoiceFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php index b551c5eba..eb9d593aa 100644 --- a/app/Filters/RecurringQuoteFilters.php +++ b/app/Filters/RecurringQuoteFilters.php @@ -54,7 +54,7 @@ class RecurringQuoteFilters extends QueryFilters * @param string sort formatted as column|asc * @return Illuminate\Database\Eloquent\Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/SubscriptionFilters.php b/app/Filters/SubscriptionFilters.php index e8f137558..d9722e46c 100644 --- a/app/Filters/SubscriptionFilters.php +++ b/app/Filters/SubscriptionFilters.php @@ -42,7 +42,7 @@ class SubscriptionFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php index aa3c88ac9..3fb6c80b0 100644 --- a/app/Filters/SystemLogFilters.php +++ b/app/Filters/SystemLogFilters.php @@ -20,7 +20,7 @@ class SystemLogFilters extends QueryFilters { public function type_id(string $type_id = ''): Builder { - if (strlen($type_id)) { + if (strlen($type_id) == 0) { return $this->builder; } @@ -29,7 +29,7 @@ class SystemLogFilters extends QueryFilters public function category_id(string $category_id = ''): Builder { - if (strlen($category_id)) { + if (strlen($category_id) == 0) { return $this->builder; } @@ -38,7 +38,7 @@ class SystemLogFilters extends QueryFilters public function event_id(string $event_id = ''): Builder { - if (strlen($event_id)) { + if (strlen($event_id) == 0) { return $this->builder; } @@ -54,7 +54,7 @@ class SystemLogFilters extends QueryFilters */ public function filter(string $filter = ''): Builder { - if (strlen($filter)) { + if (strlen($filter) == 0) { return $this->builder; } @@ -67,7 +67,7 @@ class SystemLogFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php index 88efbc430..9e732fcf9 100644 --- a/app/Filters/TaskFilters.php +++ b/app/Filters/TaskFilters.php @@ -97,7 +97,7 @@ class TaskFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/TaskStatusFilters.php b/app/Filters/TaskStatusFilters.php index 3e1baab6e..35ef91a02 100644 --- a/app/Filters/TaskStatusFilters.php +++ b/app/Filters/TaskStatusFilters.php @@ -42,7 +42,7 @@ class TaskStatusFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php index 9fd81df73..8d225d3db 100644 --- a/app/Filters/TaxRateFilters.php +++ b/app/Filters/TaxRateFilters.php @@ -42,7 +42,7 @@ class TaxRateFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/TokenFilters.php b/app/Filters/TokenFilters.php index e775c6601..60e43faec 100644 --- a/app/Filters/TokenFilters.php +++ b/app/Filters/TokenFilters.php @@ -42,7 +42,7 @@ class TokenFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php index a1faf9a27..a53b2eded 100644 --- a/app/Filters/UserFilters.php +++ b/app/Filters/UserFilters.php @@ -46,7 +46,7 @@ class UserFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); @@ -80,8 +80,9 @@ class UserFilters extends QueryFilters public function with(string $value = ''): Builder { - if(strlen($value) == 0) + if(strlen($value) == 0) { return $this->builder; + } return $this->builder ->orWhere($this->with_property, $value) diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php index 0c7a647ac..4937a7513 100644 --- a/app/Filters/VendorFilters.php +++ b/app/Filters/VendorFilters.php @@ -61,7 +61,7 @@ class VendorFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort); diff --git a/app/Filters/WebhookFilters.php b/app/Filters/WebhookFilters.php index 38554a213..6ab092749 100644 --- a/app/Filters/WebhookFilters.php +++ b/app/Filters/WebhookFilters.php @@ -42,7 +42,7 @@ class WebhookFilters extends QueryFilters * @param string sort formatted as column|asc * @return Builder */ - public function sort(string $sort): Builder + public function sort(string $sort = ''): Builder { $sort_col = explode('|', $sort);