From 3760c9d001a541be3111682e05b5f03303ae446d Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 26 Jun 2024 10:31:21 -0700
Subject: [PATCH] Add SKIPIFs for upstream regression in libxslt (#14674)

See https://gitlab.gnome.org/GNOME/libxslt/-/issues/113
---
 ext/xsl/tests/auto_registration_namespaces_new_dom.phpt     | 4 ++++
 ext/xsl/tests/registerPHPFunctionNS.phpt                    | 4 ++++
 ext/xsl/tests/skip_upstream_issue113.inc                    | 5 +++++
 ext/xsl/tests/xslt010_gt10129.phpt                          | 1 +
 ext/xsl/tests/xsltprocessor_exsl_registerPhpFunctionNs.phpt | 1 +
 5 files changed, 15 insertions(+)
 create mode 100644 ext/xsl/tests/skip_upstream_issue113.inc

diff --git a/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt b/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
index e2a99bcb714..f96b7d19184 100644
--- a/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
+++ b/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
@@ -3,6 +3,10 @@ Auto-registration of namespaces in XSL stylesheet with new DOM
 --EXTENSIONS--
 dom
 xsl
+--SKIPIF--
+<?php
+require __DIR__.'/skip_upstream_issue113.inc';
+?>
 --FILE--
 <?php
 
diff --git a/ext/xsl/tests/registerPHPFunctionNS.phpt b/ext/xsl/tests/registerPHPFunctionNS.phpt
index 880a8f1aae0..e8243d5009b 100644
--- a/ext/xsl/tests/registerPHPFunctionNS.phpt
+++ b/ext/xsl/tests/registerPHPFunctionNS.phpt
@@ -2,6 +2,10 @@
 registerPHPFunctionNS() function - legit cases
 --EXTENSIONS--
 xsl
+--SKIPIF--
+<?php
+require __DIR__.'/skip_upstream_issue113.inc';
+?>
 --FILE--
 <?php
 
diff --git a/ext/xsl/tests/skip_upstream_issue113.inc b/ext/xsl/tests/skip_upstream_issue113.inc
new file mode 100644
index 00000000000..a08bc4f037c
--- /dev/null
+++ b/ext/xsl/tests/skip_upstream_issue113.inc
@@ -0,0 +1,5 @@
+<?php
+if ((LIBXSLT_VERSION === 10140 || LIBXSLT_VERSION === 10141)
+    && LIBXML_VERSION < 21300) {
+    die('skip upstream regression https://gitlab.gnome.org/GNOME/libxslt/-/issues/113');
+}
diff --git a/ext/xsl/tests/xslt010_gt10129.phpt b/ext/xsl/tests/xslt010_gt10129.phpt
index 7088a6b2a91..d0d61d7ced3 100644
--- a/ext/xsl/tests/xslt010_gt10129.phpt
+++ b/ext/xsl/tests/xslt010_gt10129.phpt
@@ -7,6 +7,7 @@ xsl
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
 if (LIBXSLT_VERSION < 10130) die('skip too old libxsl');
+require __DIR__.'/skip_upstream_issue113.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/xsl/tests/xsltprocessor_exsl_registerPhpFunctionNs.phpt b/ext/xsl/tests/xsltprocessor_exsl_registerPhpFunctionNs.phpt
index 3d6d231c9ed..fab072ced0d 100644
--- a/ext/xsl/tests/xsltprocessor_exsl_registerPhpFunctionNs.phpt
+++ b/ext/xsl/tests/xsltprocessor_exsl_registerPhpFunctionNs.phpt
@@ -7,6 +7,7 @@ xsl
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
 if (LIBXSLT_VERSION < 10130) die('skip too old libxsl');
+require __DIR__.'/skip_upstream_issue113.inc';
 ?>
 --FILE--
 <?php