feat(database): add PostgreSQL support and Doctrine persistence

.github/actions/docker-compose-app.yml

@@ -4,10 +4,16 @@ services:
     build:
       context: "${APPLICATION_ROOT}"
       dockerfile: ".github/actions/images/app/Dockerfile"
+      target: app
+      args:
+        PHP_VERSION: "${TEST_PHP_VERSION:-8.2}"
     image: "${PHP_IMAGE:-itsm-tests-app:local}"
+    pull_policy: build
     working_dir: "/var/itsm"
     command: ["sleep", "infinity"]
     environment:
+      TEST_DB_NAME: "${TEST_DB_NAME:-glpi}"
+      TEST_DB_TYPE: "${TEST_DB_TYPE:-mysql}"
       CODE_COVERAGE: "${CODE_COVERAGE:-false}"
     volumes:
       - "${APPLICATION_ROOT}:/var/itsm:z"

.github/actions/docker-compose-e2e.yml

@@ -1,10 +1,16 @@
 services:
+  app:
+    environment:
+      GLPI_VAR_DIR: "${PLAYWRIGHT_VAR_DIR}"
+
   app-web:
     container_name: "app-web"
     image: "${PHP_IMAGE:-itsm-tests-app:local}"
+    pull_policy: never
     working_dir: "/var/itsm"
-    command: ["php", "-S", "0.0.0.0:8088", "tests/router.php"]
+    command: ["php", "-S", "127.0.0.1:8088", "tests/router.php"]
     environment:
+      GLPI_VAR_DIR: "${PLAYWRIGHT_VAR_DIR}"
       CODE_COVERAGE: "${CODE_COVERAGE:-false}"
     depends_on:
       - db
@@ -19,11 +25,28 @@ services:
 
   e2e:
     container_name: "e2e"
-    image: "${E2E_IMAGE:-mcr.microsoft.com/playwright:v1.59.1-jammy}"
+    build:
+      context: "${APPLICATION_ROOT}"
+      dockerfile: ".github/actions/images/app/Dockerfile"
+      target: e2e
+      args:
+        PHP_VERSION: "${TEST_PHP_VERSION:-8.2}"
+    image: "${E2E_IMAGE:-itsm-tests-e2e:local}"
+    pull_policy: build
     working_dir: "/var/itsm"
     command: ["sleep", "infinity"]
     ipc: host
+    network_mode: "service:app-web"
+    environment:
+      GLPI_VAR_DIR: "${PLAYWRIGHT_VAR_DIR}"
+      PLAYWRIGHT_BASE_URL: http://127.0.0.1:8088
+      PLAYWRIGHT_DOMAIN_CONFIG: /var/itsm/tests/config
+      PLAYWRIGHT_APPLIANCE_CONFIG: /var/itsm/tests/config
+      PLAYWRIGHT_TRANSFER_CONFIG: /var/itsm/tests/config
+      PLAYWRIGHT_DROPDOWN_CONFIG: /var/itsm/tests/config
+      PLAYWRIGHT_SESSION_CONFIG: /var/itsm/tests/config
     depends_on:
       - app-web
     volumes:
       - "${APPLICATION_ROOT}:/var/itsm:z"
+      - "${APP_CONTAINER_HOME}:/home/itsm:z"

.github/actions/docker-compose-postgres.yml

@@ -0,0 +1,10 @@
+# Native PostgreSQL settings for the existing test harness.
+services:
+  db:
+    environment:
+      POSTGRES_DB: "${TEST_DB_NAME:-glpi}"
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: test
+    command: ["postgres", "-c", "max_locks_per_transaction=512"]
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "root", "-d", "${TEST_DB_NAME:-glpi}"]

.github/actions/docker-compose-services.yml

@@ -4,20 +4,23 @@ services:
     image: "${DB_IMAGE:-mariadb:10.11}"
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-      MYSQL_DATABASE: "glpi"
+      MYSQL_DATABASE: "${TEST_DB_NAME:-glpi}"
     shm_size: '1gb'
     healthcheck:
       test: ["CMD", "mariadb-admin", "ping", "-h", "127.0.0.1", "-uroot"]
       interval: 5s
       timeout: 3s
       retries: 20
   dovecot:
+    profiles: [imap]
     container_name: "dovecot"
     build:
       context: "${APPLICATION_ROOT}"
       dockerfile: ".github/actions/images/dovecot/Dockerfile"
     image: "${DOVECOT_IMAGE:-itsm-tests-dovecot:local}"
+    pull_policy: build
   openldap:
+    profiles: [ldap]
     container_name: "openldap"
     image: "${OPENLDAP_IMAGE:-osixia/openldap:1.5.0}"
     environment:

.github/actions/images/app/Dockerfile

@@ -1,49 +1,30 @@
-FROM php:8.3-cli-bookworm
+ARG PHP_VERSION=8.2
+FROM php:${PHP_VERSION}-cli-bookworm AS app
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+COPY --from=ghcr.io/mlocati/php-extension-installer:2 /usr/bin/install-php-extensions /usr/local/bin/
+
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    default-mysql-client \
-    git \
-    libbz2-dev \
-    libcurl4-openssl-dev \
-    libfreetype6-dev \
-    libicu-dev \
-    libjpeg62-turbo-dev \
-    libldap2-dev \
-    libpng-dev \
-    libxml2-dev \
-    libxslt1-dev \
-    libzip-dev \
-    nodejs \
-    npm \
-    unzip \
-    zip \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
- && docker-php-ext-install -j"$(nproc)" \
-    bcmath \
-    bz2 \
-    exif \
-    gd \
-    intl \
-    ldap \
-    mysqli \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    soap \
-    xsl \
-    zip \
- && pecl install apcu redis \
- && docker-php-ext-enable apcu redis \
- && rm -rf /var/lib/apt/lists/*
+    ca-certificates curl default-mysql-client git nodejs npm postgresql-client unzip zip \
+ && rm -rf /var/lib/apt/lists/* \
+ && install-php-extensions \
+    apcu bcmath bz2 exif gd intl ldap mysqli opcache pcntl \
+    pdo_mysql pdo_pgsql pgsql soap xsl zip
+
+RUN install-php-extensions redis \
+ || (sleep 5 && install-php-extensions redis)
+
+RUN git config --system --add safe.directory /var/itsm
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
 RUN useradd --create-home --home-dir /home/itsm --uid 1000 --shell /bin/bash itsm
 
 WORKDIR /var/itsm
+
+FROM app AS e2e
+
+COPY --from=node:22-bookworm /usr/local/bin/node /usr/local/bin/node
+RUN npx --yes playwright@1.59.1 install --with-deps chromium

.github/actions/images/dovecot/Dockerfile

@@ -9,23 +9,18 @@ RUN apt-get update \
     dovecot-pop3d \
  && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --create-home --home-dir /home/itsm --shell /bin/bash itsm \
- && useradd --create-home --home-dir /home/testuser --shell /bin/bash testuser \
- && echo 'itsm:applesauce' | chpasswd \
+RUN useradd --create-home --home-dir /home/testuser --shell /bin/bash testuser \
  && echo 'testuser:applesauce' | chpasswd \
- && mkdir -p /home/itsm/Maildir/{cur,new,tmp} /home/testuser/Maildir/{cur,new,tmp} \
- && chown -R itsm:itsm /home/itsm \
- && chown -R testuser:testuser /home/testuser
+ && install -d -o testuser -g testuser \
+    /home/testuser/Maildir \
+    /home/testuser/Maildir/cur /home/testuser/Maildir/new /home/testuser/Maildir/tmp
 
 RUN sed -ri 's|^#?listen =.*$|listen = *, ::|' /etc/dovecot/dovecot.conf \
  && sed -ri 's|^#?mail_location =.*$|mail_location = maildir:~/Maildir|' /etc/dovecot/conf.d/10-mail.conf \
  && sed -ri 's|^#?disable_plaintext_auth =.*$|disable_plaintext_auth = no|' /etc/dovecot/conf.d/10-auth.conf \
  && sed -ri 's|^auth_mechanisms =.*$|auth_mechanisms = plain login|' /etc/dovecot/conf.d/10-auth.conf \
  && sed -ri 's|^ssl =.*$|ssl = no|' /etc/dovecot/conf.d/10-ssl.conf
 
-COPY .github/actions/images/dovecot/getmail_maildir /usr/local/bin/getmail_maildir
-RUN chmod +x /usr/local/bin/getmail_maildir
-
 EXPOSE 143 110
 
 CMD ["dovecot", "-F"]

.github/actions/init_containers-start.sh

@@ -1,43 +1,21 @@
-#!/bin/bash -e
-
-ROOT_DIR=$(readlink -f "$(dirname "$0")/../..")
-COMPOSE_CMD="$ROOT_DIR/.github/actions/docker-compose.sh"
+#!/bin/bash
+set -euo pipefail
 
 echo "Init app container home"
-mkdir -p $APP_CONTAINER_HOME
+mkdir -p "$APP_CONTAINER_HOME"
 
 echo "Build and start containers"
-"$COMPOSE_CMD" up --build --detach
+docker compose up --build --detach
 
-if [[ "$UPDATE_FILES_ACL" = true ]]; then
+if [[ "${UPDATE_FILES_ACL:-false}" = true ]]; then
   echo "Change files rights to give write access to app container user"
   sudo apt-get install --assume-yes --no-install-recommends --quiet acl
-  setfacl --recursive --modify u:1000:rwx $APPLICATION_ROOT
-  setfacl --recursive --modify u:1000:rwx $APP_CONTAINER_HOME
+  setfacl --recursive --modify u:1000:rwx "$APPLICATION_ROOT"
+  setfacl --recursive --modify u:1000:rwx "$APP_CONTAINER_HOME"
 fi
 
 echo "Check services health"
-for CONTAINER_ID in $("$COMPOSE_CMD" ps -a -q); do
-  CONTAINER_NAME=`/usr/bin/docker inspect --format='{{print .Name}}{{if .Config.Image}} ({{print .Config.Image}}){{end}}' $CONTAINER_ID`
-  HEALTHY=false
-  TOTAL_COUNT=0
-  until [ $HEALTHY = true ]; do
-    if [ "`/usr/bin/docker inspect --format='{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{else}}{{print \"healthy\"}}{{end}}' $CONTAINER_ID`" == "healthy" ]
-    then
-      HEALTHY=true
-      echo "$CONTAINER_NAME is healthy"
-    else
-      if [ $TOTAL_COUNT -eq 15 ]
-      then
-        echo "$CONTAINER_NAME fails to start"
-        exit 1
-      fi
-      echo "Waiting for $CONTAINER_NAME to be ready..."
-      sleep 2
-      TOTAL_COUNT=$[$TOTAL_COUNT +1]
-    fi
-  done
-done
+docker compose up --detach --no-build --no-recreate --wait --wait-timeout 100
 
 # Always wait for 5 seconds, even when all services are considered as healthy,
 # as they may respond even if their startup script is still running (should not take more than 5 seconds).

.github/actions/init_initialize-imap-fixtures.sh

@@ -1,11 +1,11 @@
-#!/bin/bash -e
+#!/bin/bash
+set -euo pipefail
 
-ROOT_DIR=$(readlink -f "$(dirname $0)/../..")
-COMPOSE_CMD="$ROOT_DIR/.github/actions/docker-compose.sh"
+ROOT_DIR=$(readlink -f "$(dirname "$0")/../..")
 
 echo "Initialize email fixtures"
-"$COMPOSE_CMD" exec -T --user root dovecot doveadm expunge -u testuser mailbox 'INBOX' all
-"$COMPOSE_CMD" exec -T --user root dovecot doveadm purge -u testuser
+docker compose exec -T --user root dovecot doveadm expunge -u testuser mailbox 'INBOX' all
+docker compose exec -T --user root dovecot doveadm purge -u testuser
 for f in "$ROOT_DIR"/tests/emails-tests/*.eml; do
-  cat $f | "$COMPOSE_CMD" exec -T --user testuser dovecot getmail_maildir /home/testuser/Maildir/
+  docker compose exec -T --user root dovecot doveadm save -u testuser -m INBOX < "$f"
 done

.github/actions/init_initialize-ldap-fixtures.sh

@@ -1,20 +1,19 @@
-#!/bin/bash -e
+#!/bin/bash
+set -euo pipefail
 
-ROOT_DIR=$(readlink -f "$(dirname $0)/../..")
-COMPOSE_CMD="$ROOT_DIR/.github/actions/docker-compose.sh"
+ROOT_DIR=$(readlink -f "$(dirname "$0")/../..")
 LDAP_URI=${LDAP_URI:-ldap://openldap:389}
 LDAP_BIND_DN=${LDAP_BIND_DN:-cn=admin,dc=glpi,dc=org}
 LDAP_BIND_PW=${LDAP_BIND_PW:-insecure}
 LDAP_BASE_DN=${LDAP_BASE_DN:-dc=glpi,dc=org}
 
 echo "Initialize LDAP fixtures"
-LDAP_CHILD_DNS=$("$COMPOSE_CMD" exec -T openldap ldapsearch -LLL -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -b "$LDAP_BASE_DN" -s sub "(objectClass=*)" dn \
-  | sed -n 's/^dn: //p' \
-  | grep -vi "^${LDAP_BASE_DN}$" \
-  | tac || true)
+LDAP_CHILD_DNS=$(docker compose exec -T openldap ldapsearch -LLL -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -b "$LDAP_BASE_DN" -s sub "(objectClass=*)" dn \
+  | awk -v base="$LDAP_BASE_DN" '/^dn: / { dn = substr($0, 5); if (tolower(dn) != tolower(base)) print dn; }' \
+  | tac)
 
 if [ -n "$LDAP_CHILD_DNS" ]; then
-  echo "$LDAP_CHILD_DNS" | "$COMPOSE_CMD" exec -T openldap ldapdelete -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -c
+  echo "$LDAP_CHILD_DNS" | docker compose exec -T openldap ldapdelete -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -c
 fi
 
 for f in "$ROOT_DIR"/tests/LDAP/ldif/*.ldif; do
@@ -37,5 +36,5 @@ for f in "$ROOT_DIR"/tests/LDAP/ldif/*.ldif; do
         print $0;
       }
     }
-  ' "$f" | "$COMPOSE_CMD" exec -T openldap ldapadd -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -c
+  ' "$f" | docker compose exec -T openldap ldapadd -x -H "$LDAP_URI" -D "$LDAP_BIND_DN" -w "$LDAP_BIND_PW" -c
 done

.github/actions/init_install-dependencies.sh

@@ -1,22 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+set -euo pipefail
 
-PHP_MAJOR_VERSION="$(echo ${PHP_VERSION:-$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} | cut -d '.' -f 1,2)"
-WORKTREE_DIR="$(pwd)"
-
-# The repository is bind-mounted into the container, so Git sees host ownership.
-# Mark it as safe before Composer tries to inspect VCS metadata.
-git config --global --add safe.directory "$WORKTREE_DIR"
-
-# Validate composer config
 composer validate --strict
-if ! [[ "$PHP_MAJOR_VERSION" == "8.0" ]] && [[ -f composer.lock ]]; then
-  composer check-platform-reqs;
-elif ! [[ -f composer.lock ]]; then
-  echo "composer.lock not found, skipping composer check-platform-reqs"
-fi
-
-# Install dependencies
-if [[ "$PHP_MAJOR_VERSION" == "8.0" ]]; then
-  COMPOSER_ADD_OPTS=--ignore-platform-reqs;
-fi
-bin/console dependencies install --composer-options="$COMPOSER_ADD_OPTS --prefer-dist --no-progress"
+bin/console dependencies install --composer-options="--prefer-dist --no-progress"
+composer check-platform-reqs