Skip to content

Commit 02b803a

Browse files
committed
Rename getStructFieldOffset/Type() parameter
By convention, parameter names of camel case methods should also be camel case, i.e. the name should be $fieldName rather than $field_name. However, following GH-7236, which changed $arg_index to just $index, this also changes $field_name to just $name. The fact that it is a field name is obvious from context.
1 parent efbdcb8 commit 02b803a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/ffi/ffi.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public function getArrayLength(): int {}
8787
public function getPointerType(): CType {}
8888

8989
public function getStructFieldNames(): array {}
90-
public function getStructFieldOffset(string $field_name): int {}
91-
public function getStructFieldType(string $field_name): CType {}
90+
public function getStructFieldOffset(string $name): int {}
91+
public function getStructFieldType(string $name): CType {}
9292

9393
public function getFuncABI(): int {}
9494
public function getFuncReturnType(): CType {}

ext/ffi/ffi_arginfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 2675462a253edd2a0ea6106b9640f0d1a5a09489 */
2+
* Stub hash: 82f586480d2b29e6aa359f7080cdc7ea092a1ecc */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0)
55
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 0, "\"\"")
@@ -104,11 +104,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_CType_getStructFieldNa
104104
ZEND_END_ARG_INFO()
105105

106106
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_FFI_CType_getStructFieldOffset, 0, 1, IS_LONG, 0)
107-
ZEND_ARG_TYPE_INFO(0, field_name, IS_STRING, 0)
107+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
108108
ZEND_END_ARG_INFO()
109109

110110
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_CType_getStructFieldType, 0, 1, FFI\\CType, 0)
111-
ZEND_ARG_TYPE_INFO(0, field_name, IS_STRING, 0)
111+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
112112
ZEND_END_ARG_INFO()
113113

114114
#define arginfo_class_FFI_CType_getFuncABI arginfo_class_FFI_CType_getKind

0 commit comments

Comments
 (0)