From 865f18a212bb31ec2ebc27044e553947705ea750 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 3 Feb 2022 14:33:27 +0100 Subject: [PATCH 1/2] Add extension xdebug to PHP 8.2 --- Dockerfiles/mods/Dockerfile-8.2 | 20 ++++++++++++++++++++ README.md | 2 +- build/ansible/group_vars/all/mods.yml | 8 +++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index 9599769e..fe72af0a 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -614,6 +614,24 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: xdebug -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: GIT extension + && git clone https://github.com/shivammathur/xdebug /tmp/xdebug \ + && cd /tmp/xdebug \ + # Custom: Branch + && git checkout fix-jmpznz \ + # Default: Install command + && phpize \ + && ./configure --enable-xdebug \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + # Enabling + && docker-php-ext-enable xdebug \ + && true + + # -------------------- Installing PHP Extension: xsl -------------------- RUN set -eux \ # Installation: Generic @@ -935,6 +953,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^uploadprogress$' \ && php -m | grep -oiE '^uuid$' \ && php-fpm -m | grep -oiE '^uuid$' \ + && php -m | grep -oiE '^xdebug$' \ + && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ && php -m | grep -oiE '^xmlreader$' \ diff --git a/README.md b/README.md index 2ae1db0a..248e0101 100644 --- a/README.md +++ b/README.md @@ -719,7 +719,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.2 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 2fce56a9..0d2cd198 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -1290,7 +1290,7 @@ extensions_available: configure: --with-libxml-dir=/usr build_dep: [libxml2-dev] xdebug: - disabled: [8.2] + disabled: [] 5.2: type: pecl version: 2.2.7 @@ -1317,6 +1317,12 @@ extensions_available: git_url: https://github.com/xdebug/xdebug git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) configure: --enable-xdebug + # FIXME: Switch back to official xdebug after changes have been merged + 8.2: + type: git + git_url: https://github.com/shivammathur/xdebug + git_ref: fix-jmpznz + configure: --enable-xdebug all: type: pecl xlswriter: From 69689351c84d0feda2c4fd7153b4cecead1e0e58 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 3 Feb 2022 14:33:51 +0100 Subject: [PATCH 2/2] Update project files --- .github/workflows/nightly.yml | 2 +- CHANGELOG.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7b7bad3d..d2b3d529 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - '8.2' refs: - 'master' - - '0.133' + - '0.134' steps: # ------------------------------------------------------------ diff --git a/CHANGELOG.md b/CHANGELOG.md index f6645d89..5fd7cf66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.134 + +#### Changed +- Added extension `xdebug` to PHP 8.2 + + ## Release 0.133 #### Added