Review parameter names in ext/json

Closes GH-6236

diff --git a/ext/json/json.stub.php b/ext/json/json.stub.php
index fc7d2c1569c0f948c18bd38c8d4ed9eaf9bdef73..a9b5bbf511213f9cf0f1f8583e82c49347f47e50 100644 (file)
--- 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 bbcebf2a0b9076ca9f904931aedf6ef31c951e79..c4b20d701385654ef16c5f842a1480b85497a713 100644 (file)
--- 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)