5 files changed, 36 insertions, 1272 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f8652af648ed..5aacdc8a428d 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,18 +6,18 @@ AUX php-8.1.29-gcc14-intl.patch 810 BLAKE2B 3a16770c4ccdf0c0b2089700043c9d46a142
 AUX php-8.2.20-implicit-printf.patch 2226 BLAKE2B 859cd38c6687b517a372973a8d282494f43bc5739ffa00c829de4a43ad72a752195657ededc7d4705699c0bd1ab249e588a74f6be85e1937c55de00d2844213d SHA512 95e4f535066b72e1497673dd633aa33beaf49c5a967ca2ad04e837ddea546f935717b3095d61cef8310138d77a3d18372139af3f979030b25b9ec2dc38318fb0
 AUX php-8.2.23-fix-ub.patch 1141 BLAKE2B d9b3a0cf7bbcf9778dab55e5480b78d9e694f9818819ebc406fdebb6113802c1b90667bdd2db911038c5e235560b7448c65dc995b861835552aea1e59fd4d42b SHA512 0b7736967997611f7b14595186d55bd24cc81b23add26ed4a800b63e5ace087c22c9a32946d76b7a896fae988d64125ed10091bd079359c8c4a83b34fc1a372b
 AUX php-8.2.8-openssl-tests.patch 790 BLAKE2B fcfa6f361470f2baa65d2bbbde7c9629841546a560aa6f88d85b68727004e24949f9516340eba0339e575dcf06077d08540a7a6d58a0cda42d5cd26bf48d9e46 SHA512 d29b5334abee8bcbef62c88c01c9eaf887f25901763db75e754f6690e24138c9e45783943d32402f693bd7e4564d737521a8b0b8034d5401bac73ff30f453050
-AUX php-8.3.10-optional-png-testfixen.patch 39081 BLAKE2B 7b21cdc8cf557144eee2455d540b834e583f919ffec3bb37ddf446cbd57e8835145f988d4b53c6341313e6e4001a7d879ad8c933677db9818a17b026694da230 SHA512 74b1d84b2e10073d32c79a2a6c73a0a6d198ad84190be2f4ecf752a338bbb1ba8353799b2c0fb9ff7e9513bbf2f849b8359c62db92631d4919d99bf97688376e
 AUX php-8.3.9-gd-cachevars.patch 2287 BLAKE2B 7e9fe2192937dfcd000bdb0a8f0236582e95e97c6f7c1e5973a9bc48e8d0d1ae71c2fb4be3c507dae977d0fae96503b3bb02825a334581aca70d97cdd0545627 SHA512 3ec68bff7fd365307f41a04835c80f3acdd053924fde3e09e301349079db161318f68ac226ae1d99eaf14ee7527abe5226a0e3a7b601e0a804019b2ce8c099d8
+AUX php-bug75457-pcre2-backport.patch 1000 BLAKE2B 1acc0760326d40053e5b0572bf96f164ac169d6692ee9bfc824b36f6b0e5cbd2cee04f714f943bc59d3d7efbe127788869024b0dcd89a534272f9444ecdcb9ca SHA512 8f02f45e0574202a57e84c7bb5168e5c38656b849dd6058ebe7dd69011a6a32cd7ecb778d1c166ae72e9231ccee9915a96d5230f58a245262213c15e51853cf3
 AUX php-capstone-optional.patch 2497 BLAKE2B f23236130be88d28d933d5482f1925c4e32e09c5022544ac2dec62465e9296baabe64f57fedd7ccb9f4499d354bd466d10cfb66596e8be029be6fa4f82dbc1a1 SHA512 a9000d789a7bc54d4b6cf8ed287dcfd71958dfc85c6417737dcd66b9461be5b1aa2568a19f5a9cd29927fe9d955ac24d04e2f64f1c4018110a8f81a6eb4813c5
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 DIST php-8.1.30.tar.xz 11850340 BLAKE2B 9053c57814f53ff694ea6cf1a87253e4f8f7c5af6965a85109eca143abd8dd6c733c7f70d1c6cdc34db8932dd7e9e8289cebce37eef385ea51dc0cd8a71267ef SHA512 cdca1c1671362272bf6c2abf45d097b42ca06c0abf962ee814bf478f8b346f274f42a1b1aa6603cdd59a1978a8b9d1971b589706f2909b6ea34594de0edaee1e
 DIST php-8.2.24.tar.xz 12110000 BLAKE2B 0f5c47350b8914f87cfbee932ea2e24d29635a0bdfed111b02e81d05574ff973f657d077858c20497bdc380285305d6c0f632eee1bbc9358f84004019108e368 SHA512 19016bfb955892a9999f01a619ab26035afe1cfb6488c7d1774d6745b703afb99e59032728ab811024413757e50163cdc32b0e95fda7e1d4243deb96568c7e79
-DIST php-8.2.27.tar.xz 12150992 BLAKE2B 220b71c04db5654b16f46f831776741f653d77d4363ae1279e5f7eb745aa862087cd89f63740a6584fb4925bf5cb9f72a267cf85ea5e0828f35975a08a011861 SHA512 c368d90d833e25d2b2e3a667010f1c5b37df772e2200855d38e4bcb3344585e0783ae53fadae499fe98abab95372adf787ba2413e9b6bc818628bc29a11ed453
-DIST php-8.3.17.tar.xz 12541560 BLAKE2B a3395354578763923adba03ad046cd0259a23db5985c020c7bc67302a89b13a55b89023b2136c2269146a9e7c6020aafdac8d3d124aa7ada383b681cda290239 SHA512 78ec7896ecaaab7e968914055e11c840f64492d55c68ae6ee693a5c96b633b8b75093fc334836832422a24d4156d86e8e0c4af2f87cbd861df8b67842f1bcf88
+DIST php-8.2.28.tar.xz 12147756 BLAKE2B eb2c5ad888f98b217d553efaa5f9832c791d7dcb73e90c1f0a45b536f3cbfd8f76c0606f993ca39492e43f587f5c0be1f1adac80c3ae7281527b8b381176f3bb SHA512 af2a4f43da756a78f762dbd2b9e589e52864c7069fd55a6a2b900e32a08728a7d69b80577dc79b5d4a86993846a2232b809b75ae415344935610a3934b10c6ba
+DIST php-8.3.19.tar.xz 12560852 BLAKE2B 19fb3ee207939b497ef65960a3b691beddaecfc70c2d408a9249e048605c2a3b4eb26da362c4e8283318c03c6464ba66537eafef854615db267886ff7a6351a0 SHA512 2872639f6a6de1680540da5a2df43db7ceeb7e25690b6f66d73373779ee3f9b0c2fe74aeeb7181749c9738b64f8d41b8a6f496751778c1df10b7f9aab43f21f7
 EBUILD php-8.1.30.ebuild 22586 BLAKE2B a35ef5ea9b28ea0c0d40082aa7a9750158477f173c4eae88bb2ef4a44687a329c5152879e9759a02df8c6ad12cdb8e6762b0750cae3cd04102e3bc0acf0826ad SHA512 f383cca672b5a647e52d1def2537411f3e44d791fcafc62a665a2d1a9aed779d116f4d4b5323b7a510b03a9296677462e53277b34e48efeb86fb76f61bccc40c
 EBUILD php-8.2.24.ebuild 26595 BLAKE2B 62bff19d9e738b5e8da960d6fc8d41ff35723356017ef048e7a45d54e07b62a43dcd632837f3917654e5600097fe2c50d2247137c693bf20627773fc6054fb36 SHA512 3df0a5705098463bedd5362af4b4ec1c06797932c1c3ad666fd6be115c601409ec3cdec75342e7da520966a17e3a4db30f975a5dbc6ff2d762a0234e639720ff
-EBUILD php-8.2.27-r1.ebuild 26778 BLAKE2B 324b0334ee35dc68ec5022ae66248253ccc590cb7aa5aa665a3ae26a51339ac92541c36ba2ae0c9d99a616155f7eae521b610fd7cb60db6b26cb0d71d15f51c8 SHA512 9ac034e3e1863cf7605652332c9de0d3cc36a482b13327f34ea1ea3863753e193cbb490dc2ed7df68b3e31de848392a9965a738c510f06b07a996df4e2e59adf
-EBUILD php-8.3.17.ebuild 24728 BLAKE2B 2d2b7dd26b75a4e525034dcd0c7e791aff5446f9bf3ce01807649a65929a471473a26871545b31de8492362124f9255923d436fe259dc4a4da17f788291a42d7 SHA512 710698a017c512ed6cc087fa9fcc10828f5f32c33b6490045cd4d58230b377887b2bea389aee3e9d220bac0f083f6d05867f15075348ae47e79af2ac0c0b56bb
+EBUILD php-8.2.28.ebuild 26827 BLAKE2B eb64e3338a6ad134f8a8dc11b66b85164f15de59010207c426fcbbc6839a6529aecc6ee97e556ed5a6e12f58848bee81f6eef900859e2e8477b916b3f8af7975 SHA512 f17a796d5748e6045faf8650d2cc65dc67937052f4e8f6fc23bc20dbfccd0f89268bf051a088a333f1f6dd72cd206a526b3a93f047cb26aa63edc1982912820d
+EBUILD php-8.3.19.ebuild 24512 BLAKE2B 2c29b88c098f403a2de3b2645dbf3390a1a4691c98f965764f2b541096d7ae1cf4ea35082f82688bde6a300311388de9c60bbd8727a180ebddc162ddc06ee4da SHA512 95fd342e2f708ccbefca98edf71c9eddec3532a5297506c17841f3bb22af034be0ee84d3daa50bf0d9c1c20088a1ad9cb216735bc8b6830abbfb7b0146b4f90f
 MISC metadata.xml 4249 BLAKE2B 11f9270fbc0cae280ec3ec62c9e6acfc643f4c7952822537664e8bcdbdfed64805b0e83fcbfb83111123745fadf64b276b51e1e27c9b5eb38ef8ffc30965d12b SHA512 39c59d31de21a66ca55a4816bebd901c8f2b28b7d1340605845c535cc979bca4d8641280bf45782d5d3eb94820e054e7f52491a23a4d1cf692774e11becc55c1
diff --git a/dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch b/dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch
deleted file mode 100644
index def26884ef2f..000000000000
--- a/dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch
+++ /dev/null
@@ -1,1249 +0,0 @@
-From e25636b087c507bf12922c8faf9f526aa87153a6 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 23 Aug 2023 18:42:17 -0400
-Subject: [PATCH 1/3] ext/gd/tests: fix three misleading die() messages
-
-Three of our gd tests could be skipped with a message about requiring
-bundled GD, but those tests don't actually require bundled GD. We
-update the messages to mention the specific functions that are
-required.
----
- ext/gd/tests/bug24155.phpt    | 2 +-
- ext/gd/tests/bug39366.phpt    | 2 +-
- ext/gd/tests/imagefilter.phpt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt
-index 42c5e3d7926f5..7c12c38a1a6d7 100644
---- a/ext/gd/tests/bug24155.phpt
-+++ b/ext/gd/tests/bug24155.phpt
-@@ -4,7 +4,7 @@ Bug #24155 (gdImageRotate270 rotation problem).
- gd
- --SKIPIF--
- <?php
--    if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
-+    if (!function_exists("imagerotate")) die("skip requires imagerotate function");
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug39366.phpt b/ext/gd/tests/bug39366.phpt
-index 2fedbcef43dfe..81e81059c27e8 100644
---- a/ext/gd/tests/bug39366.phpt
-+++ b/ext/gd/tests/bug39366.phpt
-@@ -4,7 +4,7 @@ Bug #39366 (imagerotate does not respect alpha with angles>45)
- gd
- --SKIPIF--
- <?php
--    if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
-+    if (!function_exists("imagerotate")) die("skip requires imagerotate function");
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
-index 156f465da6016..79a73472511c7 100644
---- a/ext/gd/tests/imagefilter.phpt
-+++ b/ext/gd/tests/imagefilter.phpt
-@@ -4,7 +4,7 @@ imagefilter() function test
- gd
- --SKIPIF--
- <?php
--    if (!function_exists("imagefilter")) die("skip requires bundled GD library\n");
-+    if (!function_exists("imagefilter")) die("skip requires imagefilter function");
- ?>
- --FILE--
- <?php
-
-From 68a5f3f0a8e6299dddaafa2118ff322c532f1ae1 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 23 Aug 2023 19:56:10 -0400
-Subject: [PATCH 2/3] ext/gd/tests: add SKIPIF stanzas for missing PNG support
-
-The bundled libgd always has PNG support, but an external one may not.
----
- ext/gd/tests/bug22544-mb.phpt                    | 6 ++++++
- ext/gd/tests/bug22544.phpt                       | 6 ++++++
- ext/gd/tests/bug24155.phpt                       | 3 +++
- ext/gd/tests/bug27582_1.phpt                     | 6 ++++++
- ext/gd/tests/bug39780_extern.phpt                | 3 +++
- ext/gd/tests/bug43073.phpt                       | 3 +++
- ext/gd/tests/bug43475.phpt                       | 3 +++
- ext/gd/tests/bug43828.phpt                       | 3 +++
- ext/gd/tests/bug45799.phpt                       | 6 ++++++
- ext/gd/tests/bug47946.phpt                       | 3 +++
- ext/gd/tests/bug48732-mb.phpt                    | 3 +++
- ext/gd/tests/bug48732.phpt                       | 4 ++++
- ext/gd/tests/bug50194.phpt                       | 4 +++-
- ext/gd/tests/bug51498.phpt                       | 3 +++
- ext/gd/tests/bug52070.phpt                       | 6 ++++++
- ext/gd/tests/bug53504.phpt                       | 3 +++
- ext/gd/tests/bug64641.phpt                       | 3 +++
- ext/gd/tests/bug66005.phpt                       | 6 ++++++
- ext/gd/tests/bug72482_2.phpt                     | 6 ++++++
- ext/gd/tests/bug72604.phpt                       | 6 ++++++
- ext/gd/tests/bug72913.phpt                       | 6 ++++++
- ext/gd/tests/bug73213.phpt                       | 6 ++++++
- ext/gd/tests/bug73272.phpt                       | 6 ++++++
- ext/gd/tests/bug73549.phpt                       | 6 ++++++
- ext/gd/tests/bug73614.phpt                       | 3 +++
- ext/gd/tests/bug74031.phpt                       | 6 ++++++
- ext/gd/tests/bug75124.phpt                       | 3 +++
- ext/gd/tests/bug77943.phpt                       | 6 ++++++
- ext/gd/tests/bug79945.phpt                       | 3 +++
- ext/gd/tests/imagearc_basic.phpt                 | 6 ++++++
- ext/gd/tests/imagearc_variation1.phpt            | 6 ++++++
- ext/gd/tests/imagearc_variation2.phpt            | 6 ++++++
- ext/gd/tests/imagechar_basic.phpt                | 6 ++++++
- ext/gd/tests/imagecharup_basic.phpt              | 6 ++++++
- ext/gd/tests/imagecolorallocatealpha_basic.phpt  | 3 +++
- ext/gd/tests/imagecolorset_basic.phpt            | 6 ++++++
- ext/gd/tests/imageconvolution_basic.phpt         | 6 ++++++
- ext/gd/tests/imagecopyresampled_basic.phpt       | 6 ++++++
- ext/gd/tests/imagecreatefrombmp_basic.phpt       | 3 +++
- ext/gd/tests/imagecreatefromstring_bmp.phpt      | 3 +++
- ext/gd/tests/imagecreatefromtga_basic.phpt       | 3 +++
- ext/gd/tests/imagecreatefromtga_variation.phpt   | 3 +++
- ext/gd/tests/imagecreatetruecolor_basic.phpt     | 3 +++
- ext/gd/tests/imagecrop_auto.phpt                 | 3 +++
- ext/gd/tests/imagedashedline_basic.phpt          | 3 +++
- ext/gd/tests/imageellipse_basic.phpt             | 6 ++++++
- ext/gd/tests/imagefilledarc_basic.phpt           | 3 +++
- ext/gd/tests/imagefilledarc_variation1.phpt      | 3 +++
- ext/gd/tests/imagefilledarc_variation2.phpt      | 3 +++
- ext/gd/tests/imagefilledellipse_basic.phpt       | 6 ++++++
- ext/gd/tests/imagefilledpolygon_basic.phpt       | 3 +++
- ext/gd/tests/imagefilltoborder_basic.phpt        | 6 ++++++
- ext/gd/tests/imagefilter.phpt                    | 3 +++
- ext/gd/tests/imagegammacorrect_basic.phpt        | 3 +++
- ext/gd/tests/imagegammacorrect_variation1.phpt   | 3 +++
- ext/gd/tests/imagegammacorrect_variation2.phpt   | 6 ++++++
- ext/gd/tests/imageopenpolygon_basic.phpt         | 6 ++++++
- ext/gd/tests/imagepolygon_aa.phpt                | 6 ++++++
- ext/gd/tests/imagepolygon_basic.phpt             | 3 +++
- ext/gd/tests/imagerectangle_basic.phpt           | 6 ++++++
- ext/gd/tests/imageresolution_png.phpt            | 6 ++++++
- ext/gd/tests/imagesetbrush_basic.phpt            | 6 ++++++
- ext/gd/tests/imagesetthickness_basic.phpt        | 3 +++
- ext/gd/tests/imagestring_basic.phpt              | 6 ++++++
- ext/gd/tests/imagestringup_basic.phpt            | 6 ++++++
- ext/gd/tests/imagetruecolortopalette_basic.phpt  | 3 +++
- ext/gd/tests/libgd00086_extern.phpt              | 3 +++
- ext/gd/tests/test_image_equals_file_palette.phpt | 6 ++++++
- 68 files changed, 307 insertions(+), 1 deletion(-)
-
-diff --git a/ext/gd/tests/bug22544-mb.phpt b/ext/gd/tests/bug22544-mb.phpt
-index b67478e558c47..f99307df1212b 100644
---- a/ext/gd/tests/bug22544-mb.phpt
-+++ b/ext/gd/tests/bug22544-mb.phpt
-@@ -2,6 +2,12 @@
- Bug #22544 (TrueColor transparency in PNG images).
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
-     $image = imageCreateTruecolor(640, 100);
-diff --git a/ext/gd/tests/bug22544.phpt b/ext/gd/tests/bug22544.phpt
-index 1fba04d93739c..28fc6bdfbb0c1 100644
---- a/ext/gd/tests/bug22544.phpt
-+++ b/ext/gd/tests/bug22544.phpt
-@@ -2,6 +2,12 @@
- Bug #22544 (TrueColor transparency in PNG images).
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
-     $image = imageCreateTruecolor(640, 100);
-diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt
-index 7c12c38a1a6d7..d78ee9b77816f 100644
---- a/ext/gd/tests/bug24155.phpt
-+++ b/ext/gd/tests/bug24155.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists("imagerotate")) die("skip requires imagerotate function");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug27582_1.phpt b/ext/gd/tests/bug27582_1.phpt
-index 2604c5fcaa9fd..1f15474f50d4b 100644
---- a/ext/gd/tests/bug27582_1.phpt
-+++ b/ext/gd/tests/bug27582_1.phpt
-@@ -2,6 +2,12 @@
- Bug #27582 (ImageFillToBorder() on alphablending image looses alpha on fill color)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $dest = dirname(realpath(__FILE__)) . '/bug27582.png';
-diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
-index 2330bd65e57ab..438816fe22c6a 100644
---- a/ext/gd/tests/bug39780_extern.phpt
-+++ b/ext/gd/tests/bug39780_extern.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (GD_BUNDLED) die("skip requires extern GD\n");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
-index 5c54d8770f86b..80c6480fea576 100644
---- a/ext/gd/tests/bug43073.phpt
-+++ b/ext/gd/tests/bug43073.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
-index 8944b57e3cde7..454d2daad0f1a 100644
---- a/ext/gd/tests/bug43475.phpt
-+++ b/ext/gd/tests/bug43475.phpt
-@@ -7,6 +7,9 @@ gd
-     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-         die("skip test requires GD 2.2.2 or higher");
-     }
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt
-index 8a0caf5decc35..8bc3f9bbcaf83 100644
---- a/ext/gd/tests/bug43828.phpt
-+++ b/ext/gd/tests/bug43828.phpt
-@@ -7,6 +7,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-     die("skip test requires GD 2.2.2 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
-index 8576b4d007822..f7124ce5b9713 100644
---- a/ext/gd/tests/bug45799.phpt
-+++ b/ext/gd/tests/bug45799.phpt
-@@ -2,6 +2,12 @@
- Bug #45799 (imagepng() crashes on empty image).
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $img = imagecreate(500,500);
-diff --git a/ext/gd/tests/bug47946.phpt b/ext/gd/tests/bug47946.phpt
-index 39e5aef9edffc..a87300568326f 100644
---- a/ext/gd/tests/bug47946.phpt
-+++ b/ext/gd/tests/bug47946.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt
-index 13a881254c203..361c1ac4d88f8 100644
---- a/ext/gd/tests/bug48732-mb.phpt
-+++ b/ext/gd/tests/bug48732-mb.phpt
-@@ -6,6 +6,9 @@ gd
- <?php
-     if(!function_exists('imagefttext')) die('skip imagefttext() not available');
-     if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt
-index 44e4204503ef7..ed73954de3337 100644
---- a/ext/gd/tests/bug48732.phpt
-+++ b/ext/gd/tests/bug48732.phpt
-@@ -2,9 +2,13 @@
- Bug #48732 (TTF Bounding box wrong for letters below baseline)
- --EXTENSIONS--
- gd
-+
- --SKIPIF--
- <?php
-     if(!function_exists('imagefttext')) die('skip imagefttext() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt
-index 2addfe0e8325d..33d2400c46e80 100644
---- a/ext/gd/tests/bug50194.phpt
-+++ b/ext/gd/tests/bug50194.phpt
-@@ -5,7 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!function_exists('imagettftext')) die('skip imagettftext() not available');
--//die('skip freetype issues');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug51498.phpt b/ext/gd/tests/bug51498.phpt
-index 808444376525e..756ba1f71dc33 100644
---- a/ext/gd/tests/bug51498.phpt
-+++ b/ext/gd/tests/bug51498.phpt
-@@ -7,6 +7,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, "2.3.0") < 0) {
-     die("skip test requires GD 2.3.0 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug52070.phpt b/ext/gd/tests/bug52070.phpt
-index 1ba28affdbfcd..6bbe2363a650b 100644
---- a/ext/gd/tests/bug52070.phpt
-+++ b/ext/gd/tests/bug52070.phpt
-@@ -2,6 +2,12 @@
- Bug #52070 (imagedashedline() - dashed line sometimes is not visible)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $im = imagecreate(1200, 800);
-diff --git a/ext/gd/tests/bug53504.phpt b/ext/gd/tests/bug53504.phpt
-index bb74497af05ab..5bd81f35aa0cb 100644
---- a/ext/gd/tests/bug53504.phpt
-+++ b/ext/gd/tests/bug53504.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
-index d300bd8fc6a0a..edfebee99c92a 100644
---- a/ext/gd/tests/bug64641.phpt
-+++ b/ext/gd/tests/bug64641.phpt
-@@ -7,6 +7,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-     die("skip test requires GD 2.2.2 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug66005.phpt b/ext/gd/tests/bug66005.phpt
-index 78e0f481dab17..3f3b421b8856a 100644
---- a/ext/gd/tests/bug66005.phpt
-+++ b/ext/gd/tests/bug66005.phpt
-@@ -2,6 +2,12 @@
- Bug #66005 (imagecopy does not support 1bit transparency on truecolor images)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $dest = imagecreatetruecolor(150, 50);
-diff --git a/ext/gd/tests/bug72482_2.phpt b/ext/gd/tests/bug72482_2.phpt
-index 89f5bb28a77bd..0583fa4dedde3 100644
---- a/ext/gd/tests/bug72482_2.phpt
-+++ b/ext/gd/tests/bug72482_2.phpt
-@@ -2,6 +2,12 @@
- Bug 72482 (Ilegal write/read access caused by gdImageAALine overflow)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/bug72604.phpt b/ext/gd/tests/bug72604.phpt
-index 706d7891c3220..a7d24e78dfefe 100644
---- a/ext/gd/tests/bug72604.phpt
-+++ b/ext/gd/tests/bug72604.phpt
-@@ -2,6 +2,12 @@
- Bug #72604 (imagearc() ignores thickness for full arcs)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $im = imagecreatetruecolor(100, 100);
-diff --git a/ext/gd/tests/bug72913.phpt b/ext/gd/tests/bug72913.phpt
-index c3a7e9f9f56cf..9eb9c24653530 100644
---- a/ext/gd/tests/bug72913.phpt
-+++ b/ext/gd/tests/bug72913.phpt
-@@ -2,6 +2,12 @@
- Bug #72913 (imagecopy() loses single-color transparency on palette images)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $base64 = 'iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABnRSTlMAAAAAAABu'
-diff --git a/ext/gd/tests/bug73213.phpt b/ext/gd/tests/bug73213.phpt
-index c4c4bd6feeaf1..47fe8043135f8 100644
---- a/ext/gd/tests/bug73213.phpt
-+++ b/ext/gd/tests/bug73213.phpt
-@@ -2,6 +2,12 @@
- Bug #73213 (Integer overflow in imageline() with antialiasing)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/bug73272.phpt b/ext/gd/tests/bug73272.phpt
-index cf10eb227ae11..0f0920b2687db 100644
---- a/ext/gd/tests/bug73272.phpt
-+++ b/ext/gd/tests/bug73272.phpt
-@@ -2,6 +2,12 @@
- Bug #73272 (imagescale() is not affected by, but affects imagesetinterpolation())
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/bug73549.phpt b/ext/gd/tests/bug73549.phpt
-index d25941dd565d3..26a7474b7d5b4 100644
---- a/ext/gd/tests/bug73549.phpt
-+++ b/ext/gd/tests/bug73549.phpt
-@@ -2,6 +2,12 @@
- Bug #73549 (Use after free when stream is passed to imagepng)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $stream = fopen(__DIR__ . DIRECTORY_SEPARATOR . 'bug73549.png', 'w');
-diff --git a/ext/gd/tests/bug73614.phpt b/ext/gd/tests/bug73614.phpt
-index def4d37421160..e1261643f7116 100644
---- a/ext/gd/tests/bug73614.phpt
-+++ b/ext/gd/tests/bug73614.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream bugfix not yet released');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug74031.phpt b/ext/gd/tests/bug74031.phpt
-index b4efa6b749e8e..6dfb351fcff97 100644
---- a/ext/gd/tests/bug74031.phpt
-+++ b/ext/gd/tests/bug74031.phpt
-@@ -2,6 +2,12 @@
- (Bug #74031) ReflectionFunction for imagepng returns wrong number of parameters
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/bug75124.phpt b/ext/gd/tests/bug75124.phpt
-index 47b36157fec90..26e44f1d6a011 100644
---- a/ext/gd/tests/bug75124.phpt
-+++ b/ext/gd/tests/bug75124.phpt
-@@ -7,6 +7,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<')) {
-     die('skip only for bundled libgd or external libgd >= 2.2.5');
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/bug77943.phpt b/ext/gd/tests/bug77943.phpt
-index 8ed4114128f25..d7d71ceca84ae 100644
---- a/ext/gd/tests/bug77943.phpt
-+++ b/ext/gd/tests/bug77943.phpt
-@@ -2,6 +2,12 @@
- Bug #77943 (imageantialias($image, false); does not work)
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . '/func.inc';
-diff --git a/ext/gd/tests/bug79945.phpt b/ext/gd/tests/bug79945.phpt
-index b985ddd48be31..5db958e36d358 100644
---- a/ext/gd/tests/bug79945.phpt
-+++ b/ext/gd/tests/bug79945.phpt
-@@ -4,6 +4,9 @@ Bug #79945 (using php wrappers in imagecreatefrompng causes segmentation fault)
- gd
- --SKIPIF--
- <?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- set_error_handler(function($errno, $errstr) {
-     if (str_contains($errstr, 'Cannot cast a filtered stream on this system')) {
-         die('skip: fopencookie not support on this system');
-diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt
-index be80f6c5f2317..339ea0b79d18d 100644
---- a/ext/gd/tests/imagearc_basic.phpt
-+++ b/ext/gd/tests/imagearc_basic.phpt
-@@ -5,6 +5,12 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt
-index 89719aa60b494..bf20c74f0ce40 100644
---- a/ext/gd/tests/imagearc_variation1.phpt
-+++ b/ext/gd/tests/imagearc_variation1.phpt
-@@ -5,6 +5,12 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt
-index 4597cf3a8ff89..c23bca840bf4e 100644
---- a/ext/gd/tests/imagearc_variation2.phpt
-+++ b/ext/gd/tests/imagearc_variation2.phpt
-@@ -5,6 +5,12 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt
-index 3195eb82d4d4f..649dcccc2de87 100644
---- a/ext/gd/tests/imagechar_basic.phpt
-+++ b/ext/gd/tests/imagechar_basic.phpt
-@@ -5,6 +5,12 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $image = imagecreatetruecolor(180, 30);
-diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt
-index 82bc18d6ad609..7ebbb8fce9a07 100644
---- a/ext/gd/tests/imagecharup_basic.phpt
-+++ b/ext/gd/tests/imagecharup_basic.phpt
-@@ -5,6 +5,12 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $image = imagecreatetruecolor(180, 30);
-diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
-index cc02aaed0d8b3..24ac882d550d5 100644
---- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
-+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
-@@ -9,6 +9,9 @@ gd
-     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-         die("skip test requires GD 2.2.2 or higher");
-     }
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecolorset_basic.phpt b/ext/gd/tests/imagecolorset_basic.phpt
-index cb9b3683aa8ee..5ed9a1ab8600e 100644
---- a/ext/gd/tests/imagecolorset_basic.phpt
-+++ b/ext/gd/tests/imagecolorset_basic.phpt
-@@ -5,6 +5,12 @@ Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- // Create a 300x100 image
-diff --git a/ext/gd/tests/imageconvolution_basic.phpt b/ext/gd/tests/imageconvolution_basic.phpt
-index aa8347884999a..d8204e2d7eb28 100644
---- a/ext/gd/tests/imageconvolution_basic.phpt
-+++ b/ext/gd/tests/imageconvolution_basic.phpt
-@@ -5,6 +5,12 @@ Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $image = imagecreatetruecolor(180, 30);
-diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
-index a3200b3537809..9fb1178e540ae 100644
---- a/ext/gd/tests/imagecopyresampled_basic.phpt
-+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
-@@ -2,6 +2,12 @@
- imagecopyresampled()
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagecreatefrombmp_basic.phpt b/ext/gd/tests/imagecreatefrombmp_basic.phpt
-index 51eb22c71adf0..4989e617b4719 100644
---- a/ext/gd/tests/imagecreatefrombmp_basic.phpt
-+++ b/ext/gd/tests/imagecreatefrombmp_basic.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!(imagetypes() & IMG_BMP)) die('skip BMP support required');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecreatefromstring_bmp.phpt b/ext/gd/tests/imagecreatefromstring_bmp.phpt
-index 8f9e1dd675b91..34db04297e3aa 100644
---- a/ext/gd/tests/imagecreatefromstring_bmp.phpt
-+++ b/ext/gd/tests/imagecreatefromstring_bmp.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!(imagetypes() & IMG_BMP)) die('skip BMP support required');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecreatefromtga_basic.phpt b/ext/gd/tests/imagecreatefromtga_basic.phpt
-index 25f034878b0c6..c66f66efbd638 100644
---- a/ext/gd/tests/imagecreatefromtga_basic.phpt
-+++ b/ext/gd/tests/imagecreatefromtga_basic.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!(imagetypes() & IMG_TGA)) die('skip TGA support required');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecreatefromtga_variation.phpt b/ext/gd/tests/imagecreatefromtga_variation.phpt
-index 0948f978f2f6a..be9c7977bd6a7 100644
---- a/ext/gd/tests/imagecreatefromtga_variation.phpt
-+++ b/ext/gd/tests/imagecreatefromtga_variation.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!(imagetypes() & IMG_TGA)) die('skip TGA support required');
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt
-index 5af8a0a1a32bc..2e8a1ef983bd3 100644
---- a/ext/gd/tests/imagecreatetruecolor_basic.phpt
-+++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt
-@@ -7,6 +7,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagecrop_auto.phpt b/ext/gd/tests/imagecrop_auto.phpt
-index 5d3d50b3ef317..5ed8e446a7f26 100644
---- a/ext/gd/tests/imagecrop_auto.phpt
-+++ b/ext/gd/tests/imagecrop_auto.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
- if (!function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
-index b36ffbfc6f593..d9ca69ad5f0b8 100644
---- a/ext/gd/tests/imagedashedline_basic.phpt
-+++ b/ext/gd/tests/imagedashedline_basic.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imageellipse_basic.phpt b/ext/gd/tests/imageellipse_basic.phpt
-index 0c86e7cfcb859..da1e0e9926086 100644
---- a/ext/gd/tests/imageellipse_basic.phpt
-+++ b/ext/gd/tests/imageellipse_basic.phpt
-@@ -5,6 +5,12 @@ Ivan Rosolen <contato [at] ivanrosolen [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
-index f3b8c7ac8e89e..006ed4aaa23b4 100644
---- a/ext/gd/tests/imagefilledarc_basic.phpt
-+++ b/ext/gd/tests/imagefilledarc_basic.phpt
-@@ -10,6 +10,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-     die("skip test requires GD 2.2.2 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
-index d25d2afc87987..d00c9b6c0be1e 100644
---- a/ext/gd/tests/imagefilledarc_variation1.phpt
-+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
-@@ -10,6 +10,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-     die("skip test requires GD 2.2.2 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
-index fb4675ec5dd69..61157a0173158 100644
---- a/ext/gd/tests/imagefilledarc_variation2.phpt
-+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
-@@ -10,6 +10,9 @@ gd
- if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-     die("skip test requires GD 2.2.2 or higher");
- }
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt
-index 19a94b1200e24..a494b15c28e2e 100644
---- a/ext/gd/tests/imagefilledellipse_basic.phpt
-+++ b/ext/gd/tests/imagefilledellipse_basic.phpt
-@@ -2,6 +2,12 @@
- Testing imagefilledellipse() of GD library
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
-index 6cba5238d3246..bbb8f9c2eb044 100644
---- a/ext/gd/tests/imagefilledpolygon_basic.phpt
-+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt
-index 7e79ea47b46b6..f8ebe86bb2c6d 100644
---- a/ext/gd/tests/imagefilltoborder_basic.phpt
-+++ b/ext/gd/tests/imagefilltoborder_basic.phpt
-@@ -5,6 +5,12 @@ Ivan Rosolen <contato [at] ivanrosolen [dot] com>
- #testfest PHPSP on 2009-06-30
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- // Create a image
-diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
-index 79a73472511c7..c8cf182d9d4eb 100644
---- a/ext/gd/tests/imagefilter.phpt
-+++ b/ext/gd/tests/imagefilter.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists("imagefilter")) die("skip requires imagefilter function");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
-index 67b2a36a1657a..4f52309c825bf 100644
---- a/ext/gd/tests/imagegammacorrect_basic.phpt
-+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
-@@ -10,6 +10,9 @@ gd
-     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-         die("skip test requires GD 2.2.2 or higher");
-     }
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
-index 1c41a257b9ec4..55370aa49cf87 100644
---- a/ext/gd/tests/imagegammacorrect_variation1.phpt
-+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
-@@ -10,6 +10,9 @@ gd
-     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-         die("skip test requires GD 2.2.2 or higher");
-     }
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
-index c75c728296bec..33c89d205a1a7 100644
---- a/ext/gd/tests/imagegammacorrect_variation2.phpt
-+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
-@@ -2,6 +2,12 @@
- Apply imagegammacorrect() to a step wedge
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/imageopenpolygon_basic.phpt b/ext/gd/tests/imageopenpolygon_basic.phpt
-index 6ed6d63a5ac47..ed8d3b698d11c 100644
---- a/ext/gd/tests/imageopenpolygon_basic.phpt
-+++ b/ext/gd/tests/imageopenpolygon_basic.phpt
-@@ -2,6 +2,12 @@
- imageopenpolygon(): basic test
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/imagepolygon_aa.phpt b/ext/gd/tests/imagepolygon_aa.phpt
-index 77fef3beed9a5..a0fded6e5e06c 100644
---- a/ext/gd/tests/imagepolygon_aa.phpt
-+++ b/ext/gd/tests/imagepolygon_aa.phpt
-@@ -2,6 +2,12 @@
- antialiased imagepolygon()
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt
-index 4d17b30eacfa9..c41b0710ef435 100644
---- a/ext/gd/tests/imagepolygon_basic.phpt
-+++ b/ext/gd/tests/imagepolygon_basic.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt
-index d71c44156f98c..a40b130cba7d2 100644
---- a/ext/gd/tests/imagerectangle_basic.phpt
-+++ b/ext/gd/tests/imagerectangle_basic.phpt
-@@ -5,6 +5,12 @@ Ivan Rosolen <contato [at] ivanrosolen [dot] com>
- #testfest PHPSP on 2009-06-30
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- // Create a image
-diff --git a/ext/gd/tests/imageresolution_png.phpt b/ext/gd/tests/imageresolution_png.phpt
-index a72f351a156bf..13f51cd8f3a4a 100644
---- a/ext/gd/tests/imageresolution_png.phpt
-+++ b/ext/gd/tests/imageresolution_png.phpt
-@@ -2,6 +2,12 @@
- Set and get image resolution of PNG images
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $filename = __DIR__ . DIRECTORY_SEPARATOR . 'imageresolution_png.png';
-diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt
-index be8a3d33e4ad7..5142e3690b85f 100644
---- a/ext/gd/tests/imagesetbrush_basic.phpt
-+++ b/ext/gd/tests/imagesetbrush_basic.phpt
-@@ -5,6 +5,12 @@ Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- // Create the brush image
-diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt
-index 88f7803dcf610..745dfcf905b92 100644
---- a/ext/gd/tests/imagesetthickness_basic.phpt
-+++ b/ext/gd/tests/imagesetthickness_basic.phpt
-@@ -7,6 +7,9 @@ gd
- --SKIPIF--
- <?php
-     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt
-index 1a71ba173c820..8a8e247eb0731 100644
---- a/ext/gd/tests/imagestring_basic.phpt
-+++ b/ext/gd/tests/imagestring_basic.phpt
-@@ -5,6 +5,12 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $image = imagecreatetruecolor(180, 30);
-diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt
-index 85b85e1e31c51..f1e30a782fb88 100644
---- a/ext/gd/tests/imagestringup_basic.phpt
-+++ b/ext/gd/tests/imagestringup_basic.phpt
-@@ -5,6 +5,12 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
- #testfest PHPSP on 2009-06-20
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- $image = imagecreatetruecolor(180, 30);
-diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
-index ae4555bb2ad72..2f1c2961a603c 100644
---- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
-+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
-@@ -10,6 +10,9 @@ gd
-         die("skip test requires GD 2.2.2 or higher");
-     }
-     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/libgd00086_extern.phpt b/ext/gd/tests/libgd00086_extern.phpt
-index 8d2b0b7d8dbe8..a3585180b83e8 100644
---- a/ext/gd/tests/libgd00086_extern.phpt
-+++ b/ext/gd/tests/libgd00086_extern.phpt
-@@ -5,6 +5,9 @@ gd
- --SKIPIF--
- <?php
-     if (GD_BUNDLED) die("skip requires external GD library\n");
-+    if (!(imagetypes() & IMG_PNG)) {
-+        die("skip No PNG support");
-+    }
- ?>
- --FILE--
- <?php
-diff --git a/ext/gd/tests/test_image_equals_file_palette.phpt b/ext/gd/tests/test_image_equals_file_palette.phpt
-index a1022138230f6..2e294c04c4066 100644
---- a/ext/gd/tests/test_image_equals_file_palette.phpt
-+++ b/ext/gd/tests/test_image_equals_file_palette.phpt
-@@ -2,6 +2,12 @@
- test_image_equals_file(): comparing palette images
- --EXTENSIONS--
- gd
-+--SKIPIF--
-+<?php
-+if (!(imagetypes() & IMG_PNG)) {
-+    die("skip No PNG support");
-+}
-+?>
- --FILE--
- <?php
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
-
-From 14d9f2349274597bfc81c46222ea7e808d372bdb Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 30 Dec 2023 16:13:40 -0500
-Subject: [PATCH 3/3] ext/gd/tests: imagerotate() is always available
-
-Following 59ec80c5, the imagerotate() function is always available. We
-may therefore remove its function_exists() checks without harm.
----
- ext/gd/tests/bug24155.phpt             | 1 -
- ext/gd/tests/bug39366.phpt             | 4 ----
- ext/gd/tests/imagerotate_overflow.phpt | 6 ------
- 3 files changed, 11 deletions(-)
-
-diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt
-index d78ee9b77816f..c93c3bbbcb586 100644
---- a/ext/gd/tests/bug24155.phpt
-+++ b/ext/gd/tests/bug24155.phpt
-@@ -4,7 +4,6 @@ Bug #24155 (gdImageRotate270 rotation problem).
- gd
- --SKIPIF--
- <?php
--    if (!function_exists("imagerotate")) die("skip requires imagerotate function");
-     if (!(imagetypes() & IMG_PNG)) {
-         die("skip No PNG support");
-     }
-diff --git a/ext/gd/tests/bug39366.phpt b/ext/gd/tests/bug39366.phpt
-index 81e81059c27e8..3c8b0130a410a 100644
---- a/ext/gd/tests/bug39366.phpt
-+++ b/ext/gd/tests/bug39366.phpt
-@@ -2,10 +2,6 @@
- Bug #39366 (imagerotate does not respect alpha with angles>45)
- --EXTENSIONS--
- gd
----SKIPIF--
--<?php
--    if (!function_exists("imagerotate")) die("skip requires imagerotate function");
--?>
- --FILE--
- <?php
- 
-diff --git a/ext/gd/tests/imagerotate_overflow.phpt b/ext/gd/tests/imagerotate_overflow.phpt
-index 29cc89c1c56eb..a7be335ca92a6 100644
---- a/ext/gd/tests/imagerotate_overflow.phpt
-+++ b/ext/gd/tests/imagerotate_overflow.phpt
-@@ -2,12 +2,6 @@
- imagerotate() overflow with negative numbers
- --EXTENSIONS--
- gd
----SKIPIF--
--<?php
--    if (!function_exists('imagerotate')) {
--        die("skip imagerotate() not available.");
--    }
--?>
- --FILE--
- <?php
- 
diff --git a/dev-lang/php/files/php-bug75457-pcre2-backport.patch b/dev-lang/php/files/php-bug75457-pcre2-backport.patch
new file mode 100644
index 000000000000..83c0ab0b3a2e
--- /dev/null
+++ b/dev-lang/php/files/php-bug75457-pcre2-backport.patch
@@ -0,0 +1,22 @@
+From 69480be12afb4040c6dd9275b7836231cdd6f6bb Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 12 Mar 2025 07:48:05 +0100
+Subject: [PATCH] Relax test expectation for pcre2lib 10.45 Using
+ e92848789acd8aa5cf32fedb519ba9378ac64e02
+
+Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
+---
+ ext/pcre/tests/bug75457.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/pcre/tests/bug75457.phpt b/ext/pcre/tests/bug75457.phpt
+index ee5ab162f8a6c..1401b25ff6fb7 100644
+--- a/ext/pcre/tests/bug75457.phpt
++++ b/ext/pcre/tests/bug75457.phpt
+@@ -6,5 +6,5 @@ $pattern = "/(((?(?C)0?=))(?!()0|.(?0)0)())/";
+ var_dump(preg_match($pattern, "hello"));
+ ?>
+ --EXPECTF--
+-Warning: preg_match(): Compilation failed: assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d
++Warning: preg_match(): Compilation failed:%r( atomic|)%r assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d
+ bool(false)
diff --git a/dev-lang/php/php-8.2.27-r1.ebuild b/dev-lang/php/php-8.2.28.ebuild
index 48520240c2fd..d7612d5e8ebb 100644
--- a/dev-lang/php/php-8.2.27-r1.ebuild
+++ b/dev-lang/php/php-8.2.28.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
 	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
 	"${FILESDIR}/php-8.2.20-implicit-printf.patch"
 	"${FILESDIR}/php-8.2.23-fix-ub.patch"
+	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 # ARM/Windows functions (bug 923335)
diff --git a/dev-lang/php/php-8.3.17.ebuild b/dev-lang/php/php-8.3.19.ebuild
index d7b22f70b437..a450d59a202e 100644
--- a/dev-lang/php/php-8.3.17.ebuild
+++ b/dev-lang/php/php-8.3.19.ebuild
@@ -134,8 +134,8 @@ DEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/php-8.3.10-optional-png-testfixen.patch"
 	"${FILESDIR}/php-8.3.9-gd-cachevars.patch"
+	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 PHP_MV="$(ver_cut 1)"
@@ -230,15 +230,6 @@ src_prepare() {
 	#
 	rm ext/sockets/tests/bug63000.phpt || die
 
-	# depends on truetype support, thus we skip it
-	# if the "truetype" USE flag is missing
-	#
-	#   https://github.com/php/php-src/issues/17891
-	#
-	if ! use truetype ; then
-		rm ext/gd/tests/gh17373.phpt || die
-	fi
-
 	# Tests ignoring the "-n" flag we pass to run-tests.php,
 	#
 	#   https://github.com/php/php-src/pull/11669
@@ -263,14 +254,6 @@ src_prepare() {
 	# be running pre-install, in my opinion. Bug 927461.
 	rm ext/fileinfo/tests/bug78987.phpt || die
 
-	# Bug 935382, fixed eventually by
-	#
-	# - https://github.com/php/php-src/pull/14788
-	# - https://github.com/php/php-src/pull/14814
-	#
-	rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
-	rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
-
 	# Bug 935379, not yet fixed upstream but looks harmless (ordering
 	# of keys isn't guaranteed AFAICS):
 	#
@@ -293,6 +276,13 @@ src_prepare() {
 	   ext/gd/tests/bug73272.phpt \
 	   || die
 
+	# Test currently fails in the sandbox and the test for this variant
+	# might be broken. Upstream discusses removing the test again.
+	#
+	# - https://github.com/php/php-src/commit/930624899bb996efc2f6a24b992ede90
+	#
+	rm ext/standard/tests/file/bug72666_variation3.phpt || die
+
 	# One-off, somebody forgot to update a version constant
 	rm ext/reflection/tests/ReflectionZendExtension.phpt || die