Merge pull request #98 from silinternational/feature/smarter-listMembers

Address a sonar issue
silinternational · Jun 18, 2024 · ddb0e5a · ddb0e5a
2 parents fc68715 + d637e64
commit ddb0e5a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/SilMock/Google/Service/Directory/Resource/Members.php b/SilMock/Google/Service/Directory/Resource/Members.php
@@ -76,13 +76,13 @@ public function listMembers($groupKey, $optParams = [])
         $memberCounter = 0;
         foreach ($directoryMemberRecords as $memberRecord) {
             $memberData = json_decode($memberRecord['data'], true);
-            if ($memberData['groupKey'] === $groupKey) {
-                if ($memberCounter >= ($pageToken * $pageSize)) {
-                    if (empty($expectedRoles) || in_array($memberData['member']['role'], $expectedRoles)) {
+            if (
+                $memberData['groupKey'] === $groupKey            // Matches the expected group
+                && $memberCounter >= ($pageToken * $pageSize)    // Matches the subsection of all the members
+                && (empty($expectedRoles) || in_array($memberData['member']['role'], $expectedRoles)) // Matches role
+            ) {
                         $memberCounter = $memberCounter + 1;
                         $this->addToMembers($memberData, $members);
-                    }
-                }
             }
             $currentMembers = $members->getMembers();
             $currentResultSize = count($currentMembers);