blob: 7cee2057c11b4236c710f25d46f59d76f9be91ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
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;
}
|
