diff options
| author | Remi Collet <remi@remirepo.net> | 2018-06-27 16:20:24 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-06-27 16:20:24 +0200 |
| commit | adfc16dd3a051c7c53dbb607a138295c50d02747 (patch) | |
| tree | cc8b5624dc3beac07d9bd8fe7668d5896f5413a8 /60.patch | |
| parent | 177b2d12047d7313f75c2519f6b11fbd5422ad54 (diff) | |
add upstream patches for PHP 7.3 and patch from https://github.com/bwoebi/php-uv/pull/60/files
Diffstat (limited to '60.patch')
| -rw-r--r-- | 60.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/60.patch b/60.patch new file mode 100644 index 0000000..b4e0893 --- /dev/null +++ b/60.patch @@ -0,0 +1,30 @@ +From b1b5729f4da87117ce07cdf091b38225b296ae58 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 27 Jun 2018 16:14:08 +0200 +Subject: [PATCH] relax tests for 7.3 + +--- + tests/300-fs_close.phpt | 2 +- + tests/330-poll-fd.phpt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/300-fs_close.phpt b/tests/300-fs_close.phpt +index 1f85500..d21ccc7 100644 +--- a/tests/300-fs_close.phpt ++++ b/tests/300-fs_close.phpt +@@ -16,4 +16,4 @@ uv_fs_open(uv_default_loop(), FIXTURE_PATH, UV::O_RDONLY, 0, function($r){ + + uv_run(); + --EXPECTF-- +-Warning: uv_fs_close() expects parameter 2 to be resource, integer given in %s on line %d ++Warning: uv_fs_close() expects parameter 2 to be resource, in%s given in %s on line %d +diff --git a/tests/330-poll-fd.phpt b/tests/330-poll-fd.phpt +index ea2e3a2..3b80eec 100644 +--- a/tests/330-poll-fd.phpt ++++ b/tests/330-poll-fd.phpt +@@ -21,4 +21,4 @@ Warning: uv_poll_init(): invalid resource passed, this resource is not supported + + Warning: uv_poll_init(): uv_poll_init failed in %s on line %d + +-Warning: uv_poll_start() expects parameter 1 to be UVPoll, boolean given in %s on line %d ++Warning: uv_poll_start() expects parameter 1 to be UVPoll, boo%s given in %s on line %d |