diff options
author | Remi Collet <remi@remirepo.net> | 2020-09-22 15:45:17 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2020-09-22 15:45:17 +0200 |
commit | 949e6cdb917bf6e60fabe3cf662983e13c644a30 (patch) | |
tree | 3e428797d29eb7c5d267797bf2aaafbee4a1024e /ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch | |
parent | b6ee1442bdf8d265a7fc1de79976bb79b90eaec4 (diff) |
add patches for PHP 8 from upstream and from
https://github.com/kjdev/php-ext-lz4/pull/26
Diffstat (limited to 'ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch')
-rw-r--r-- | ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch | 201 |
1 files changed, 201 insertions, 0 deletions
diff --git a/ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch b/ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch new file mode 100644 index 0000000..cba330d --- /dev/null +++ b/ef4f39b2149765cac1f9a7bc5a360e09e9e506e6.patch @@ -0,0 +1,201 @@ +From ef4f39b2149765cac1f9a7bc5a360e09e9e506e6 Mon Sep 17 00:00:00 2001 +From: kj <kjclev@gmail.com> +Date: Tue, 27 Aug 2019 08:49:35 +0900 +Subject: [PATCH] Fixed for tests in nightly + +--- + tests/002.phpt | 4 ++- + tests/002_b.phpt | 68 +++++++++++++++++++++++++++++++++++++++++ + tests/005.phpt | 2 ++ + tests/005_b.phpt | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 151 insertions(+), 1 deletion(-) + create mode 100644 tests/002_b.phpt + create mode 100644 tests/005_b.phpt + +diff --git a/tests/002.phpt b/tests/002.phpt +index 5e1f519..adf8509 100644 +--- a/tests/002.phpt ++++ b/tests/002.phpt +@@ -1,8 +1,10 @@ + --TEST-- + Test lz4_compress() function : error conditions + --SKIPIF-- ++<?php ++if (version_compare(PHP_VERSION, '8.0', '>=')) die('skip PHP is too old'); + --FILE-- +-<?php ++<?php + if (!extension_loaded('lz4')) { + dl('lz4.' . PHP_SHLIB_SUFFIX); + } +diff --git a/tests/002_b.phpt b/tests/002_b.phpt +new file mode 100644 +index 0000000..a56dac8 +--- /dev/null ++++ b/tests/002_b.phpt +@@ -0,0 +1,68 @@ ++--TEST-- ++Test lz4_compress() function : error conditions ++--SKIPIF-- ++<?php ++if (version_compare(PHP_VERSION, '8.0', '<')) die('skip PHP is too new'); ++--FILE-- ++<?php ++if (!extension_loaded('lz4')) { ++ dl('lz4.' . PHP_SHLIB_SUFFIX); ++} ++ ++include(dirname(__FILE__) . '/data.inc'); ++ ++echo "*** Testing lz4_compress() : error conditions ***\n"; ++ ++// Zero arguments ++echo "\n-- Testing lz4_compress() function with Zero arguments --\n"; ++try { ++ var_dump(lz4_compress()); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++ ++//Test lz4_compress with one more than the expected number of arguments ++echo "\n-- Testing lz4_compress() function with more than expected no. of arguments --\n"; ++$data = 'string_val'; ++$extra_arg = 10; ++try { ++ var_dump(lz4_compress($data, 6, false, $extra_arg)); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++ ++class Tester { ++ function Hello() { ++ echo "Hello\n"; ++ } ++} ++ ++echo "\n-- Testing with incorrect parameters --\n"; ++$testclass = new Tester(); ++try { ++ var_dump(lz4_compress($testclass)); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++?> ++===Done=== ++--EXPECTF-- ++*** Testing lz4_compress() : error conditions *** ++ ++-- Testing lz4_compress() function with Zero arguments -- ++ArgumentCountError: lz4_compress() expects at least 1 parameter, 0 given in %s:%d ++Stack trace: ++#0 %s(%d): lz4_compress() ++#1 {main} ++ ++-- Testing lz4_compress() function with more than expected no. of arguments -- ++ArgumentCountError: lz4_compress() expects at most 3 parameters, 4 given in %s:%d ++Stack trace: ++#0 %s(%d): lz4_compress(%s) ++#1 {main} ++ ++-- Testing with incorrect parameters -- ++ ++Warning: lz4_compress : expects parameter to be string. in %s on line %d ++bool(false) ++===Done=== +diff --git a/tests/005.phpt b/tests/005.phpt +index 19add34..6133d83 100644 +--- a/tests/005.phpt ++++ b/tests/005.phpt +@@ -1,6 +1,8 @@ + --TEST-- + Test lz4_uncompress() function : error conditions + --SKIPIF-- ++<?php ++if (version_compare(PHP_VERSION, '8.0', '>=')) die('skip PHP is too old'); + --FILE-- + <?php + if (!extension_loaded('lz4')) { +diff --git a/tests/005_b.phpt b/tests/005_b.phpt +new file mode 100644 +index 0000000..afb5158 +--- /dev/null ++++ b/tests/005_b.phpt +@@ -0,0 +1,78 @@ ++--TEST-- ++Test lz4_uncompress() function : error conditions ++--SKIPIF-- ++<?php ++if (version_compare(PHP_VERSION, '8.0', '<')) die('skip PHP is too new'); ++--FILE-- ++<?php ++if (!extension_loaded('lz4')) { ++ dl('lz4.' . PHP_SHLIB_SUFFIX); ++} ++ ++echo "*** Testing lz4_uncompress() : error conditions ***\n"; ++ ++// Zero arguments ++echo "\n-- Testing lz4_uncompress() function with Zero arguments --\n"; ++try { ++ var_dump( lz4_uncompress() ); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++ ++//Test lz4_uncompress with one more than the expected number of arguments ++echo "\n-- Testing lz4_uncompress() function with more than expected no. of arguments --\n"; ++$data = 'string_val'; ++$extra_arg = 10; ++try { ++ var_dump( lz4_uncompress($data, -1, -1, $extra_arg) ); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++ ++ ++echo "\n-- Testing with incorrect arguments --\n"; ++try { ++ var_dump(lz4_uncompress(123)); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++ ++class Tester ++{ ++ function Hello() ++ { ++ echo "Hello\n"; ++ } ++} ++ ++$testclass = new Tester(); ++try { ++ var_dump(lz4_uncompress($testclass)); ++} catch (Error $e) { ++ echo $e, PHP_EOL; ++} ++?> ++===DONE=== ++--EXPECTF-- ++*** Testing lz4_uncompress() : error conditions *** ++ ++-- Testing lz4_uncompress() function with Zero arguments -- ++ArgumentCountError: lz4_uncompress() expects at least 1 parameter, 0 given in %s:%d ++Stack trace: ++#0 %s(%d): lz4_uncompress() ++#1 {main} ++ ++-- Testing lz4_uncompress() function with more than expected no. of arguments -- ++ArgumentCountError: lz4_uncompress() expects at most 3 parameters, 4 given in %s:%d ++Stack trace: ++#0 %s(%d): lz4_uncompress(%s) ++#1 {main} ++ ++-- Testing with incorrect arguments -- ++ ++Warning: lz4_uncompress : expects parameter to be string. in %s on line %d ++bool(false) ++ ++Warning: lz4_uncompress : expects parameter to be string. in %s on line %d ++bool(false) ++===DONE=== |