From f0e9843338e3c791b4d2a64761c89cd2bc96a60b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 30 Sep 2020 11:16:06 +0200
Subject: rebuild for PHP 8.0.0RC1

---
 rpminfo-tests.patch | 143 ----------------------------------------------------
 1 file changed, 143 deletions(-)
 delete mode 100644 rpminfo-tests.patch

(limited to 'rpminfo-tests.patch')

diff --git a/rpminfo-tests.patch b/rpminfo-tests.patch
deleted file mode 100644
index fedb9bd..0000000
--- a/rpminfo-tests.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 2aa9dc045d03c3cf55eefa769b4a54b20c41bc18 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 10 Apr 2020 15:49:35 +0200
-Subject: split tests for PHP 7/8
-
----
- package.xml                     |  4 +++-
- tests/002-rpmvercmp.phpt        | 13 -------------
- tests/010-rpmvercmp_error7.phpt | 25 +++++++++++++++++++++++++
- tests/011-rpmvercmp_error8.phpt | 31 +++++++++++++++++++++++++++++++
- 4 files changed, 59 insertions(+), 14 deletions(-)
- create mode 100644 tests/010-rpmvercmp_error7.phpt
- create mode 100644 tests/011-rpmvercmp_error8.phpt
-
-diff --git a/tests/002-rpmvercmp.phpt b/tests/002-rpmvercmp.phpt
-index 7da40b4..d83cf67 100644
---- a/tests/002-rpmvercmp.phpt
-+++ b/tests/002-rpmvercmp.phpt
-@@ -35,21 +35,8 @@ foreach ($cases as $case) {
- 	}
- }
- if ($ok) echo "OK\n";
--// Errors
--var_dump(rpmvercmp());
--var_dump(rpmvercmp("a"));
--var_dump(rpmvercmp("a", "b", "c"));
- ?>
- Done
- --EXPECTF--
- OK
--
--Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
--NULL
--
--Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
--NULL
--
--Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
--NULL
- Done
-diff --git a/tests/010-rpmvercmp_error7.phpt b/tests/010-rpmvercmp_error7.phpt
-new file mode 100644
-index 0000000..98bfeb3
---- /dev/null
-+++ b/tests/010-rpmvercmp_error7.phpt
-@@ -0,0 +1,25 @@
-+--TEST--
-+Check for rpmvercmp function error
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("rpminfo")) print "skip";
-+if (PHP_VERSION_ID >= 80000) print "skip only for PHP 7";
-+?>
-+--FILE--
-+<?php
-+var_dump(rpmvercmp());
-+var_dump(rpmvercmp("a"));
-+var_dump(rpmvercmp("a", "b", "c"));
-+?>
-+Done
-+--EXPECTF--
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+Done
-diff --git a/tests/011-rpmvercmp_error8.phpt b/tests/011-rpmvercmp_error8.phpt
-new file mode 100644
-index 0000000..3db3564
---- /dev/null
-+++ b/tests/011-rpmvercmp_error8.phpt
-@@ -0,0 +1,31 @@
-+--TEST--
-+Check for rpmvercmp function
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("rpminfo")) print "skip";
-+if (PHP_VERSION_ID < 80000) print "skip only for PHP 8";
-+?>
-+--FILE--
-+<?php
-+try {
-+	var_dump(rpmvercmp());
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+try {
-+	var_dump(rpmvercmp("a"));
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+try {
-+	var_dump(rpmvercmp("a", "b", "c"));
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+?>
-+Done
-+--EXPECTF--
-+rpmvercmp() expects exactly 2 parameters, 0 given
-+rpmvercmp() expects exactly 2 parameters, 1 given
-+rpmvercmp() expects exactly 2 parameters, 3 given
-+Done
--- 
-cgit v1.1
-
-From 895bc3dbd5dd48c97561bb0758f86a8c67bd6874 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 10 Apr 2020 15:53:11 +0200
-Subject: fix test
-
----
- tests/010-rpmvercmp_error7.phpt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/010-rpmvercmp_error7.phpt b/tests/010-rpmvercmp_error7.phpt
-index 98bfeb3..c9b3875 100644
---- a/tests/010-rpmvercmp_error7.phpt
-+++ b/tests/010-rpmvercmp_error7.phpt
-@@ -14,12 +14,12 @@ var_dump(rpmvercmp("a", "b", "c"));
- Done
- --EXPECTF--
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s
- NULL
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s
- NULL
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s
- NULL
- Done
--- 
-cgit v1.1
-
-- 
cgit