From 8608fc9c9a8a5d3de78d201d67d94789cb5c4800 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Jun 2018 15:47:23 +0200 Subject: add patch for PHP 7.3 from https://github.com/cataphract/php-rar/pull/4 --- 4.patch | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 4.patch (limited to '4.patch') diff --git a/4.patch b/4.patch new file mode 100644 index 0000000..e8acd50 --- /dev/null +++ b/4.patch @@ -0,0 +1,91 @@ +From 1225c9240e0e368dad6ccc5f618e000560b4925d Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 26 Jun 2018 15:22:42 +0200 +Subject: [PATCH] relax tests for 7.3 (bool/boolean, main/count) + +--- + tests/002.phpt | 2 +- + tests/003.phpt | 2 +- + tests/008.phpt | 2 +- + tests/079.phpt | 4 ++-- + tests/092.phpt | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/002.phpt b/tests/002.phpt +index f90617a..358aba8 100644 +--- a/tests/002.phpt ++++ b/tests/002.phpt +@@ -163,6 +163,6 @@ array(2) { + + Warning: rar_open(): Failed to open %s: ERAR_EOPEN (file open error) in %s on line %d + +-Warning: rar_list() expects parameter 1 to be RarArchive, boolean given in %s on line %d ++Warning: rar_list() expects parameter 1 to be RarArchive, boo%s given in %s on line %d + NULL + Done +diff --git a/tests/003.phpt b/tests/003.phpt +index 2f0a6df..9b77d2f 100644 +--- a/tests/003.phpt ++++ b/tests/003.phpt +@@ -89,6 +89,6 @@ object(RarEntry)#%d (%d) { + + Warning: rar_open(): Failed to open %s: ERAR_EOPEN (file open error) in %s on line %d + +-Warning: rar_entry_get() expects parameter 1 to be RarArchive, boolean given in %s on line %d ++Warning: rar_entry_get() expects parameter 1 to be RarArchive, boo%s given in %s on line %d + NULL + Done +diff --git a/tests/008.phpt b/tests/008.phpt +index f79c97a..f864c97 100644 +--- a/tests/008.phpt ++++ b/tests/008.phpt +@@ -28,7 +28,7 @@ bool(false) + + Warning: rar_open(): Failed to open %s: ERAR_EOPEN (file open error) in %s on line %d + +-Warning: rar_entry_get() expects parameter 1 to be RarArchive, boolean given in %s on line %d ++Warning: rar_entry_get() expects parameter 1 to be RarArchive, boo%s given in %s on line %d + NULL + + Done +diff --git a/tests/079.phpt b/tests/079.phpt +index f243b85..0ee005a 100644 +--- a/tests/079.phpt ++++ b/tests/079.phpt +@@ -48,12 +48,12 @@ Count: 13 + + * Closed file test (1): + +-Warning: count(): The archive is already closed in %s on line %d ++Warning: %s(): The archive is already closed in %s on line %d + int(0) + + * Closed file test (2): + +-Warning: count(): The archive is already closed in %s on line %d ++Warning: %s(): The archive is already closed in %s on line %d + int(0) + + * Closed file test (3, exceptions): +diff --git a/tests/092.phpt b/tests/092.phpt +index 39b8331..6ddd6f2 100644 +--- a/tests/092.phpt ++++ b/tests/092.phpt +@@ -54,7 +54,7 @@ Warning: rar_allow_broken_set() expects exactly 2 parameters, 1 given in %s on l + Warning: RarArchive::getEntries(): ERAR_EOPEN (file open error) in %s on line %d + bool(false) + +-Warning: count(): ERAR_EOPEN (file open error) in %s on line %d ++Warning: %s(): ERAR_EOPEN (file open error) in %s on line %d + int(0) + + * broken file; do not allow broken (explicit) +@@ -62,7 +62,7 @@ int(0) + Warning: RarArchive::getEntries(): ERAR_EOPEN (file open error) in %s on line %d + bool(false) + +-Warning: count(): ERAR_EOPEN (file open error) in %s on line %d ++Warning: %s(): ERAR_EOPEN (file open error) in %s on line %d + int(0) + + * broken file; allow broken -- cgit