From 8cb164d396b07672afa898eb8213735a03626e70 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Mon, 8 Dec 2025 18:32:55 +0100
Subject: [PATCH 1/3] Enable extra plugin for convenience

---
 docker-gitlabci/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-gitlabci/Dockerfile b/docker-gitlabci/Dockerfile
index 5fd7f880..50567ca3 100644
--- a/docker-gitlabci/Dockerfile
+++ b/docker-gitlabci/Dockerfile
@@ -39,6 +39,7 @@ RUN su domjudge -c "cd /home/domjudge && \
 
 # Install needed global PHP modules
 RUN composer -n require justinrainbow/json-schema phpcompatibility/php-compatibility:dev-develop
+RUN composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
 
 # Install other PHP versions
 RUN add-apt-repository ppa:ondrej/php -y && apt-get update && \

From 937ce319057be6024fb05564ebfd8dbfc1bdfe08 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Mon, 8 Dec 2025 18:35:54 +0100
Subject: [PATCH 2/3] Remove unneeded packages as we would search for them with
 the other PHP versions

---
 docker-gitlabci/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-gitlabci/Dockerfile b/docker-gitlabci/Dockerfile
index 50567ca3..84293eac 100644
--- a/docker-gitlabci/Dockerfile
+++ b/docker-gitlabci/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
   npm \
   # Code coverage for unit test \
   php-pear php-dev \
-  && apt purge php8.3-redis \
+  && apt purge php8.3-redis && apt autoremove --purge \
   && rm -rf /var/lib/apt/lists/*
 
 # Install needed NPM packages and download chrome for the domjudge user

From 98f1689357562ac2c81096c016fd1e4b9e29877b Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Mon, 8 Dec 2025 23:25:27 +0100
Subject: [PATCH 3/3] Add soft requirement

---
 docker-gitlabci/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-gitlabci/Dockerfile b/docker-gitlabci/Dockerfile
index 84293eac..8472933f 100644
--- a/docker-gitlabci/Dockerfile
+++ b/docker-gitlabci/Dockerfile
@@ -37,8 +37,8 @@ RUN su domjudge -c "cd /home/domjudge && \
                     npx puppeteer browsers install chrome && \
                     npm cache clean --force"
 
-# Install needed global PHP modules
-RUN composer -n require justinrainbow/json-schema phpcompatibility/php-compatibility:dev-develop
+# Install needed global PHP modules, squizlabs/php_codesniffer is soft requirement for phpcompatibility/php-compatibility
+RUN composer -n require justinrainbow/json-schema phpcompatibility/php-compatibility:dev-develop squizlabs/php_codesniffer
 RUN composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
 
 # Install other PHP versions