Merge pull request #340 from Automattic/update-php

fix: drop `gnupg` extension
Automattic · Aug 17, 2024 · 9af8c3a · 9af8c3a
2 parents d93a431 + 456d48d
commit 9af8c3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/features/src/php/devcontainer-feature.json b/features/src/php/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "php",
     "name": "PHP",
     "description": "Installs PHP into the Dev Environment",
-    "version": "2.5.1",
+    "version": "2.6.0",
     "documentationURL": "https://github.com/Automattic/vip-codespaces/tree/trunk/features/src/php",
     "options": {
         "version": {

diff --git a/features/src/php/install.sh b/features/src/php/install.sh
@@ -221,7 +221,7 @@ setup_php83_alpine() {
 
 setup_php81_deb() {
     if [ "${LITE_INSTALL}" != 'true' ]; then
-        EXTENSIONS="ghostscript php8.1-bcmath php8.1-gnupg php8.1-igbinary php8.1-intl php8.1-mcrypt php8.1-soap php8.1-ssh2"
+        EXTENSIONS="ghostscript php8.1-bcmath php8.1-igbinary php8.1-intl php8.1-mcrypt php8.1-soap php8.1-ssh2"
     else
         EXTENSIONS=
     fi
@@ -262,7 +262,7 @@ setup_php81_deb() {
 
 setup_php82_deb() {
     if [ "${LITE_INSTALL}" != 'true' ]; then
-        EXTENSIONS="ghostscript php8.2-bcmath php8.2-gnupg php8.2-igbinary php8.2-intl php8.2-mcrypt php8.2-soap php8.2-ssh2"
+        EXTENSIONS="ghostscript php8.2-bcmath php8.2-igbinary php8.2-intl php8.2-mcrypt php8.2-soap php8.2-ssh2"
     else
         EXTENSIONS=
     fi
@@ -303,7 +303,7 @@ setup_php82_deb() {
 
 setup_php83_deb() {
     if [ "${LITE_INSTALL}" != 'true' ]; then
-        EXTENSIONS="ghostscript php8.3-bcmath php8.3-gnupg php8.3-igbinary php8.3-intl php8.3-mcrypt php8.3-soap php8.3-ssh2"
+        EXTENSIONS="ghostscript php8.3-bcmath php8.3-igbinary php8.3-intl php8.3-mcrypt php8.3-soap php8.3-ssh2"
     else
         EXTENSIONS=
     fi

diff --git a/features/test/php/test.sh b/features/test/php/test.sh
@@ -11,7 +11,6 @@ check "composer exists" which composer
 check "www-data user exists" getent passwd www-data
 check "www-data group exists" getent group www-data
 
-# gnupg is not available on Alpine
 MODULES="apcu bcmath calendar ctype curl date dom exif fileinfo filter ftp gd gmagick gmp hash iconv igbinary intl json libxml mbstring mcrypt memcache memcached mysqli mysqlnd openssl pcntl pcre pdo_mysql pdo_sqlite phar posix random reflection session shmop simplexml soap sockets sodium sqlite3 ssh2 sysvsem sysvshm timezonedb tokenizer xml xmlreader xmlwriter zip zlib"
 for module in ${MODULES}; do
     check "PHP module ${module} exists" sh -c "php -m | grep -qi ^${module}$"