From c2c9bbc9accd3ceddfd4828d27a8e86b6308c373 Mon Sep 17 00:00:00 2001
From: C0rTeZ13 <work.cortez13@gmail.com>
Date: Mon, 3 Mar 2025 13:19:20 +0300
Subject: [PATCH] Reapply "ENSITECH-273 update spatie/laravel-query-builder"

This reverts commit cb67f78f49bee67c6d5b9226784d434a4d209a50.
---
 composer.json                        |  2 +-
 tests/Component/NestedFilterTest.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 5f5bece..6fa3e83 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.1",
         "laravel/framework": "^9.0 || ^10.0 || ^11.0",
-        "spatie/laravel-query-builder": "^5.0"
+        "spatie/laravel-query-builder": "^5.0 || ^6.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.2",
diff --git a/tests/Component/NestedFilterTest.php b/tests/Component/NestedFilterTest.php
index 8afa43c..9f3f1ec 100644
--- a/tests/Component/NestedFilterTest.php
+++ b/tests/Component/NestedFilterTest.php
@@ -17,8 +17,8 @@
 
     attachQueryBuilder('test', ParentModel::class, [
         ...ExtraFilter::nested('children', [
-            AllowedFilter::exact('int_value'),
-            ExtraFilter::lessOrEqual('float_value__lte', 'float_value'),
+            AllowedFilter::exact('int_value')->default(null),
+            ExtraFilter::lessOrEqual('float_value__lte', 'float_value')->default(null),
         ]),
     ]);
 
@@ -38,8 +38,8 @@
         ...ExtraFilter::nested(
             fn (Builder $query, Closure $callback) => $query->whereHas('children', fn (Builder $q) => $callback($q)),
             [
-                AllowedFilter::exact('int_value'),
-                ExtraFilter::lessOrEqual('float_value__lte', 'float_value'),
+                AllowedFilter::exact('int_value')->default(null),
+                ExtraFilter::lessOrEqual('float_value__lte', 'float_value')->default(null),
             ]
         ),
     ]);
@@ -70,8 +70,8 @@
 
     attachQueryBuilder('test', ParentModel::class, [
         ...ExtraFilter::nested($children, [
-            AllowedFilter::exact('int_value'),
-            ExtraFilter::lessOrEqual('float_value__lte', 'float_value'),
+            AllowedFilter::exact('int_value')->default(null),
+            ExtraFilter::lessOrEqual('float_value__lte', 'float_value')->default(null),
         ]),
     ]);
 
@@ -89,8 +89,8 @@
 
     attachQueryBuilder('test', ParentModel::class, [
         ...ExtraFilter::nested('children.children', [
-            AllowedFilter::exact('string_value'),
-            ExtraFilter::lessOrEqual('int_value__lt', 'int_value'),
+            AllowedFilter::exact('string_value')->default(null),
+            ExtraFilter::lessOrEqual('int_value__lt', 'int_value')->default(null),
         ]),
     ]);
 
@@ -110,7 +110,7 @@
 
     attachQueryBuilder('test', ChildModel::class, [
         ...ExtraFilter::nested('parent', [
-            ExtraFilter::less('parent_int__lt', 'int_value'),
+            ExtraFilter::less('parent_int__lt', 'int_value')->default(null),
         ]),
     ]);
 
@@ -132,10 +132,10 @@
 
     attachQueryBuilder('test', ChildModel::class, [
         ...ExtraFilter::nested('parent', [
-            ExtraFilter::less('parent_int__lt', 'int_value'),
+            ExtraFilter::less('parent_int__lt', 'int_value')->default(null),
         ]),
         ...ExtraFilter::nested('children', [
-            ExtraFilter::greater('child_date__gt', 'datetime_value'),
+            ExtraFilter::greater('child_date__gt', 'datetime_value')->default(null),
         ]),
     ]);