Merge pull request #93 from kirschbaum-development/laravel-9-php-81

Fixes for PHP 8.1 and Laravel 9

src/Mixins/RelationshipsExtraMethods.php

@@ -2,15 +2,16 @@
 
 namespace Kirschbaum\PowerJoins\Mixins;
 
+use Kirschbaum\PowerJoins\PowerJoins;
+use Kirschbaum\PowerJoins\StaticCache;
+use Kirschbaum\PowerJoins\PowerJoinClause;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
-use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphOneOrMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Kirschbaum\PowerJoins\PowerJoinClause;
-use Kirschbaum\PowerJoins\PowerJoins;
 
 /**
  * @method getModel
@@ -302,7 +303,7 @@ public function getFarParent()
     public function getTableOrAliasForModel()
     {
         return function ($model, $default = null) {
-            return PowerJoins::$powerJoinAliasesCache[spl_object_id($model)] ?? $default;
+            return StaticCache::$powerJoinAliasesCache[spl_object_id($model)] ?? $default;
         };
     }
 

src/PowerJoinClause.php

@@ -59,7 +59,7 @@ public function as(string $alias)
         $this->useTableAliasInConditions();
 
         if ($this->model) {
-            PowerJoins::$powerJoinAliasesCache[spl_object_id($this->model)] = $alias;
+            StaticCache::$powerJoinAliasesCache[spl_object_id($this->model)] = $alias;
         }
 
         return $this;

src/PowerJoins.php

@@ -19,13 +19,6 @@ trait PowerJoins
      */
     private $joinRelationshipCache = [];
 
-    /**
-     * Cache to not join the same relationship twice.
-     *
-     * @var array
-     */
-    public static $powerJoinAliasesCache = [];
-
     /**
      * Join method map.
      */
@@ -40,7 +33,7 @@ trait PowerJoins
      */
     public function scopeJoinRelationship(Builder $query, $relationName, $callback = null, $joinType = 'join', $useAlias = false, bool $disableExtraConditions = false): void
     {
-        $joinType = PowerJoins::$joinMethodsMap[$joinType] ?? $joinType;
+        $joinType = static::$joinMethodsMap[$joinType] ?? $joinType;
         $useAlias = is_string($callback) ? false : $useAlias;
         $callback = $this->formatJoinCallback($relationName, $callback);
 
@@ -391,15 +384,15 @@ public function generateAliasForRelationship($relation, $relationName)
      */
     public function cachePowerJoinAlias($model, $alias)
     {
-        PowerJoins::$powerJoinAliasesCache[spl_object_id($model)] = $alias;
+        StaticCache::$powerJoinAliasesCache[spl_object_id($model)] = $alias;
     }
 
     /**
      * Clear the power join caches.
      */
     public function clearPowerJoinCaches()
     {
-        PowerJoins::$powerJoinAliasesCache = [];
+        StaticCache::$powerJoinAliasesCache = [];
 
         return $this;
     }

src/StaticCache.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Kirschbaum\PowerJoins;
+
+class StaticCache
+{
+    /**
+     * Cache to not join the same relationship twice.
+     *
+     * @var array
+     */
+    public static $powerJoinAliasesCache = [];
+}