Skip to content

Commit 01b239b

Browse files
committed
Review parameter names in ext/shmop
Closes GH-6238
1 parent efe6006 commit 01b239b

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

ext/shmop/shmop.stub.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
final class Shmop {}
66

7-
function shmop_open(int $key, string $flags, int $mode, int $size): Shmop|false {}
7+
function shmop_open(int $key, string $mode, int $permissions, int $size): Shmop|false {}
88

9-
function shmop_read(Shmop $shmid, int $start, int $count): string {}
9+
function shmop_read(Shmop $shmop, int $offset, int $size): string {}
1010

1111
/** @deprecated */
12-
function shmop_close(Shmop $shmid): void {}
12+
function shmop_close(Shmop $shmop): void {}
1313

14-
function shmop_size(Shmop $shmid): int {}
14+
function shmop_size(Shmop $shmop): int {}
1515

16-
function shmop_write(Shmop $shmid, string $data, int $offset): int {}
16+
function shmop_write(Shmop $shmop, string $data, int $offset): int {}
1717

18-
function shmop_delete(Shmop $shmid): bool {}
18+
function shmop_delete(Shmop $shmop): bool {}

ext/shmop/shmop_arginfo.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 1fe8d001718e20ca915480d1ab6cb6996115b547 */
2+
* Stub hash: 81173e82e0378d5b5c729a3cce8561e0ca56e092 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shmop_open, 0, 4, Shmop, MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
6-
ZEND_ARG_TYPE_INFO(0, flags, IS_STRING, 0)
7-
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
6+
ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0)
7+
ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0)
88
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
99
ZEND_END_ARG_INFO()
1010

1111
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_read, 0, 3, IS_STRING, 0)
12-
ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
13-
ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
14-
ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
12+
ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
13+
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
14+
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
1515
ZEND_END_ARG_INFO()
1616

1717
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_close, 0, 1, IS_VOID, 0)
18-
ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
18+
ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
1919
ZEND_END_ARG_INFO()
2020

2121
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_size, 0, 1, IS_LONG, 0)
22-
ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
22+
ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
2323
ZEND_END_ARG_INFO()
2424

2525
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_write, 0, 3, IS_LONG, 0)
26-
ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
26+
ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
2727
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
2828
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
2929
ZEND_END_ARG_INFO()
3030

3131
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_delete, 0, 1, _IS_BOOL, 0)
32-
ZEND_ARG_OBJ_INFO(0, shmid, Shmop, 0)
32+
ZEND_ARG_OBJ_INFO(0, shmop, Shmop, 0)
3333
ZEND_END_ARG_INFO()
3434

3535

ext/shmop/tests/002.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ shmop_delete($shm_id);
7474
?>
7575
--EXPECTF--
7676
## shmop_open function tests ##
77-
shmop_open(): Argument #2 ($flags) must be a valid access mode
78-
shmop_open(): Argument #2 ($flags) must be a valid access mode
77+
shmop_open(): Argument #2 ($mode) must be a valid access mode
78+
shmop_open(): Argument #2 ($mode) must be a valid access mode
7979

8080
Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in %s on line %d
8181
bool(false)
@@ -84,8 +84,8 @@ Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in
8484
shmop_open(): Argument #4 ($size) must be greater than 0 for the "c" and "n" access modes
8585

8686
## shmop_read function tests ##
87-
shmop_read(): Argument #2 ($start) must be between 0 and the segment size
88-
shmop_read(): Argument #3 ($count) is out of range
87+
shmop_read(): Argument #2 ($offset) must be between 0 and the segment size
88+
shmop_read(): Argument #3 ($size) is out of range
8989

9090
## shmop_write function tests ##
9191
shmop_write(): Argument #3 ($offset) is out of range

0 commit comments

Comments
 (0)