adapt tests for new libxmlHEADmaster

3 files changed, 51 insertions, 27 deletions

diff --git a/php-pecl-xmlrpc.spec b/php-pecl-xmlrpc.spec
index d814641..ec92bd4 100644
--- a/php-pecl-xmlrpc.spec
+++ b/php-pecl-xmlrpc.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-xmlrpc
 #
-# Copyright (c) 2020-2023 Remi Collet
+# Copyright (c) 2020-2024 Remi Collet
 # License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -33,7 +33,7 @@
 Summary:        Functions to write XML-RPC servers and clients
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upver}%{?rclower:~%{rclower}}%{?gh_date:.%{gh_date}}
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 # Extension is PHP
 # Library is MIT
@@ -45,7 +45,7 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Source0:        https://pecl.php.net/get/%{sources}.tgz
 %endif
 
-Patch0:         %{pecl_name}-php82.patch
+Patch0:         %{pecl_name}-tests.patch
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -197,6 +197,9 @@ TEST_PHP_ARGS="-n -d extension=xml -d extension=%{buildroot}%{php_extdir}/%{pecl
 
 
 %changelog
+* Mon Jan 29 2024 Remi Collet <remi@remirepo.net> - 1.0.0~rc3-10
+- adapt tests for new libxml
+
 * Thu Aug 24 2023 Remi Collet <remi@remirepo.net> - 1.0.0~rc3-3
 - build out of sources tree
 
diff --git a/xmlrpc-php82.patch b/xmlrpc-php82.patch
deleted file mode 100644
index a7c89c4..0000000
--- a/xmlrpc-php82.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e83ef297bb23cc4e4de2cfb4bc83433902a196ef Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 15 Sep 2022 09:59:00 +0200
-Subject: [PATCH] fix test using dynamic properties
-
----
- tests/bug74975.phpt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/bug74975.phpt b/tests/bug74975.phpt
-index 1b35298..7d50036 100644
---- a/tests/bug74975.phpt
-+++ b/tests/bug74975.phpt
-@@ -7,6 +7,7 @@ if (!extension_loaded("xmlrpc")) print "skip";
- --FILE--
- <?php
- 
-+#[AllowDynamicProperties]
- class Foo {
- 
- }
--- 
-2.37.2
-
diff --git a/xmlrpc-tests.patch b/xmlrpc-tests.patch
new file mode 100644
index 0000000..e96dd30
--- /dev/null
+++ b/xmlrpc-tests.patch
@@ -0,0 +1,45 @@
+From e83ef297bb23cc4e4de2cfb4bc83433902a196ef Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 15 Sep 2022 09:59:00 +0200
+Subject: [PATCH] fix test using dynamic properties
+
+---
+ tests/bug74975.phpt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/bug74975.phpt b/tests/bug74975.phpt
+index 1b35298..7d50036 100644
+--- a/tests/bug74975.phpt
++++ b/tests/bug74975.phpt
+@@ -7,6 +7,7 @@ if (!extension_loaded("xmlrpc")) print "skip";
+ --FILE--
+ <?php
+ 
++#[AllowDynamicProperties]
+ class Foo {
+ 
+ }
+-- 
+2.37.2
+
+From 7dade03efe2aa11caee444968263e9f9bc8b2ea0 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Mon, 29 Jan 2024 16:00:24 +0100
+Subject: [PATCH] fix test expectation for 8.3
+
+---
+ tests/bug45556.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/bug45556.phpt b/tests/bug45556.phpt
+index 485f2c1..add52ed 100644
+--- a/tests/bug45556.phpt
++++ b/tests/bug45556.phpt
+@@ -29,6 +29,6 @@ xmlrpc_server_call_method ($server, $request, NULL, $options);
+ --EXPECTF--
+ Warning: xmlrpc_server_call_method(): Invalid callback 'foobar' passed in %s on line %d
+ 
+-Warning: xmlrpc_server_call_method(): XML parse error: [line 1, column 1, message: Invalid document end] Unable to add introspection data returned from bar::test() in %s on line %d
++Warning: xmlrpc_server_call_method(): XML parse error: [line 1, column 1, message: %s] Unable to add introspection data returned from bar::test() in %s on line %d
+ 
+ Warning: xmlrpc_server_call_method(): Invalid callback 'foo::bar' passed in %s on line %d