Review parameter names in ext/sysvshm

Closes GH-6249

diff --git a/ext/sysvshm/sysvshm.stub.php b/ext/sysvshm/sysvshm.stub.php
index f775032f46dce27736c2e8b99344b94c7873b83c..4f2799a349ec0f7be018f49bc1d2bd4620ffe2ae 100644 (file)
--- a/ext/sysvshm/sysvshm.stub.php
+++ b/ext/sysvshm/sysvshm.stub.php
@@ -6,16 +6,16 @@ final class SysvSharedMemory
 {
 }
 
-function shm_attach(int $key, ?int $memsize = null, int $perm = 0666): SysvSharedMemory|false {}
+function shm_attach(int $key, ?int $size = null, int $permissions = 0666): SysvSharedMemory|false {}
 
 function shm_detach(SysvSharedMemory $shm): bool {}
 
-function shm_has_var(SysvSharedMemory $shm, int $variable_key): bool {}
+function shm_has_var(SysvSharedMemory $shm, int $key): bool {}
 
 function shm_remove(SysvSharedMemory $shm): bool {}
 
-function shm_put_var(SysvSharedMemory $shm, int $variable_key, mixed $variable): bool {}
+function shm_put_var(SysvSharedMemory $shm, int $key, mixed $value): bool {}
 
-function shm_get_var(SysvSharedMemory $shm, int $variable_key): mixed {}
+function shm_get_var(SysvSharedMemory $shm, int $key): mixed {}
 
-function shm_remove_var(SysvSharedMemory $shm, int $variable_key): bool {}
+function shm_remove_var(SysvSharedMemory $shm, int $key): bool {}

diff --git a/ext/sysvshm/sysvshm_arginfo.h b/ext/sysvshm/sysvshm_arginfo.h
index 4e0078038cc3ff25ceafcf8f95572dfc1ac2d06d..d6f09d1426561afa6cf538bb47d67edc59c90d71 100644 (file)
--- a/ext/sysvshm/sysvshm_arginfo.h
+++ b/ext/sysvshm/sysvshm_arginfo.h
@@ -1,10 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9a57af33a6658387f706ea121612c0f0eb55e5b3 */
+ * Stub hash: 12f78387e5b7c436b608dbecc4c6b3eec82b6db1 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, SysvSharedMemory, MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, memsize, IS_LONG, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, perm, IS_LONG, 0, "0666")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, size, IS_LONG, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, permissions, IS_LONG, 0, "0666")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_detach, 0, 1, _IS_BOOL, 0)
@@ -13,20 +13,20 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_has_var, 0, 2, _IS_BOOL, 0)
        ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
-       ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_shm_remove arginfo_shm_detach
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_put_var, 0, 3, _IS_BOOL, 0)
        ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
-       ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, variable, IS_MIXED, 0)
+       ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_get_var, 0, 2, IS_MIXED, 0)
        ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
-       ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_shm_remove_var arginfo_shm_has_var

diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index aeec6f6e1b454398f129eb0b76af6d4d015b2a30..981bbf3230d770aaf37a68903ebc2658731681c3 100644 (file)
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -55,11 +55,11 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-shm_attach(): Argument #2 ($memsize) must be greater than 0
-shm_attach(): Argument #2 ($memsize) must be greater than 0
-shm_attach(): Argument #2 ($memsize) must be greater than 0
-shm_attach(): Argument #2 ($memsize) must be greater than 0
-shm_attach(): Argument #2 ($memsize) must be greater than 0
+shm_attach(): Argument #2 ($size) must be greater than 0
+shm_attach(): Argument #2 ($size) must be greater than 0
+shm_attach(): Argument #2 ($size) must be greater than 0
+shm_attach(): Argument #2 ($size) must be greater than 0
+shm_attach(): Argument #2 ($size) must be greater than 0
 object(SysvSharedMemory)#%d (0) {
 }
 object(SysvSharedMemory)#%d (0) {