[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

Author: David Carlier (devnexen)
Date: 2026-07-13T05:11:20+01:00

Commit: https://github.com/php/php-src/commit/35452fb43beceeeb7c996c4764989c92656b4a78
Raw diff: https://github.com/php/php-src/commit/35452fb43beceeeb7c996c4764989c92656b4a78.diff

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/gd/tests/gh19{666,739}.phpt: skip for external libgd

Changed paths:
  M  ext/gd/tests/gh19666.phpt
  M  ext/gd/tests/gh19739.phpt


Diff:

diff --git a/ext/gd/tests/gh19666.phpt b/ext/gd/tests/gh19666.phpt
index ba9bf54f5661..469cd88302f2 100644
--- a/ext/gd/tests/gh19666.phpt
+++ b/ext/gd/tests/gh19666.phpt
@@ -2,6 +2,10 @@
 GH-19666 (Unexpected nan value in imageconvolution)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+?>
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/gh19739.phpt b/ext/gd/tests/gh19739.phpt
index 7dce387b780e..7ef73aeab67d 100644
--- a/ext/gd/tests/gh19739.phpt
+++ b/ext/gd/tests/gh19739.phpt
@@ -2,6 +2,10 @@
 GH-19739 (integer overflow in imageellipse / imagefilledellipse)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+?>
 --FILE--
 <?php
 $im = imagecreatetruecolor(400, 300);