Skip to content

Commit 97b64d7

Browse files
bukkabukka
committed
Finalize code port to support PHP 8
1 parent 651daa5 commit 97b64d7

16 files changed

+218
-289
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.deps
2+
*.dep
23
*.lo
34
*.loT
45
*.la
@@ -7,6 +8,7 @@ acinclude.m4
78
aclocal.m4
89
autom4te.cache
910
build
11+
config.cache
1012
config.guess
1113
config.h
1214
config.h.in*

‎jsond.c

+33-46
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
4-
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2018 The PHP Group |
3+
| Copyright (c) The PHP Group |
64
+----------------------------------------------------------------------+
75
| This source file is subject to version 3.01 of the PHP license, |
86
| that is bundled with this package in the file LICENSE, and is |
@@ -48,7 +46,7 @@ PHP_JSOND_API zend_class_entry *php_jsond_serializable_ce;
4846

4947
PHP_JSOND_API ZEND_DECLARE_MODULE_GLOBALS(jsond)
5048

51-
/* {{{ arginfo */
49+
/* arginfo */
5250
ZEND_BEGIN_ARG_INFO_EX(arginfo_jsond_encode, 0, 0, 1)
5351
ZEND_ARG_INFO(0, value)
5452
ZEND_ARG_INFO(0, options)
@@ -67,19 +65,19 @@ ZEND_END_ARG_INFO()
6765

6866
ZEND_BEGIN_ARG_INFO(arginfo_jsond_last_error_msg, 0)
6967
ZEND_END_ARG_INFO()
70-
/* }}} */
7168

72-
/* {{{ jsond_functions[] */
69+
70+
/* jsond_functions[] */
7371
static zend_function_entry jsond_functions[] = {
7472
PHP_FE(jsond_encode, arginfo_jsond_encode)
7573
PHP_FE(jsond_encode, arginfo_jsond_decode)
7674
PHP_FE(jsond_last_error, arginfo_jsond_last_error)
7775
PHP_FE(jsond_last_error_msg, arginfo_jsond_last_error_msg)
7876
PHP_FE_END
7977
};
80-
/* }}} */
8178

82-
/* {{{ JsonSerializable methods */
79+
80+
/* JsonSerializable methods */
8381
ZEND_BEGIN_ARG_INFO(jsond_serialize_arginfo, 0)
8482
/* No arguments */
8583
ZEND_END_ARG_INFO()
@@ -88,17 +86,17 @@ static zend_function_entry jsond_serializable_interface[] = {
8886
PHP_ABSTRACT_ME(PHP_JSOND_SERIALIZABLE_INTERFACE, jsonSerialize, jsond_serialize_arginfo)
8987
PHPC_FE_END
9088
};
91-
/* }}} */
9289

93-
/* {{{ php_json_already_exists */
90+
91+
/* php_json_already_exists */
9492
static inline zend_bool php_json_already_exists()
9593
{
9694
return !strncmp(PHP_JSOND_PREFIX_STRING, "json", 5) &&
9795
zend_hash_str_exists(&module_registry, "json", strlen("json"));
9896
}
99-
/* }}} */
10097

101-
/* {{{ php_json_register_serializable_interface */
98+
99+
/* php_json_register_serializable_interface */
102100
static inline void php_jsond_register_serializable_interface()
103101
{
104102
zend_class_entry ce;
@@ -107,7 +105,7 @@ static inline void php_jsond_register_serializable_interface()
107105
INIT_CLASS_ENTRY(ce, PHP_JSOND_SERIALIZABLE_INTERFACE_STRING, jsond_serializable_interface);
108106
PHP_JSOND_NAME(serializable_ce) = zend_register_internal_interface(&ce);
109107
}
110-
/* }}} */
108+
111109

112110
#define PHP_JSOND_REGISTER_LONG_CONSTANT(name, lval) \
113111
do { \
@@ -117,7 +115,7 @@ static inline void php_jsond_register_serializable_interface()
117115
} \
118116
} while(0)
119117

120-
/* {{{ MINIT */
118+
/* MINIT */
121119
static PHP_MINIT_FUNCTION(jsond)
122120
{
123121
if (!php_json_already_exists()) {
@@ -163,14 +161,13 @@ static PHP_MINIT_FUNCTION(jsond)
163161

164162
return SUCCESS;
165163
}
166-
/* }}} */
167164

168165
#define PHP_JSON_REPLACE_FN(orig, name) \
169166
PHPC_HASH_CSTR_FIND_PTR(EG(function_table), "json_"#name, orig); \
170167
orig->internal_function.handler = PHP_JSOND_FN(name);
171168

172169

173-
/* {{{ RINIT */
170+
/* RINIT */
174171
PHP_RINIT_FUNCTION(jsond)
175172
{
176173
zend_function *orig;
@@ -196,10 +193,10 @@ PHP_RINIT_FUNCTION(jsond)
196193

197194
return SUCCESS;
198195
}
199-
/* }}} */
200196

201197

202-
/* {{{ PHP_GINIT_FUNCTION
198+
199+
/* PHP_GINIT_FUNCTION
203200
*/
204201
static PHP_GINIT_FUNCTION(jsond)
205202
{
@@ -210,10 +207,9 @@ static PHP_GINIT_FUNCTION(jsond)
210207
jsond_globals->error_code = PHP_JSON_ERROR_NONE;
211208
jsond_globals->encode_max_depth = 0;
212209
}
213-
/* }}} */
214210

215211

216-
/* {{{ jsond_module_entry
212+
/* jsond_module_entry
217213
*/
218214
zend_module_entry jsond_module_entry = {
219215
STANDARD_MODULE_HEADER,
@@ -231,24 +227,21 @@ zend_module_entry jsond_module_entry = {
231227
NULL,
232228
STANDARD_MODULE_PROPERTIES_EX
233229
};
234-
/* }}} */
235230

236231
#ifdef COMPILE_DL_JSOND
237232
ZEND_GET_MODULE(jsond)
238233
#endif
239234

240-
/* {{{ PHP_MINFO_FUNCTION
241-
*/
235+
/* PHP_MINFO_FUNCTION */
242236
static PHP_MINFO_FUNCTION(jsond)
243237
{
244238
php_info_print_table_start();
245239
php_info_print_table_row(2, "jsond support", "enabled");
246240
php_info_print_table_row(2, "jsond version", PHP_JSOND_VERSION);
247241
php_info_print_table_end();
248242
}
249-
/* }}} */
250243

251-
PHP_JSOND_API int php_jsond_encode(php_json_buffer *buf, zval *val, int options) /* {{{ */
244+
PHP_JSOND_API int php_jsond_encode(php_json_buffer *buf, zval *val, int options)
252245
{
253246
php_json_encoder encoder;
254247
int return_code;
@@ -257,19 +250,18 @@ PHP_JSOND_API int php_jsond_encode(php_json_buffer *buf, zval *val, int options)
257250
encoder.max_depth = JSOND_G(encode_max_depth);
258251
encoder.error_code = PHP_JSON_ERROR_NONE;
259252

260-
return_code = php_json_encode_zval(buf, val, options, &encoder TSRMLS_CC);
253+
return_code = php_json_encode_zval(buf, val, options, &encoder);
261254
JSOND_G(error_code) = encoder.error_code;
262255

263256
return return_code;
264257
}
265-
/* }}} */
266258

267259
PHP_JSOND_API int php_jsond_decode_ex(
268-
zval *return_value, char *str, size_t str_len, int options, int depth TSRMLS_DC) /* {{{ */
260+
zval *return_value, char *str, size_t str_len, int options, int depth)
269261
{
270262
php_json_parser parser;
271263

272-
PHP_JSOND_NAME(parser_init)(&parser, return_value, str, str_len, options, depth TSRMLS_CC);
264+
PHP_JSOND_NAME(parser_init)(&parser, return_value, str, str_len, options, depth);
273265

274266
if (php_json_yyparse(&parser)) {
275267
JSOND_G(error_code) = PHP_JSOND_NAME(parser_error_code)(&parser);
@@ -279,10 +271,9 @@ PHP_JSOND_API int php_jsond_decode_ex(
279271

280272
return SUCCESS;
281273
}
282-
/* }}} */
283274

284275

285-
/* {{{ proto string json_encode(mixed data [, int options[, int depth]])
276+
/* proto string json_encode(mixed data [, int options[, int depth]])
286277
Returns the JSON representation of a value */
287278
static PHP_FUNCTION(jsond_encode)
288279
{
@@ -291,7 +282,7 @@ static PHP_FUNCTION(jsond_encode)
291282
phpc_long_t options = 0;
292283
phpc_long_t depth = PHP_JSON_PARSER_DEFAULT_DEPTH;
293284

294-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|ll", &parameter, &options, &depth) == FAILURE) {
285+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|ll", &parameter, &options, &depth) == FAILURE) {
295286
return;
296287
}
297288

@@ -300,7 +291,7 @@ static PHP_FUNCTION(jsond_encode)
300291
JSOND_G(encode_max_depth) = depth;
301292

302293
PHP_JSON_BUF_INIT(&buf);
303-
PHP_JSOND_NAME(encode)(&buf, parameter, (int)options TSRMLS_CC);
294+
PHP_JSOND_NAME(encode)(&buf, parameter, (int)options);
304295

305296
if ((JSOND_G(error_code) != PHP_JSON_ERROR_NONE && !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) ||
306297
PHP_JSON_BUF_LENGTH(buf) > LONG_MAX) {
@@ -310,9 +301,8 @@ static PHP_FUNCTION(jsond_encode)
310301
PHP_JSON_BUF_RETURN(buf, return_value);
311302
}
312303
}
313-
/* }}} */
314304

315-
/* {{{ proto mixed json_decode(string json [, bool assoc [, long depth]])
305+
/* proto mixed json_decode(string json [, bool assoc [, long depth]])
316306
Decodes the JSON representation into a PHP value */
317307
static PHP_FUNCTION(jsond_decode)
318308
{
@@ -322,7 +312,7 @@ static PHP_FUNCTION(jsond_decode)
322312
phpc_long_t depth = PHP_JSON_PARSER_DEFAULT_DEPTH;
323313
phpc_long_t options = 0;
324314

325-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bll", &str, &str_len, &assoc, &depth, &options) == FAILURE) {
315+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|bll", &str, &str_len, &assoc, &depth, &options) == FAILURE) {
326316
return;
327317
}
328318

@@ -334,12 +324,12 @@ static PHP_FUNCTION(jsond_decode)
334324
}
335325

336326
if (depth <= 0) {
337-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be greater than zero");
327+
php_error_docref(NULL, E_WARNING, "Depth must be greater than zero");
338328
RETURN_NULL();
339329
}
340330

341331
if (depth > INT_MAX) {
342-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be lower than %d", INT_MAX);
332+
php_error_docref(NULL, E_WARNING, "Depth must be lower than %d", INT_MAX);
343333
RETURN_NULL();
344334
}
345335

@@ -350,30 +340,28 @@ static PHP_FUNCTION(jsond_decode)
350340
options &= ~PHP_JSON_OBJECT_AS_ARRAY;
351341
}
352342

353-
PHP_JSOND_NAME(decode_ex)(return_value, str, (size_t) str_len, (int) options, (int) depth TSRMLS_CC);
343+
PHP_JSOND_NAME(decode_ex)(return_value, str, (size_t) str_len, (int) options, (int) depth);
354344
}
355-
/* }}} */
356345

357-
/* {{{ proto int json_last_error()
346+
/* proto int json_last_error()
358347
Returns the error code of the last json_encode() or json_decode() call. */
359348
static PHP_FUNCTION(jsond_last_error)
360349
{
361-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
350+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
362351
return;
363352
}
364353

365354
RETURN_LONG(JSOND_G(error_code));
366355
}
367-
/* }}} */
368356

369357
#define PHP_JSON_ERROR_MSG_RETURN(_msg) \
370358
PHPC_CSTRL_RETURN(_msg, sizeof(_msg) - 1)
371359

372-
/* {{{ proto string json_last_error_msg()
360+
/* proto string json_last_error_msg()
373361
Returns the error string of the last json_encode() or json_decode() call. */
374362
static PHP_FUNCTION(jsond_last_error_msg)
375363
{
376-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
364+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
377365
return;
378366
}
379367

@@ -405,7 +393,6 @@ static PHP_FUNCTION(jsond_last_error_msg)
405393
}
406394

407395
}
408-
/* }}} */
409396

410397
/*
411398
* Local variables:

‎jsond_buffer.c

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
4-
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2018 The PHP Group |
3+
| Copyright (c) The PHP Group |
64
+----------------------------------------------------------------------+
75
| This source file is subject to version 3.01 of the PHP license, |
86
| that is bundled with this package in the file LICENSE, and is |
@@ -27,7 +25,7 @@
2725
#include "php_jsond_buffer.h"
2826
#include "php_jsond.h"
2927

30-
void php_json_buffer_init(php_json_buffer *buf) /* {{{ */
28+
void php_json_buffer_init(php_json_buffer *buf)
3129
{
3230
buf->dbuf = NULL;
3331
buf->ptr = &buf->sbuf[0];
@@ -36,17 +34,15 @@ void php_json_buffer_init(php_json_buffer *buf) /* {{{ */
3634
buf->mark = NULL;
3735
buf->flags = 0;
3836
}
39-
/* }}} */
4037

41-
void php_json_buffer_destroy(php_json_buffer *buf) /* {{{ */
38+
void php_json_buffer_destroy(php_json_buffer *buf)
4239
{
4340
if (buf->dbuf) {
4441
efree(buf->dbuf);
4542
}
4643
}
47-
/* }}} */
4844

49-
void php_json_buffer_flush(php_json_buffer *buf, size_t pre_alloc_size) /* {{{ */
45+
void php_json_buffer_flush(php_json_buffer *buf, size_t pre_alloc_size)
5046
{
5147
ptrdiff_t static_size = buf->ptr - &buf->sbuf[0];
5248
size_t size = static_size + pre_alloc_size;
@@ -64,22 +60,19 @@ void php_json_buffer_flush(php_json_buffer *buf, size_t pre_alloc_size) /* {{{ *
6460
buf->dsize += static_size;
6561
buf->ptr = &buf->sbuf[0];
6662
}
67-
/* }}} */
6863

69-
void php_json_buffer_finish(php_json_buffer *buf) /* {{{ */
64+
void php_json_buffer_finish(php_json_buffer *buf)
7065
{
7166
php_json_buffer_flush(buf, 1);
7267
buf->dbuf[buf->dsize] = 0;
7368
}
74-
/* }}} */
7569

76-
void php_json_buffer_alloc(php_json_buffer *buf, size_t len) /* {{{ */
70+
void php_json_buffer_alloc(php_json_buffer *buf, size_t len)
7771
{
7872

7973
}
80-
/* }}} */
8174

82-
void php_json_buffer_reset(php_json_buffer *buf) /* {{{ */
75+
void php_json_buffer_reset(php_json_buffer *buf)
8376
{
8477
if (!buf->mark) {
8578
if (buf->dbuf) {
@@ -96,6 +89,5 @@ void php_json_buffer_reset(php_json_buffer *buf) /* {{{ */
9689
}
9790
}
9891
}
99-
/* }}} */
10092

10193
#endif /* PHP_JSON_BUF_TYPE_NATIVE */

0 commit comments

Comments
 (0)