Merge remote-tracking branch 'origin/5.0' into 5.0

.travis.yml

@@ -4,6 +4,8 @@ php:
   - 5.5.9
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
 
 env:
   global:

composer.json

@@ -19,7 +19,7 @@
         "kkszymanowski/traitor": "^0.2.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.2",
+        "mockery/mockery": ">=0.9.9",
         "phpunit/phpunit": ">=4.1",
         "orchestra/testbench": "~3.2"
     },

src/Helper.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphPivot;
+use Laratrust\Contracts\LaratrustTeamInterface;
 
 class Helper
 {
@@ -69,6 +70,10 @@ public static function fetchTeam($team = null)
         if (is_null($team) || !Config::get('laratrust.use_teams')) {
             return null;
         }
+
+        if ($team instanceof LaratrustTeamInterface) {
+            return $team->getKey();
+        }
 
         $team = call_user_func_array(
                     [Config::get('laratrust.models.team'), 'where'],

tests/LaratrustUserTest.php

@@ -140,11 +140,13 @@ public function testHasPermission()
         $this->assertTrue($this->user->hasPermission([]));
         $this->assertTrue($this->user->hasPermission('permission_a'));
         $this->assertTrue($this->user->hasPermission('permission_b', 'team_a'));
+        $this->assertTrue($this->user->hasPermission('permission_b', $team));
         $this->app['config']->set('laratrust.teams_strict_check', true);
         $this->assertFalse($this->user->hasPermission('permission_c'));
         $this->app['config']->set('laratrust.teams_strict_check', false);
         $this->assertTrue($this->user->hasPermission('permission_c'));
         $this->assertTrue($this->user->hasPermission('permission_c', 'team_a'));
+        $this->assertTrue($this->user->hasPermission('permission_c', $team));
         $this->assertTrue($this->user->hasPermission('permission_d'));
         $this->assertFalse($this->user->hasPermission('permission_e'));
 
@@ -153,11 +155,13 @@ public function testHasPermission()
         $this->assertTrue($this->user->hasPermission(['permission_a', 'permission_d'], true));
         $this->assertTrue($this->user->hasPermission(['permission_a', 'permission_b', 'permission_d'], true));
         $this->assertFalse($this->user->hasPermission(['permission_a', 'permission_b', 'permission_d'], 'team_a', true));
+        $this->assertFalse($this->user->hasPermission(['permission_a', 'permission_b', 'permission_d'], $team, true));
         $this->assertFalse($this->user->hasPermission(['permission_a', 'permission_b', 'permission_e'], true));
         $this->assertFalse($this->user->hasPermission(['permission_e', 'permission_f']));
 
         $this->app['config']->set('laratrust.use_teams', false);
         $this->assertTrue($this->user->hasPermission(['permission_a', 'permission_b', 'permission_d'], 'team_a', true));
+        $this->assertTrue($this->user->hasPermission(['permission_a', 'permission_b', 'permission_d'], $team, true));
     }
 
     public function testCan()