From b76cd531176e1d14dc3f2fd437edd051a37fe497 Mon Sep 17 00:00:00 2001
From: Andy Thompson <athompson@inviqa.com>
Date: Thu, 30 Nov 2023 21:37:28 +0000
Subject: [PATCH] Disable mcrypt while unsupported

---
 Dockerfile                          | 2 +-
 installer/base/extensions/mcrypt.sh | 2 +-
 test.extensions.sh                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index befef8c..7cc6ae8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ RUN cd /root/installer; ./enable.sh \
   bcmath \
   gd \
   intl \
-  mcrypt \
+  "$(dpkg --compare-versions "$PHP_VERSION" ge 8.3 || echo mcrypt )" \
   opcache \
   pdo_mysql \
   pdo_pgsql \
diff --git a/installer/base/extensions/mcrypt.sh b/installer/base/extensions/mcrypt.sh
index e5e363e..fdf198f 100755
--- a/installer/base/extensions/mcrypt.sh
+++ b/installer/base/extensions/mcrypt.sh
@@ -23,7 +23,7 @@ function compile_mcrypt()
         7.1)
             docker-php-ext-install mcrypt
             ;;
-        7.*|8.*)
+        7.*|8.[012])
             printf "\n" | pecl install mcrypt
             ;;
         *)
diff --git a/test.extensions.sh b/test.extensions.sh
index 7ca2772..e55805e 100755
--- a/test.extensions.sh
+++ b/test.extensions.sh
@@ -28,7 +28,7 @@ for extension in extensions/*; do
     fi
 
     # Some extensions not yet ready for PHP 8.3
-    if  [[ "$extension_name" = 'imagick' ]] && version_compare "$PHP_VERSION" ge 8.3; then
+    if  [[ "$extension_name" = 'imagick' || "$extension_name" = 'mcrypt' ]] && version_compare "$PHP_VERSION" ge 8.3; then
         echo ' skipped'
         continue
     fi