Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: ext/gd/tests/gh10614.phpt: skip if no PNG support
2024-09-21 18:07:23 +00:00 · 2024-07-10 19:51:11 +02:00 · 2024-07-10 19:51:11 +02:00 · 361644b78d
commit 361644b78d
parent 4c95cb37f5 09957ab9a8
2 changed files with 6 additions and 0 deletions
--- a/3
+++ b/3
@ -14,6 +14,9 @@ PHP                                                                        NEWS
 - Dom:
  . Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos)

+- Gd:
+  . ext/gd/tests/gh10614.phpt: skip if no PNG support. (orlitzky)
+
 - LibXML:
  . Fixed bug GH-14563 (Build failure with libxml2 v2.13.0). (nielsdos)

--- a/ext/gd/tests/gh10614.phpt
+++ b/ext/gd/tests/gh10614.phpt
@ -5,6 +5,9 @@ gd
 --SKIPIF--
 <?php
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.4', '>=')) die("skip test requires GD 2.3.4 or older");
+if (!(imagetypes() & IMG_PNG)) {
+    die("skip No PNG support");
+}
 ?>
 --FILE--
 <?php