summaryrefslogtreecommitdiff
path: root/ext/shmop
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-09-29 21:55:39 +0200
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-09-30 21:07:25 +0200
commit01b239b6020fb39a4f74cea472416f3a0a92f8c7 (patch)
tree8629b7bd11b3c43635d5fa8118dd066c4d18dafd /ext/shmop
parentefe6006ced4f91d0df1fdb0aef7f0079273ac0d0 (diff)
downloadphp-git-01b239b6020fb39a4f74cea472416f3a0a92f8c7.tar.gz
Review parameter names in ext/shmop
Closes GH-6238
Diffstat (limited to 'ext/shmop')
-rw-r--r--ext/shmop/shmop.stub.php12
-rw-r--r--ext/shmop/shmop_arginfo.h20
-rw-r--r--ext/shmop/tests/002.phpt8
3 files changed, 20 insertions, 20 deletions
diff --git a/ext/shmop/shmop.stub.php b/ext/shmop/shmop.stub.php
index cddb9c64f4..9485953502 100644
--- 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 211204720a..3b92a62c2c 100644
--- 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 40bbdbff23..2cd9db6187 100644
--- 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