From 9fbb411e5292e5ef2ba36131ff05b722bdcd9f17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 29 Sep 2020 21:35:58 +0200 Subject: [PATCH] Review parameter names in ext/json Closes GH-6236 --- ext/json/json.stub.php | 4 ++-- ext/json/json_arginfo.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/json/json.stub.php b/ext/json/json.stub.php index fc7d2c1569..a9b5bbf511 100644 --- a/ext/json/json.stub.php +++ b/ext/json/json.stub.php @@ -2,9 +2,9 @@ /** @generate-function-entries */ -function json_encode(mixed $value, int $options = 0, int $depth = 512): string|false {} +function json_encode(mixed $value, int $flags = 0, int $depth = 512): string|false {} -function json_decode(string $json, ?bool $assoc = null, int $depth = 512, int $options = 0): mixed {} +function json_decode(string $json, ?bool $associative = null, int $depth = 512, int $flags = 0): mixed {} function json_last_error(): int {} diff --git a/ext/json/json_arginfo.h b/ext/json/json_arginfo.h index bbcebf2a0b..c4b20d7013 100644 --- a/ext/json/json_arginfo.h +++ b/ext/json/json_arginfo.h @@ -1,17 +1,17 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 7dbc9b323b73714227d91cc9566cc3c0c90cd7be */ + * Stub hash: 2d1e6c422221ec7efbbd540ee777a5ce2c639943 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_json_encode, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, depth, IS_LONG, 0, "512") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_json_decode, 0, 1, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, json, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, assoc, _IS_BOOL, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, associative, _IS_BOOL, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, depth, IS_LONG, 0, "512") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_json_last_error, 0, 0, IS_LONG, 0) -- 2.40.0