Skip to content

Commit 42a0a4f

Browse files
authored
Merge pull request #226 from devilbox/release-0.134
Release 0.134
2 parents f0b758e + 6968935 commit 42a0a4f

5 files changed

Lines changed: 35 additions & 3 deletions

File tree

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- '8.2'
4242
refs:
4343
- 'master'
44-
- '0.133'
44+
- '0.134'
4545
steps:
4646

4747
# ------------------------------------------------------------

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
## Unreleased
55

66

7+
## Release 0.134
8+
9+
#### Changed
10+
- Added extension `xdebug` to PHP 8.2
11+
12+
713
## Release 0.133
814

915
#### Added

Dockerfiles/mods/Dockerfile-8.2

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,24 @@ RUN set -eux \
614614
&& true
615615

616616

617+
# -------------------- Installing PHP Extension: xdebug --------------------
618+
RUN set -eux \
619+
# Installation: Version specific
620+
# Type: GIT extension
621+
&& git clone https://github.com/shivammathur/xdebug /tmp/xdebug \
622+
&& cd /tmp/xdebug \
623+
# Custom: Branch
624+
&& git checkout fix-jmpznz \
625+
# Default: Install command
626+
&& phpize \
627+
&& ./configure --enable-xdebug \
628+
&& make -j$(getconf _NPROCESSORS_ONLN) \
629+
&& make install \
630+
# Enabling
631+
&& docker-php-ext-enable xdebug \
632+
&& true
633+
634+
617635
# -------------------- Installing PHP Extension: xsl --------------------
618636
RUN set -eux \
619637
# Installation: Generic
@@ -935,6 +953,8 @@ RUN set -eux \
935953
&& php-fpm -m | grep -oiE '^uploadprogress$' \
936954
&& php -m | grep -oiE '^uuid$' \
937955
&& php-fpm -m | grep -oiE '^uuid$' \
956+
&& php -m | grep -oiE '^xdebug$' \
957+
&& php-fpm -m | grep -oiE '^xdebug$' \
938958
&& php -m | grep -oiE '^xml$' \
939959
&& php-fpm -m | grep -oiE '^xml$' \
940960
&& php -m | grep -oiE '^xmlreader$' \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ Check out this table to see which Docker image provides what PHP modules.
719719
<tr>
720720
<th>8.2</th>
721721
<td id="82-base">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</td>
722-
<td id="82-mods">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</td>
722+
<td id="82-mods">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</td>
723723
</tr>
724724
</tbody>
725725
</table>

build/ansible/group_vars/all/mods.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ extensions_available:
12901290
configure: --with-libxml-dir=/usr
12911291
build_dep: [libxml2-dev]
12921292
xdebug:
1293-
disabled: [8.2]
1293+
disabled: []
12941294
5.2:
12951295
type: pecl
12961296
version: 2.2.7
@@ -1317,6 +1317,12 @@ extensions_available:
13171317
git_url: https://github.com/xdebug/xdebug
13181318
git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
13191319
configure: --enable-xdebug
1320+
# FIXME: Switch back to official xdebug after changes have been merged
1321+
8.2:
1322+
type: git
1323+
git_url: https://github.com/shivammathur/xdebug
1324+
git_ref: fix-jmpznz
1325+
configure: --enable-xdebug
13201326
all:
13211327
type: pecl
13221328
xlswriter:

0 commit comments

Comments
 (0)