Fixes mateusjunges#133

Author: Mateus Junges

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to `mateusjunges/laravel-acl` will be documented in this file.
 
+## 2.1.1
+- Fixed bug with the `group` scope. See [#133](https://github.com/mateusjunges/laravel-acl/issues/133)
+
 ## 2.1.0
 - Update dependencies for Laravel 6
 - Drop support for Laravel 5.5 and older, and PHP 7.1 and older. (They can use v2.0 of this package until they upgrade.)

src/Traits/UsersTrait.php

@@ -512,7 +512,7 @@ public function scopeGroup(Builder $query, $groups) : Builder
         return $query->whereHas('groups', function ($query) use ($groups) {
             $query->where(function ($query) use ($groups) {
                 foreach ($groups as $group) {
-                    if (is_null($group)) {
+                    if (! is_null($group)) {
                         $query->orWhere(config('acl.tables.groups').'.id', $group->id);
                     }
                 }

tests/Traits/UsersTrait/ScopeGroupTest.php

@@ -23,6 +23,7 @@ public function test_it_should_return_only_users_with_the_specified_group()
     {
         $this->testUser->assignGroup('test-user-group');
         $this->testUser2->assignGroup('test-user-group');
+        $this->testUser3->assignGroup($this->testUserGroup2);
         self::assertFalse(
             User::group('test-user-group')
                 ->get()
@@ -38,6 +39,8 @@ public function test_it_should_return_only_users_with_the_specified_group()
                 ->get()
                 ->contains('name', $this->testUser2->name)
         );
+        self::assertCount(2, User::group('test-user-group')->get());
+        self::assertCount(1, User::group($this->testUserGroup2)->get());
     }
 
     public function test_if_it_thrown_an_exception_if_the_group_does_not_exist_using_group_slug()