diff options
| author | Remi Collet <remi@remirepo.net> | 2021-10-28 14:37:15 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-10-28 14:37:15 +0200 |
| commit | 0276c7b2cdad4c051483423c5f2605c4a2e629ce (patch) | |
| tree | 9abe4e5cb34e5571b2b0fa35f3b869ab816d9672 /yaml-php81.patch | |
| parent | b623b209f09d8802a291e89eb4b2e935782e6dd1 (diff) | |
update to 2.2.2
drop patch merged upstream
Diffstat (limited to 'yaml-php81.patch')
| -rw-r--r-- | yaml-php81.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/yaml-php81.patch b/yaml-php81.patch deleted file mode 100644 index 7cee205..0000000 --- a/yaml-php81.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 53065f4a99d94c6576067df4bc34f1f6fd32d59a Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 9 Jun 2021 15:51:54 +0200 -Subject: [PATCH 1/2] relax test, hide deprecation message - ---- - tests/yaml_parse_file_002.phpt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/yaml_parse_file_002.phpt b/tests/yaml_parse_file_002.phpt -index 83c54c7..d626eab 100644 ---- a/tests/yaml_parse_file_002.phpt -+++ b/tests/yaml_parse_file_002.phpt -@@ -5,6 +5,8 @@ yaml_parse_file - error cases - --INI-- - yaml.decode_timestamp=1 - date.timezone=GMT -+; E_ALL - E_DEPRECATED to hide Deprecated: yaml_parse_file(): Passing null to parameter #1... -+error_reporting=24575 - --FILE-- - <?php - try { - -From 0dbda266156a6d77496f28c5055131bcb4ca0b7f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 23 Jul 2021 13:52:03 +0200 -Subject: [PATCH 2/2] fix ZEND_ATOL usage - ---- - detect.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/detect.c b/detect.c -index 1d650f7..0a18aba 100644 ---- a/detect.c -+++ b/detect.c -@@ -542,7 +542,11 @@ scalar_is_numeric(const char *value, size_t length, zend_long *lval, - break; - - default: -+#if PHP_VERSION_ID < 80100 - ZEND_ATOL(*lval, buf); -+#else -+ *lval = ZEND_ATOL(buf); -+#endif - break; - } - |