Skip to content

Review parameter names in ext/shmop #6238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Review parameter names in ext/shmop #6238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40659f0
Review parameter names in ext/shmop
kocsismate Sep 29, 2020
6575cec
Review
kocsismate Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/shmop/shmop.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
20 changes: 10 additions & 10 deletions ext/shmop/shmop_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()


Expand Down
8 changes: 4 additions & 4 deletions ext/shmop/tests/002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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