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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
|
From e629fb640e11f2358c04fe72d50afbd0a004596c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 23 Sep 2020 16:44:57 +0200
Subject: [PATCH] add arginfo for all functions - drop support for PHP 4.x -
add compatibility with PHP 8
---
.gitignore | 2 +
package.xml | 2 +-
php_yaz.c | 209 +++++++++++++++++++++++++++++++++++++++-------------
3 files changed, 162 insertions(+), 51 deletions(-)
diff --git a/php_yaz.c b/php_yaz.c
index e157815..64b5079 100644
--- a/php_yaz.c
+++ b/php_yaz.c
@@ -18,6 +18,12 @@
#include "php_yaz.h"
+/* for PHP 8+ */
+#ifndef TSRMLS_CC
+#define TSRMLS_CC
+#define TSRMLS_DC
+#endif
+
#ifndef YAZ_VERSIONL
#error YAZ version 3.0.2 or later must be used.
#elif YAZ_VERSIONL < 0x030020
@@ -138,62 +144,165 @@ static int le_link;
ZEND_GET_MODULE(yaz)
#endif
-#ifdef ZEND_BEGIN_ARG_INFO
- ZEND_BEGIN_ARG_INFO(first_argument_force_ref, 0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, url)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO();
- ZEND_BEGIN_ARG_INFO(second_argument_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
-
- ZEND_BEGIN_ARG_INFO(third_argument_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
-#else
-static unsigned char first_argument_force_ref[] = {
- 1, BYREF_FORCE };
-static unsigned char second_argument_force_ref[] = {
- 2, BYREF_NONE, BYREF_FORCE };
-static unsigned char third_argument_force_ref[] = {
- 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
-#endif
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_close, 0, 0, 1)
+ ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO();
+
+#define arginfo_yaz_present arginfo_yaz_close
+
+#define arginfo_yaz_errno arginfo_yaz_close
+
+#define arginfo_yaz_error arginfo_yaz_close
+
+#define arginfo_yaz_addinfo arginfo_yaz_close
+
+#define arginfo_yaz_es_result arginfo_yaz_close
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_search, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, type)
+ ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_wait, 0, 0, 0)
+ ZEND_ARG_INFO(1, options)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(1, searchresult)
+ ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, pos)
+ ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_syntax, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, syntax)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_element, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, elementsetname)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_schema, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, schema)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_set_option, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, options_or_name)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_get_option, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_range, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, start)
+ ZEND_ARG_INFO(0, number)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_sort, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, sortspec)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_itemorder, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, package)
+ZEND_END_ARG_INFO();
+
+#define arginfo_yaz_ccl_conf arginfo_yaz_itemorder
+
+#define arginfo_yaz_cql_conf arginfo_yaz_itemorder
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_es, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, type)
+ ZEND_ARG_INFO(0, package)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, type)
+ ZEND_ARG_INFO(0, query)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(1, options)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_ccl_parse, 0, 0, 3)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, query)
+ ZEND_ARG_INFO(1, result)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_cql_parse, 0, 0, 4)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, cql)
+ ZEND_ARG_INFO(1, result)
+ ZEND_ARG_INFO(0, rev)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
+ ZEND_ARG_INFO(0, id)
+ ZEND_ARG_INFO(0, package)
+ZEND_END_ARG_INFO();
zend_function_entry yaz_functions [] = {
- PHP_FE(yaz_connect, NULL)
- PHP_FE(yaz_close, NULL)
- PHP_FE(yaz_search, NULL)
- PHP_FE(yaz_wait, first_argument_force_ref)
- PHP_FE(yaz_errno, NULL)
- PHP_FE(yaz_error, NULL)
- PHP_FE(yaz_addinfo, NULL)
- PHP_FE(yaz_hits, second_argument_force_ref)
- PHP_FE(yaz_record, NULL)
- PHP_FE(yaz_syntax, NULL)
- PHP_FE(yaz_element, NULL)
- PHP_FE(yaz_range, NULL)
- PHP_FE(yaz_itemorder, NULL)
- PHP_FE(yaz_es_result, NULL)
- PHP_FE(yaz_scan, NULL)
- PHP_FE(yaz_scan_result, second_argument_force_ref)
- PHP_FE(yaz_present, NULL)
- PHP_FE(yaz_ccl_conf, NULL)
- PHP_FE(yaz_ccl_parse, third_argument_force_ref)
+ PHP_FE(yaz_connect, arginfo_yaz_connect)
+ PHP_FE(yaz_close, arginfo_yaz_close)
+ PHP_FE(yaz_search, arginfo_yaz_search)
+ PHP_FE(yaz_wait, arginfo_yaz_wait)
+ PHP_FE(yaz_errno, arginfo_yaz_errno)
+ PHP_FE(yaz_error, arginfo_yaz_error)
+ PHP_FE(yaz_addinfo, arginfo_yaz_addinfo)
+ PHP_FE(yaz_hits, arginfo_yaz_hits)
+ PHP_FE(yaz_record, arginfo_yaz_record)
+ PHP_FE(yaz_syntax, arginfo_yaz_syntax)
+ PHP_FE(yaz_element, arginfo_yaz_element)
+ PHP_FE(yaz_range, arginfo_yaz_range)
+ PHP_FE(yaz_itemorder, arginfo_yaz_itemorder)
+ PHP_FE(yaz_es_result, arginfo_yaz_es_result)
+ PHP_FE(yaz_scan, arginfo_yaz_scan)
+ PHP_FE(yaz_scan_result, arginfo_yaz_scan_result)
+ PHP_FE(yaz_present, arginfo_yaz_present)
+ PHP_FE(yaz_ccl_conf, arginfo_yaz_ccl_conf)
+ PHP_FE(yaz_ccl_parse, arginfo_yaz_ccl_parse)
#if YAZ_VERSIONL >= 0x050100
- PHP_FE(yaz_cql_parse, third_argument_force_ref)
- PHP_FE(yaz_cql_conf, NULL)
-#endif
- PHP_FE(yaz_database, NULL)
- PHP_FE(yaz_sort, NULL)
- PHP_FE(yaz_schema, NULL)
- PHP_FE(yaz_set_option, NULL)
- PHP_FE(yaz_get_option, NULL)
- PHP_FE(yaz_es, NULL)
+ PHP_FE(yaz_cql_parse, arginfo_yaz_cql_parse)
+ PHP_FE(yaz_cql_conf, arginfo_yaz_cql_conf)
+#endif
+ PHP_FE(yaz_database, arginfo_databases)
+ PHP_FE(yaz_sort, arginfo_yaz_sort)
+ PHP_FE(yaz_schema, arginfo_yaz_schema)
+ PHP_FE(yaz_set_option, arginfo_yaz_set_option)
+ PHP_FE(yaz_get_option, arginfo_yaz_get_option)
+ PHP_FE(yaz_es, arginfo_yaz_es)
+#ifdef PHP_FE_END
+ PHP_FE_END
+#else
{NULL, NULL, NULL}
+#endif
};
static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, zval *id, Yaz_Association *assocp)
From 323962299bae3b2085dde44790785a39878f5f9a Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 24 Sep 2020 19:45:58 +0200
Subject: [PATCH] Fixes for arg info
---
php_yaz.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/php_yaz.c b/php_yaz.c
index 64b5079..de9693d 100644
--- a/php_yaz.c
+++ b/php_yaz.c
@@ -176,7 +176,6 @@ ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
ZEND_ARG_INFO(0, id)
ZEND_ARG_INFO(1, searchresult)
- ZEND_ARG_INFO(0, query)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
@@ -244,7 +243,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
-ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 1)
ZEND_ARG_INFO(0, id)
ZEND_ARG_INFO(1, options)
ZEND_END_ARG_INFO();
@@ -264,7 +263,7 @@ ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
ZEND_ARG_INFO(0, id)
- ZEND_ARG_INFO(0, package)
+ ZEND_ARG_INFO(0, databases)
ZEND_END_ARG_INFO();
|
