Skip to content

Commit dd83ced

Browse files
committed
Declare tentative return types for ext/snmp
Closes GH-7064
1 parent 5e8bdaf commit dd83ced

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

ext/snmp/snmp.stub.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,32 +87,32 @@ class SNMP
8787

8888
public function __construct(int $version, string $hostname, string $community, int $timeout = -1, int $retries = -1) {}
8989

90-
/** @return bool */
91-
public function close() {}
90+
/** @tentative-return-type */
91+
public function close(): bool {}
9292

93-
/** @return bool */
93+
/** @tentative-return-type */
9494
public function setSecurity(
9595
string $securityLevel, string $authProtocol = "", string $authPassphrase = "",
9696
string $privacyProtocol = "", string $privacyPassphrase = "",
97-
string $contextName = "", string $contextEngineId = "") {}
97+
string $contextName = "", string $contextEngineId = ""): bool {}
9898

99-
/** @return mixed */
100-
public function get(array|string $objectId, bool $preserveKeys = false) {}
99+
/** @tentative-return-type */
100+
public function get(array|string $objectId, bool $preserveKeys = false): mixed {}
101101

102-
/** @return mixed */
103-
public function getnext(array|string $objectId) {}
102+
/** @tentative-return-type */
103+
public function getnext(array|string $objectId): mixed {}
104104

105-
/** @return array|false */
106-
public function walk(array|string $objectId, bool $suffixAsKey = false, int $maxRepetitions = -1, int $nonRepeaters = -1) {}
105+
/** @tentative-return-type */
106+
public function walk(array|string $objectId, bool $suffixAsKey = false, int $maxRepetitions = -1, int $nonRepeaters = -1): array|false {}
107107

108-
/** @return bool */
109-
public function set(array|string $objectId, array|string $type, array|string $value) {}
108+
/** @tentative-return-type */
109+
public function set(array|string $objectId, array|string $type, array|string $value): bool {}
110110

111-
/** @return int */
112-
public function getErrno() {}
111+
/** @tentative-return-type */
112+
public function getErrno(): int {}
113113

114-
/** @return string */
115-
public function getError() {}
114+
/** @tentative-return-type */
115+
public function getError(): string {}
116116
}
117117

118118
class SNMPException extends RuntimeException

ext/snmp/snmp_arginfo.h

Lines changed: 11 additions & 9 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: 87b5f1c8b3a350442ab1d8c85580e203388b0ef7 */
2+
* Stub hash: 75ba939cab1a18a8e1c2836e0c0bbab9d310ba2b */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmpget, 0, 3, IS_MIXED, 0)
55
ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
@@ -122,10 +122,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP___construct, 0, 0, 3)
122122
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retries, IS_LONG, 0, "-1")
123123
ZEND_END_ARG_INFO()
124124

125-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_close, 0, 0, 0)
125+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_close, 0, 0, _IS_BOOL, 0)
126126
ZEND_END_ARG_INFO()
127127

128-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_setSecurity, 0, 0, 1)
128+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_setSecurity, 0, 1, _IS_BOOL, 0)
129129
ZEND_ARG_TYPE_INFO(0, securityLevel, IS_STRING, 0)
130130
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authProtocol, IS_STRING, 0, "\"\"")
131131
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authPassphrase, IS_STRING, 0, "\"\"")
@@ -135,31 +135,33 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_setSecurity, 0, 0, 1)
135135
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, contextEngineId, IS_STRING, 0, "\"\"")
136136
ZEND_END_ARG_INFO()
137137

138-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_get, 0, 0, 1)
138+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_get, 0, 1, IS_MIXED, 0)
139139
ZEND_ARG_TYPE_MASK(0, objectId, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
140140
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preserveKeys, _IS_BOOL, 0, "false")
141141
ZEND_END_ARG_INFO()
142142

143-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_getnext, 0, 0, 1)
143+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_getnext, 0, 1, IS_MIXED, 0)
144144
ZEND_ARG_TYPE_MASK(0, objectId, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
145145
ZEND_END_ARG_INFO()
146146

147-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_walk, 0, 0, 1)
147+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_SNMP_walk, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
148148
ZEND_ARG_TYPE_MASK(0, objectId, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
149149
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, suffixAsKey, _IS_BOOL, 0, "false")
150150
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maxRepetitions, IS_LONG, 0, "-1")
151151
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nonRepeaters, IS_LONG, 0, "-1")
152152
ZEND_END_ARG_INFO()
153153

154-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SNMP_set, 0, 0, 3)
154+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_set, 0, 3, _IS_BOOL, 0)
155155
ZEND_ARG_TYPE_MASK(0, objectId, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
156156
ZEND_ARG_TYPE_MASK(0, type, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
157157
ZEND_ARG_TYPE_MASK(0, value, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
158158
ZEND_END_ARG_INFO()
159159

160-
#define arginfo_class_SNMP_getErrno arginfo_class_SNMP_close
160+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_getErrno, 0, 0, IS_LONG, 0)
161+
ZEND_END_ARG_INFO()
161162

162-
#define arginfo_class_SNMP_getError arginfo_class_SNMP_close
163+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SNMP_getError, 0, 0, IS_STRING, 0)
164+
ZEND_END_ARG_INFO()
163165

164166

165167
ZEND_FUNCTION(snmpget);

0 commit comments

Comments
 (0)