Review parameter names in ext/shmop

Closes GH-6238

diff --git a/ext/shmop/shmop.stub.php b/ext/shmop/shmop.stub.php
index cddb9c64f489203b3c5a2690697ec6b022824883..94859535021af1c85500f129adec024b6d35baf0 100644 (file)
--- a/ext/shmop/shmop.stub.php
+++ b/ext/shmop/shmop.stub.php
@@ -4,15 +4,15 @@
 
 final class Shmop {}
 
-function shmop_open(int $key, string $flags, int $mode, int $size): Shmop|false {}
+function shmop_open(int $key, string $mode, int $permissions, int $size): Shmop|false {}
 
-function shmop_read(Shmop $shmid, int $start, int $count): string {}
+function shmop_read(Shmop $shmop, int $offset, int $size): string {}
 
 /** @deprecated */
-function shmop_close(Shmop $shmid): void {}
+function shmop_close(Shmop $shmop): void {}
 
-function shmop_size(Shmop $shmid): int {}
+function shmop_size(Shmop $shmop): int {}
 
-function shmop_write(Shmop $shmid, string $data, int $offset): int {}
+function shmop_write(Shmop $shmop, string $data, int $offset): int {}
 
-function shmop_delete(Shmop $shmid): bool {}
+function shmop_delete(Shmop $shmop): bool {}

diff --git a/ext/shmop/shmop_arginfo.h b/ext/shmop/shmop_arginfo.h
index 211204720ad0a6ed7cac71b1453afcdc025d1fce..3b92a62c2c7612a710626e296946be0a215f8102 100644 (file)
--- a/ext/shmop/shmop_arginfo.h
+++ b/ext/shmop/shmop_arginfo.h
@@ -1,35 +1,35 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1fe8d001718e20ca915480d1ab6cb6996115b547 */
+ * Stub hash: 81173e82e0378d5b5c729a3cce8561e0ca56e092 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shmop_open, 0, 4, Shmop, MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, flags, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_read, 0, 3, IS_STRING, 0)
-       ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
-       ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
+       ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_close, 0, 1, IS_VOID, 0)
-       ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
+       ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_size, 0, 1, IS_LONG, 0)
-       ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
+       ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_write, 0, 3, IS_LONG, 0)
-       ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
+       ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
        ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_delete, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
+       ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
 ZEND_END_ARG_INFO()
 
 

diff --git a/ext/shmop/tests/002.phpt b/ext/shmop/tests/002.phpt
index 40bbdbff23f840ceeed119ebcadd0b242a9b131e..2cd9db61871107ddb2d686c55bcb1ed48089858f 100644 (file)
--- a/ext/shmop/tests/002.phpt
+++ b/ext/shmop/tests/002.phpt
@@ -74,8 +74,8 @@ shmop_delete($shm_id);
 ?>
 --EXPECTF--
 ## shmop_open function tests ##
-shmop_open(): Argument #2 ($flags) must be a valid access mode
-shmop_open(): Argument #2 ($flags) must be a valid access mode
+shmop_open(): Argument #2 ($mode) must be a valid access mode
+shmop_open(): Argument #2 ($mode) must be a valid access mode
 
 Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in %s on line %d
 bool(false)
@@ -84,8 +84,8 @@ Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in
 shmop_open(): Argument #4 ($size) must be greater than 0 for the "c" and "n" access modes
 
 ## shmop_read function tests ##
-shmop_read(): Argument #2 ($start) must be between 0 and the segment size
-shmop_read(): Argument #3 ($count) is out of range
+shmop_read(): Argument #2 ($offset) must be between 0 and the segment size
+shmop_read(): Argument #3 ($size) is out of range
 
 ## shmop_write function tests ##
 shmop_write(): Argument #3 ($offset) is out of range