Skip to content

Commit e18530f

Browse files
TimWollasebastianbergmann
authored andcommitted
Remove dependency on ext-xml
PHPUnit is not actually using the ext-xml extension. Its own test suite passes for a minimal PHP 8.5 build with the following configure line: ./configure --disable-all --enable-option-checking=fatal --enable-werror --enable-ctype --enable-tokenizer --enable-mbstring --enable-dom --with-libxml --enable-xmlwriter --enable-phar --enable-filter with the following extensions loaded [PHP Modules] Core ctype date dom filter hash json lexbor libxml mbstring pcre Phar random Reflection SPL standard tokenizer uri xmlwriter Zend OPcache [Zend Modules] Zend OPcache (cherry picked from commit 7848d0b)
1 parent 6a12a62 commit e18530f

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
6565
with:
6666
php-version: ${{ env.PHP_VERSION }}
67-
extensions: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
67+
extensions: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xmlwriter
6868
coverage: none
6969
tools: none
7070

@@ -176,7 +176,7 @@ jobs:
176176
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
177177
with:
178178
php-version: 8.3
179-
extensions: none, ctype, curl, date, dom, json, libxml, mbstring, phar, simplexml, soap, tokenizer, xml, xmlwriter, zlib
179+
extensions: none, ctype, curl, date, dom, json, libxml, mbstring, phar, simplexml, soap, tokenizer, xmlwriter, zlib
180180
coverage: none
181181
tools: none
182182

@@ -212,7 +212,7 @@ jobs:
212212
timeout-minutes: 10
213213

214214
env:
215-
PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
215+
PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xmlwriter
216216
PHP_INI_VALUES: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
217217

218218
strategy:
@@ -299,7 +299,7 @@ jobs:
299299
timeout-minutes: 10
300300

301301
env:
302-
PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
302+
PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xmlwriter
303303
PHP_INI_VALUES: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
304304

305305
strategy:
@@ -414,7 +414,7 @@ jobs:
414414
with:
415415
php-version: 7.4
416416
coverage: xdebug
417-
extensions: none, curl, dom, json, libxml, mbstring, phar, soap, tokenizer, xml, xmlwriter
417+
extensions: none, curl, dom, json, libxml, mbstring, phar, soap, tokenizer, xmlwriter
418418
ini-values: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
419419
tools: none
420420

@@ -465,7 +465,7 @@ jobs:
465465
timeout-minutes: 10
466466

467467
env:
468-
PHP_EXTENSIONS: none, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xml, xmlwriter
468+
PHP_EXTENSIONS: none, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xmlwriter
469469
PHP_INI_VALUES: assert.exception=1, phar.readonly=0, zend.assertions=1
470470

471471
steps:
@@ -528,7 +528,7 @@ jobs:
528528
timeout-minutes: 10
529529

530530
env:
531-
PHP_EXTENSIONS: none, curl, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xml, xmlwriter
531+
PHP_EXTENSIONS: none, curl, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xmlwriter
532532
PHP_INI_VALUES: assert.exception=1, phar.readonly=0, zend.assertions=1
533533

534534
strategy:
@@ -604,7 +604,7 @@ jobs:
604604
timeout-minutes: 10
605605

606606
env:
607-
PHP_EXTENSIONS: none, curl, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xml, xmlwriter
607+
PHP_EXTENSIONS: none, curl, dom, json, fileinfo, iconv, libxml, mbstring, phar, soap, tokenizer, xmlwriter
608608
PHP_INI_VALUES: assert.exception=1, phar.readonly=0, zend.assertions=1
609609

610610
strategy:

build/templates/binary-phar-autoload.php.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (version_compare('7.2.0', PHP_VERSION, '>')) {
3030
die(1);
3131
}
3232

33-
foreach (['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xml', 'xmlwriter'] as $extension) {
33+
foreach (['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xmlwriter'] as $extension) {
3434
if (extension_loaded($extension)) {
3535
continue;
3636
}

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"ext-json": "*",
3434
"ext-libxml": "*",
3535
"ext-mbstring": "*",
36-
"ext-xml": "*",
3736
"ext-xmlwriter": "*",
3837
"doctrine/instantiator": "^1.5.0",
3938
"myclabs/deep-copy": "^1.13.4",

composer.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpunit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (version_compare('7.2.0', PHP_VERSION, '>')) {
3838
die(1);
3939
}
4040

41-
foreach (['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xml', 'xmlwriter'] as $extension) {
41+
foreach (['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xmlwriter'] as $extension) {
4242
if (extension_loaded($extension)) {
4343
continue;
4444
}

0 commit comments

Comments
 (0)