diff options
| author | Remi Collet <remi@remirepo.net> | 2021-12-14 07:51:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-12-14 07:51:24 +0100 |
| commit | 9962481fc712894379c909cef442cbf917c148a2 (patch) | |
| tree | f8f0c2368f0779558b4f368d3d0c1467b7b02c92 /0001-fix-missing-return-after-exception.patch | |
| parent | 5d6f38cafec257d6e25d1b2b10c272302acecf54 (diff) | |
update to 1.4.0
raise dependency on PHP 7.3
drop all patches merged upstream
switch to phpunit8
Diffstat (limited to '0001-fix-missing-return-after-exception.patch')
| -rw-r--r-- | 0001-fix-missing-return-after-exception.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/0001-fix-missing-return-after-exception.patch b/0001-fix-missing-return-after-exception.patch deleted file mode 100644 index 68b3a99..0000000 --- a/0001-fix-missing-return-after-exception.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 465cf909d98eb4f7c00c13ecb73e3d4c50e22e91 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 3 Nov 2020 10:34:40 +0100 -Subject: [PATCH 1/2] fix missing return after exception - ---- - src/php/handlers/php_common_handlers.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/php/handlers/php_common_handlers.c b/src/php/handlers/php_common_handlers.c -index 7d84dfb..e2441b2 100644 ---- a/src/php/handlers/php_common_handlers.c -+++ b/src/php/handlers/php_common_handlers.c -@@ -38,6 +38,7 @@ zval *php_ds_read_dimension_by_key_not_supported - (zval *obj, zval *offset, int type, zval *rv) { - #endif - ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); -+ return NULL; - } - - int php_ds_has_dimension_by_key_not_supported -@@ -47,6 +48,7 @@ int php_ds_has_dimension_by_key_not_supported - (zval *obj, zval *offset, int check_empty) { - #endif - ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); -+ return 0; - } - - void php_ds_unset_dimension_by_key_not_supported -@@ -56,4 +58,4 @@ void php_ds_unset_dimension_by_key_not_supported - (zval *obj, zval *offset) { - #endif - ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); --} -\ No newline at end of file -+} --- -2.25.4 - |