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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
From 9e4f26711c0ef1b1d745e7eedc4261b07bca9d1e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Jul 2026 15:09:08 +0200
Subject: [PATCH 1/2] Fix build with PHP 8.6.0alpha2
. The INI_STR(), INI_INT(), INI_FLT(), and INI_BOOL() macros have been
removed. Instead new zend_ini_{bool|long|double|str|string}_literal()
macros have been added.
Compatibility macro added for old versions
INI_BOOL used in previous version is zend_ini_long
It now uses zend_ini_parse_bool with PHP 8.3+
---
pcov.c | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/pcov.c b/pcov.c
index 06e60ee..411ebf3 100644
--- a/pcov.c
+++ b/pcov.c
@@ -57,6 +57,16 @@
#define GC_SET_REFCOUNT(ref, rc) (GC_REFCOUNT(ref) = (rc))
#endif
+#if PHP_VERSION_ID < 80600
+#if PHP_VERSION_ID < 80300
+#define zend_ini_bool_literal(name) ((zend_bool)zend_ini_long((name), sizeof("" name) - 1, 0))
+#else
+#define zend_ini_bool_literal(name) zend_ini_parse_bool(zend_ini_str((name), sizeof("" name) - 1, 0))
+#endif
+#define zend_ini_long_literal(name) zend_ini_long((name), sizeof("" name) - 1, 0)
+#define zend_ini_string_literal(name) zend_ini_string((name), sizeof("" name) - 1, 0)
+#endif
+
static zend_always_inline bool php_pcov_api_enabled(void) {
const char* env = getenv("PCOV_ENABLED");
@@ -102,7 +112,7 @@ static zend_always_inline bool php_pcov_api_enabled(void) {
return false;
}
- return INI_BOOL("pcov.enabled");
+ return zend_ini_bool_literal("pcov.enabled");
}
#define PHP_PCOV_API_ENABLED_GUARD() do { \
@@ -423,7 +433,7 @@ const char *php_pcov_directory_defaults[] = { /* {{{ */
NULL
}; /* }}} */
-static void php_pcov_setup_directory(char *directory) { /* {{{ */
+static void php_pcov_setup_directory(const char *directory) { /* {{{ */
char realpath[MAXPATHLEN];
zend_stat_t statbuf;
@@ -448,7 +458,7 @@ static void php_pcov_setup_directory(char *directory) { /* {{{ */
PCG(directory) = zend_string_init(directory, strlen(directory), 0);
} /* }}} */
-static zend_always_inline void php_pcov_setup_exclude(char *exclude) { /* {{{ */
+static zend_always_inline void php_pcov_setup_exclude(const char *exclude) { /* {{{ */
zend_string *pattern;
if (!exclude || !*exclude) {
@@ -479,17 +489,17 @@ PHP_RINIT_FUNCTION(pcov)
return SUCCESS;
}
- PCG(mem) = zend_arena_create(INI_INT("pcov.initial.memory"));
+ PCG(mem) = zend_arena_create(zend_ini_long_literal("pcov.initial.memory"));
- zend_hash_init(&PCG(files), INI_INT("pcov.initial.files"), NULL, php_pcov_files_dtor, 0);
- zend_hash_init(&PCG(waiting), INI_INT("pcov.initial.files"), NULL, NULL, 0);
- zend_hash_init(&PCG(ignores), INI_INT("pcov.initial.files"), NULL, NULL, 0);
- zend_hash_init(&PCG(wants), INI_INT("pcov.initial.files"), NULL, NULL, 0);
- zend_hash_init(&PCG(discovered), INI_INT("pcov.initial.files"), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_init(&PCG(covered), INI_INT("pcov.initial.files"), NULL, php_pcov_covered_dtor, 0);
+ zend_hash_init(&PCG(files), zend_ini_long_literal("pcov.initial.files"), NULL, php_pcov_files_dtor, 0);
+ zend_hash_init(&PCG(waiting), zend_ini_long_literal("pcov.initial.files"), NULL, NULL, 0);
+ zend_hash_init(&PCG(ignores), zend_ini_long_literal("pcov.initial.files"), NULL, NULL, 0);
+ zend_hash_init(&PCG(wants), zend_ini_long_literal("pcov.initial.files"), NULL, NULL, 0);
+ zend_hash_init(&PCG(discovered), zend_ini_long_literal("pcov.initial.files"), NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_init(&PCG(covered), zend_ini_long_literal("pcov.initial.files"), NULL, php_pcov_covered_dtor, 0);
- php_pcov_setup_directory(INI_STR("pcov.directory"));
- php_pcov_setup_exclude(INI_STR("pcov.exclude"));
+ php_pcov_setup_directory(zend_ini_string_literal("pcov.directory"));
+ php_pcov_setup_exclude(zend_ini_string_literal("pcov.exclude"));
#ifdef ZEND_COMPILE_NO_JUMPTABLES
CG(compiler_options) |= ZEND_COMPILE_NO_JUMPTABLES;
@@ -547,8 +557,8 @@ PHP_RSHUTDOWN_FUNCTION(pcov)
PHP_MINFO_FUNCTION(pcov)
{
char info[64];
- char *directory = INI_STR("pcov.directory");
- char *exclude = INI_STR("pcov.exclude");
+ const char *directory = zend_ini_string_literal("pcov.directory");
+ const char *exclude = zend_ini_string_literal("pcov.exclude");
php_info_print_table_start();
@@ -567,13 +577,13 @@ PHP_MINFO_FUNCTION(pcov)
snprintf(info, sizeof(info),
ZEND_LONG_FMT " bytes",
- (zend_long) INI_INT("pcov.initial.memory"));
+ zend_ini_long_literal("pcov.initial.memory"));
php_info_print_table_row(2,
"pcov.initial.memory", info);
snprintf(info, sizeof(info),
ZEND_LONG_FMT,
- (zend_long) INI_INT("pcov.initial.files"));
+ zend_ini_long_literal("pcov.initial.files"));
php_info_print_table_row(2,
"pcov.initial.files", info);
@@ -862,7 +872,7 @@ PHP_NAMED_FUNCTION(php_pcov_clear)
PCG(mem) =
zend_arena_create(
- INI_INT("pcov.initial.memory"));
+ zend_ini_long_literal("pcov.initial.memory"));
PCG(start) = NULL;
PCG(last) = NULL;
From f04029fa86ae58c6dfff8049de8433669dbf1394 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Jul 2026 15:31:30 +0200
Subject: [PATCH 2/2] fix build with PHP < 8
---
pcov.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pcov.c b/pcov.c
index 411ebf3..fb7ce56 100644
--- a/pcov.c
+++ b/pcov.c
@@ -39,6 +39,8 @@
#include "zend_vm_opcodes.h"
#include "php_pcov.h"
+/* needed for PHP_VERSION_ID < 80000 */
+#include <stdbool.h>
#define PCOV_FILTER_ALL 0
#define PCOV_FILTER_INCLUDE 1
|
