Merge pull request #367 from MehediDracula/2.0

Bind current object to the dynamic relations closure
AsgardCms · Aug 31, 2017 · 62efe73 · 62efe73
2 parents 33e556f + cb33f8c
commit 62efe73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Modules/User/Entities/Sentinel/User.php b/Modules/User/Entities/Sentinel/User.php
@@ -113,8 +113,9 @@ public function __call($method, $parameters)
         #i: Relation method resolver
         if (config()->has($config)) {
             $function = config()->get($config);
-
-            return $function($this);
+            $bound = $function->bindTo($this);
+
+            return $bound();
         }
 
         #i: No relation found, return the call to parent (Eloquent) to handle it.

diff --git a/config/asgard/user/config.php b/config/asgard/user/config.php
@@ -85,8 +85,8 @@
      | Add relations that will be dynamically added to the User entity
      */
     'relations' => [
-//        'extension' => function ($self) {
-//            return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
+//        'extension' => function () {
+//            return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
 //        }
     ],
     /*