Skip to content

Commit 227f516

Browse files
cmb69cmb69
committed
Declare nullable arguments in stubs
1 parent 68edbbf commit 227f516

File tree

4 files changed

+75
-66
lines changed

4 files changed

+75
-66
lines changed

‎ext/odbc/odbc.stub.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
163163
* @param resource $connection_id
164164
* @return resource|false
165165
*/
166-
function odbc_tables($connection_id, string $qualfier = UNKNOWN, string $owner = UNKNOWN, string $name = UNKNOWN, string $table_types = UNKNOWN) {}
166+
function odbc_tables($connection_id, ?string $qualfier = null, string $owner = UNKNOWN, string $name = UNKNOWN, string $table_types = UNKNOWN) {}
167167

168168
/**
169169
* @param resource $connection_id
170170
* @return resource|false
171171
*/
172-
function odbc_columns($connection_id, string $qualifier = UNKNOWN, string $owner = UNKNOWN, string $table_name = UNKNOWN, string $column_name = UNKNOWN) {}
172+
function odbc_columns($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $table_name = UNKNOWN, string $column_name = UNKNOWN) {}
173173

174174
/**
175175
* @param resource $connection_id
@@ -181,51 +181,51 @@ function odbc_gettypeinfo($connection_id, int $data_type = 0) {}
181181
* @param resource $connection_id
182182
* @return resource|false
183183
*/
184-
function odbc_primarykeys($connection_id, string $qualifier, string $owner, string $table) {}
184+
function odbc_primarykeys($connection_id, ?string $qualifier, string $owner, string $table) {}
185185

186186
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
187187
/**
188188
* @param resource $connection_id
189189
* @return resource|false
190190
*/
191-
function odbc_procedurecolumns($connection_id, string $qualifier = UNKNOWN, string $owner = UNKNOWN, string $proc = UNKNOWN, string $column = UNKNOWN) {}
191+
function odbc_procedurecolumns($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $proc = UNKNOWN, string $column = UNKNOWN) {}
192192

193193
/**
194194
* @param resource $connection_id
195195
* @return resource|false
196196
*/
197-
function odbc_procedures($connection_id, string $qualifier = UNKNOWN, string $owner = UNKNOWN, string $name = UNKNOWN) {}
197+
function odbc_procedures($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $name = UNKNOWN) {}
198198

199199
/**
200200
* @param resource $connection_id
201201
* @return resource|false
202202
*/
203-
function odbc_foreignkeys($connection_id, string $pk_qualifier, string $pk_owner, string $pk_table, string $fk_qualifier, string $fk_owner, string $fk_table) {}
203+
function odbc_foreignkeys($connection_id, ?string $pk_qualifier, string $pk_owner, string $pk_table, string $fk_qualifier, string $fk_owner, string $fk_table) {}
204204
#endif
205205

206206
/**
207207
* @see https://bugs.php.net/bug.php?id=78470
208208
* @param resource $connection_id
209209
* @return resource|false
210210
*/
211-
function odbc_specialcolumns($connection_id, int $type, string $qualifier, string $owner, string $table, int $scope) {}
211+
function odbc_specialcolumns($connection_id, int $type, ?string $qualifier, string $owner, string $table, int $scope) {}
212212

213213
/**
214214
* @param resource $connection_id
215215
* @return resource|false
216216
*/
217-
function odbc_statistics($connection_id, string $qualfier, string $owner, string $name, int $unique, int $accuracy) {}
217+
function odbc_statistics($connection_id, ?string $qualfier, string $owner, string $name, int $unique, int $accuracy) {}
218218

219219
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
220220
/**
221221
* @param resource $connection_id
222222
* @return resource|false
223223
*/
224-
function odbc_tableprivileges($connection_id, string $qualifier, string $owner, string $name) {}
224+
function odbc_tableprivileges($connection_id, ?string $qualifier, string $owner, string $name) {}
225225

226226
/**
227227
* @param resource $connection_id
228228
* @return resource|false
229229
*/
230-
function odbc_columnprivileges($connection_id, string $catalog, string $schema, string $table, string $column) {}
230+
function odbc_columnprivileges($connection_id, ?string $catalog, string $schema, string $table, string $column) {}
231231
#endif

‎ext/odbc/odbc_arginfo.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ ZEND_END_ARG_INFO()
147147

148148
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
149149
ZEND_ARG_INFO(0, connection_id)
150-
ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 0)
150+
ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 1)
151151
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
152152
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
153153
ZEND_ARG_TYPE_INFO(0, table_types, IS_STRING, 0)
154154
ZEND_END_ARG_INFO()
155155

156156
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
157157
ZEND_ARG_INFO(0, connection_id)
158-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
158+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
159159
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
160160
ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0)
161161
ZEND_ARG_TYPE_INFO(0, column_name, IS_STRING, 0)
@@ -168,15 +168,15 @@ ZEND_END_ARG_INFO()
168168

169169
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
170170
ZEND_ARG_INFO(0, connection_id)
171-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
171+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
172172
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
173173
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
174174
ZEND_END_ARG_INFO()
175175

176176
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
177177
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
178178
ZEND_ARG_INFO(0, connection_id)
179-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
179+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
180180
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
181181
ZEND_ARG_TYPE_INFO(0, proc, IS_STRING, 0)
182182
ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)
@@ -186,7 +186,7 @@ ZEND_END_ARG_INFO()
186186
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
187187
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
188188
ZEND_ARG_INFO(0, connection_id)
189-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
189+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
190190
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
191191
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
192192
ZEND_END_ARG_INFO()
@@ -195,7 +195,7 @@ ZEND_END_ARG_INFO()
195195
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
196196
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
197197
ZEND_ARG_INFO(0, connection_id)
198-
ZEND_ARG_TYPE_INFO(0, pk_qualifier, IS_STRING, 0)
198+
ZEND_ARG_TYPE_INFO(0, pk_qualifier, IS_STRING, 1)
199199
ZEND_ARG_TYPE_INFO(0, pk_owner, IS_STRING, 0)
200200
ZEND_ARG_TYPE_INFO(0, pk_table, IS_STRING, 0)
201201
ZEND_ARG_TYPE_INFO(0, fk_qualifier, IS_STRING, 0)
@@ -207,15 +207,15 @@ ZEND_END_ARG_INFO()
207207
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 6)
208208
ZEND_ARG_INFO(0, connection_id)
209209
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
210-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
210+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
211211
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
212212
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
213213
ZEND_ARG_TYPE_INFO(0, scope, IS_LONG, 0)
214214
ZEND_END_ARG_INFO()
215215

216216
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
217217
ZEND_ARG_INFO(0, connection_id)
218-
ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 0)
218+
ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 1)
219219
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
220220
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
221221
ZEND_ARG_TYPE_INFO(0, unique, IS_LONG, 0)
@@ -225,7 +225,7 @@ ZEND_END_ARG_INFO()
225225
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
226226
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
227227
ZEND_ARG_INFO(0, connection_id)
228-
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 0)
228+
ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
229229
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
230230
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
231231
ZEND_END_ARG_INFO()
@@ -234,7 +234,7 @@ ZEND_END_ARG_INFO()
234234
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
235235
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columnprivileges, 0, 0, 5)
236236
ZEND_ARG_INFO(0, connection_id)
237-
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 0)
237+
ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
238238
ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
239239
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
240240
ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)

‎ext/xmlwriter/xmlwriter.stub.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ function xmlwriter_end_attribute($xmlwriter): bool {}
2828
function xmlwriter_write_attribute($xmlwriter, string $name, string $value): bool {}
2929

3030
/** @param resource $xmlwriter */
31-
function xmlwriter_start_attribute_ns($xmlwriter, string $prefix, string $name, string $uri): bool {}
31+
function xmlwriter_start_attribute_ns($xmlwriter, string $prefix, string $name, ?string $uri): bool {}
3232

3333
/** @param resource $xmlwriter */
34-
function xmlwriter_write_attribute_ns($xmlwriter, string $prefix, string $name, string $uri, string $content): bool {}
34+
function xmlwriter_write_attribute_ns($xmlwriter, string $prefix, string $name, ?string $uri, string $content): bool {}
3535

3636
/** @param resource $xmlwriter */
3737
function xmlwriter_start_element($xmlwriter, string $name): bool {}
@@ -43,13 +43,13 @@ function xmlwriter_end_element($xmlwriter): bool {}
4343
function xmlwriter_full_end_element($xmlwriter): bool {}
4444

4545
/** @param resource $xmlwriter */
46-
function xmlwriter_start_element_ns($xmlwriter, string $prefix, string $name, string $uri): bool {}
46+
function xmlwriter_start_element_ns($xmlwriter, ?string $prefix, string $name, ?string $uri): bool {}
4747

4848
/** @param resource $xmlwriter */
49-
function xmlwriter_write_element($xmlwriter, string $name, string $content = UNKNOWN): bool {}
49+
function xmlwriter_write_element($xmlwriter, string $name, ?string $content = null): bool {}
5050

5151
/** @param resource $xmlwriter */
52-
function xmlwriter_write_element_ns($xmlwriter, string $prefix, string $name, string $uri, string $content = UNKNOWN): bool {}
52+
function xmlwriter_write_element_ns($xmlwriter, ?string $prefix, string $name, ?string $uri, ?string $content = null): bool {}
5353

5454
/** @param resource $xmlwriter */
5555
function xmlwriter_start_pi($xmlwriter, string $target): bool {}
@@ -76,7 +76,7 @@ function xmlwriter_text($xmlwriter, string $content): bool {}
7676
function xmlwriter_write_raw($xmlwriter, string $content): bool {}
7777

7878
/** @param resource $xmlwriter */
79-
function xmlwriter_start_document($xmlwriter, string $version = '1.0', $encoding = UNKNOWN, $standalone = UNKNOWN) {}
79+
function xmlwriter_start_document($xmlwriter, ?string $version = '1.0', ?string $encoding = null, ?string $standalone = null) {}
8080

8181
/** @param resource $xmlwriter */
8282
function xmlwriter_end_document($xmlwriter): bool {}
@@ -85,13 +85,13 @@ function xmlwriter_end_document($xmlwriter): bool {}
8585
function xmlwriter_write_comment($xmlwriter, string $content): bool {}
8686

8787
/** @param resource $xmlwriter */
88-
function xmlwriter_start_dtd($xmlwriter, string $qualifiedName, string $publicId = UNKNOWN, string $systemId = UNKNOWN): bool {}
88+
function xmlwriter_start_dtd($xmlwriter, string $qualifiedName, ?string $publicId = null, ?string $systemId = null): bool {}
8989

9090
/** @param resource $xmlwriter */
9191
function xmlwriter_end_dtd($xmlwriter): bool {}
9292

9393
/** @param resource $xmlwriter */
94-
function xmlwriter_write_dtd($xmlwriter, string $name, $publicId = UNKNOWN, $systemId = UNKNOWN, $subset = UNKNOWN): bool {}
94+
function xmlwriter_write_dtd($xmlwriter, string $name, ?string $publicId = null, ?string $systemId = null, ?string $subset = null): bool {}
9595

9696
/** @param resource $xmlwriter */
9797
function xmlwriter_start_dtd_element($xmlwriter, string $qualifiedName): bool {}
@@ -149,21 +149,21 @@ function endAttribute(): bool {}
149149

150150
function writeAttribute(string $name, string $value): bool {}
151151

152-
function startAttributeNs(string $prefix, string $name, string $uri): bool {}
152+
function startAttributeNs(string $prefix, string $name, ?string $uri): bool {}
153153

154-
function writeAttributeNs(string $prefix, string $name, string $uri, string $content): bool {}
154+
function writeAttributeNs(string $prefix, string $name, ?string $uri, string $content): bool {}
155155

156156
function startElement(string $name): bool {}
157157

158158
function endElement(): bool {}
159159

160160
function fullEndElement(): bool {}
161161

162-
function startElementNs(string $prefix, string $name, string $uri): bool {}
162+
function startElementNs(?string $prefix, string $name, ?string $uri): bool {}
163163

164-
function writeElement(string $name, string $content = UNKNOWN): bool {}
164+
function writeElement(string $name, ?string $content = null): bool {}
165165

166-
function writeElementNs(string $prefix, string $name, string $uri, string $content = UNKNOWN): bool {}
166+
function writeElementNs(?string $prefix, string $name, ?string $uri, ?string $content = null): bool {}
167167

168168
function startPi(string $target): bool {}
169169

@@ -181,17 +181,17 @@ function text(string $content): bool {}
181181

182182
function writeRaw(string $content): bool {}
183183

184-
function startDocument(string $version = '1.0', string $encoding = UNKNOWN, string $standalone = UNKNOWN): bool {}
184+
function startDocument(?string $version = '1.0', ?string $encoding = null, ?string $standalone = null): bool {}
185185

186186
function endDocument(): bool {}
187187

188188
function writeComment(string $content): bool {}
189189

190-
function startDtd(string $qualifiedName, string $publicId = UNKNOWN, string $systemId = UNKNOWN): bool {}
190+
function startDtd(string $qualifiedName, ?string $publicId = null, ?string $systemId = null): bool {}
191191

192192
function endDtd(): bool {}
193193

194-
function writeDtd(string $name, string $publicId = UNKNOWN, string $systemId = UNKNOWN, string $subset = UNKNOWN): bool {}
194+
function writeDtd(string $name, ?string $publicId = null, ?string $systemId = null, ?string $subset = null): bool {}
195195

196196
function startDtdElement(string $qualifiedName): bool {}
197197

0 commit comments

Comments
 (0)