Bumped packages

app/composer.json

@@ -10,26 +10,26 @@
     "require": {
         "php": "^8.4|^8.3|^8.2",
         "guzzlehttp/guzzle": "^7.2",
-        "kirschbaum-development/eloquent-power-joins": "^3.0",
+        "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
         "laravel/framework": "^10.48.23|^11.33|^12.0",
         "laravel/reverb": "^1.4.3",
         "laravel/sanctum": "^3.2|^4.0",
         "laravel/tinker": "^2.7",
         "maatwebsite/excel": "^3.1",
         "monolog/monolog": "^3.0",
-        "nesbot/carbon": "^2.63",
+        "nesbot/carbon": "^2.63|^3.0",
         "psr/simple-cache": "^2.0",
         "ramsey/collection": "^1.2",
         "spatie/laravel-medialibrary": "^11.0",
-        "spatie/laravel-query-builder": "^5.0"
+        "spatie/laravel-query-builder": "^5.0|^6.0|dev-main"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.7",
         "fakerphp/faker": "^1.9.1",
         "laravel/dusk": "^8.2.11",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^7.10|^8.1",
-        "phpunit/phpunit": "^10.4",
+        "phpunit/phpunit": "^10.4|^11.5.3",
         "protonemedia/laravel-splade": "*",
         "spatie/ignition": "^1.4.1",
         "spatie/invade": "^1.1",

composer.json

@@ -27,7 +27,7 @@
         "phpunit/phpunit": "^10.4|^11.5.3"
     },
     "suggest": {
-        "kirschbaum-development/eloquent-power-joins": "Required to enable support sorting by (nested) relationships in Splade Tables (^3.0)",
+        "kirschbaum-development/eloquent-power-joins": "Required to enable support sorting by (nested) relationships in Splade Tables (^3.0|^4.0)",
         "maatwebsite/excel": "Required to enable support exports in Splade Tables (^3.1)",
         "spatie/fractalistic": "Required to enable support for Fractal transformers (^2.9)"
     },
@@ -70,4 +70,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

src/SpladeQueryBuilder.php

@@ -10,6 +10,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Kirschbaum\PowerJoins\EloquentJoins;
 use Kirschbaum\PowerJoins\PowerJoins;
 use ProtoneMedia\Splade\Table\Column;
 use ProtoneMedia\Splade\Table\Filter;
@@ -203,11 +204,9 @@ private function applySorting(Column $column)
             return $this->builder->orderBy($column->key, $column->sorted);
         }
 
-        if (!trait_exists(PowerJoins::class)) {
-            throw new PowerJoinsException(
-                "To order the query using a column from a relationship, please install the 'kirschbaum-development/eloquent-power-joins' package."
-            );
-        }
+        class_exists(EloquentJoins::class) || throw new PowerJoinsException(
+            "To order the query using a column from a relationship, please install the 'kirschbaum-development/eloquent-power-joins' package."
+        );
 
         if (!trait_uses_recursive($this->builder->getModel(), PowerJoins::class)) {
             throw new PowerJoinsException(