Disable mcrypt while unsupported

my127 · Dec 1, 2023 · b76cd53 · b76cd53
1 parent 8afd4bb
commit b76cd53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ function compile_mcrypt() @@
 .1)
                 docker-php-ext-install mcrypt
                 ;;
-.*|8.*)
+.*|8.[012])
                 printf "\n" | pecl install mcrypt
                 ;;
             *)
@@ Expand Down @@