Merge branch 'master' of https://github.com/Adambean/gitlab-ce-ldap-sync

Author: Adambean

Dockerfile

@@ -1,5 +1,5 @@
 FROM mlocati/php-extension-installer:latest AS installer
-FROM php:7.4.9-cli-alpine3.12
+FROM php:8.1.33-cli-alpine3.21
 
 COPY --from=installer /usr/bin/install-php-extensions /usr/bin/
 

src/LdapSyncCommand.php

@@ -1355,7 +1355,16 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
         $this->logger?->notice("Finding all existing Gitlab users...");
         $p = 0;
 
-        while (is_array($gitlabUsers = $gitlab->users()->all(["page" => ++$p, "per_page" => 100, "without_project_bots" => true])) && [] !== $gitlabUsers) {
+        while (is_array($gitlabUsers = $gitlab->users()->all([
+            "page"                  => ++$p,
+            "per_page"              => 100,
+            /* Option not yet supported in the PHP GitLab API client component:
+            "without_project_bots"  => true,
+             * See:
+             * - https://github.com/Adambean/gitlab-ce-ldap-sync/issues/50
+             * - https://github.com/GitLabPHP/Client/issues/810
+             */
+        ])) && [] !== $gitlabUsers) {
             /** @var array<int, GitlabUserArray> $gitlabUsers */
             foreach ($gitlabUsers as $i => $gitlabUser) {
                 $n = $i + 1;
@@ -1735,7 +1744,7 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
                 continue;
             }
 
-            if ($this->array_key_exists_i($gitlabGroupName, $ldapGroupsSafe)) {
+            if (!$this->array_key_exists_i($gitlabGroupName, $ldapGroupsSafe)) {
                 continue;
             }
             $ldapGroupMembers = $ldapGroupsSafe[$gitlabGroupName];