wip

filamentphp · Jul 21, 2023 · aa05270 · aa05270
1 parent 92af861
commit aa05270
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "danharrin/livewire-rate-limiting": "^0.3|^1.0",
         "doctrine/dbal": "^3.2",
         "filament/support": "*",
-        "kirschbaum-development/eloquent-power-joins": "^2.6|^3.0",
+        "kirschbaum-development/eloquent-power-joins": "^3.0",
         "laravel/cashier": "^14.2",
         "laravel/pint": "^1.0",
         "league/flysystem-aws-s3-v3": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/tables/composer.json b/packages/tables/composer.json
@@ -18,7 +18,7 @@
         "illuminate/filesystem": "^9.0|^10.0",
         "illuminate/support": "^9.0|^10.0",
         "illuminate/view": "^9.0|^10.0",
-        "kirschbaum-development/eloquent-power-joins": "^2.6|^3.0",
+        "kirschbaum-development/eloquent-power-joins": "^3.0",
         "spatie/laravel-package-tools": "^1.9"
     },
     "autoload": {

diff --git a/packages/tables/src/Support/RelationshipJoiner.php b/packages/tables/src/Support/RelationshipJoiner.php
@@ -4,27 +4,27 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
-use Kirschbaum\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\JoinsHelper;
 
 class RelationshipJoiner
 {
-    use PowerJoins;
-
     public function leftJoinRelationship(Builder $query, string $relationship): Builder
     {
         if (str($relationship)->contains('.')) {
-            $this->scopeJoinNestedRelationship(
-                $query,
+            /** @phpstan-ignore-next-line */
+            $query->joinNestedRelationship(
                 $relationship,
-                joinType: static::$joinMethodsMap['leftJoin'] ?? 'leftJoin',
+                callback: null,
+                joinType: JoinsHelper::$joinMethodsMap['leftJoin'] ?? 'leftJoin',
             );
 
             return $query;
         }
 
-        $this->scopeJoinRelationship(
-            $query,
+        /** @phpstan-ignore-next-line */
+        $query->joinRelationship(
             $relationship,
+            callback: null,
             joinType: 'leftJoin',
         );
 
@@ -36,7 +36,8 @@ public function leftJoinRelationship(Builder $query, string $relationship): Buil
      */
     public function getLeftJoinsForRelationship(Builder $query, string $relationship): array
     {
-        $this->leftJoinRelationship($query, $relationship);
+        /** @phpstan-ignore-next-line */
+        $query->leftJoinRelationship($relationship);
 
         return $query->toBase()->joins;
     }