Fixed isMemberOf and inMembers for multiple groups

codecrafting-io · Dec 10, 2019 · 08764a5 · 08764a5
1 parent b69fbd1
commit 08764a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/Models/Group.php b/src/Models/Group.php
@@ -138,21 +138,26 @@ public function inMembers($user)
                 if ($members === null) {
                     return false;
                 }
-                return boolval(array_filter($members, function ($dn) use ($user) {
+                $equals = boolval(array_filter($members, function ($dn) use ($user) {
                     if (isset($user->getDn)) {
                         return $user->getDn()->equals($dn);
                     }
 
                     return $user->equals($dn);
                 }));
+                if ($equals) {
+                    return true;
+                }
             } elseif (is_string($user)) {
                 $members = $this->getMembers();
                 if ($members === null) {
                     return false;
                 }
                 $user = trim(strtolower($user));
-
-                return (array_search($user, array_map('strtolower', $members)) !== false);
+                $equals = (array_search($user, array_map('strtolower', $members)) !== false);
+                if ($equals) {
+                    return true;
+                }
             } else {
                 throw new ModelException('group must be a string or a instance of' . DistinguishedName::class . ' or ' . User::class);
             }

diff --git a/src/Models/User.php b/src/Models/User.php
@@ -466,21 +466,26 @@ public function isMemberOf($group)
                 if ($memberOf === null) {
                     return false;
                 }
-                return boolval(array_filter($memberOf, function ($dn) use ($group) {
+                $equals = array_filter($memberOf, function ($dn) use ($group) {
                     if (isset($group->getDn)) {
                         return $group->getDn()->equals($dn);
                     }
 
                     return $group->equals($dn);
-                }));
+                });
+                if ($equals) {
+                    return true;
+                }
             } elseif (is_string($group)) {
                 $memberOf = $this->getMemberOf();
                 if ($memberOf === null) {
                     return false;
                 }
                 $group = trim(strtolower($group));
-
-                return (array_search($group, array_map('strtolower', $memberOf)) !== false);
+                $equals = (array_search($group, array_map('strtolower', $memberOf)) !== false);
+                if ($equals) {
+                    return true;
+                }
             } else {
                 throw new ModelException('group must be a string or a instance of' . DistinguishedName::class);
             }