Change the Ownable interface to accept the owner in the ownerKey method

Allows to receive the owner in the ownerKey method in case the owner key check changes depending of the type of the owner.
santigarcor · Jul 26, 2017 · b68e9ea · b68e9ea
1 parent 82c850d
commit b68e9ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Laratrust/Contracts/Ownable.php b/src/Laratrust/Contracts/Ownable.php
@@ -15,7 +15,8 @@ interface Ownable
     /**
      * Gets the owner key value inside the model or object.
      *
+     * @param  mixed  $owner
      * @return mixed
      */
-    public function ownerKey();
+    public function ownerKey($owner);
 }
diff --git a/src/Laratrust/Traits/LaratrustUserTrait.php b/src/Laratrust/Traits/LaratrustUserTrait.php
@@ -559,7 +559,7 @@ public function syncPermissions($permissions = [], $team = null)
     public function owns($thing, $foreignKeyName = null)
     {
         if ($thing instanceof \Laratrust\Contracts\Ownable) {
-            $ownerKey = $thing->ownerKey();
+            $ownerKey = $thing->ownerKey($this);
         } else {
             $className = (new \ReflectionClass($this))->getShortName();
             $foreignKeyName = $foreignKeyName ?: Str::snake($className . 'Id');

diff --git a/tests/LaratrustUserTest.php b/tests/LaratrustUserTest.php
@@ -1057,7 +1057,7 @@ public function publicMagicCan($method) {
 
 class OwnableObject implements Ownable
 {
-    public function ownerKey()
+    public function ownerKey($owner)
     {
         return 1;
     }