Skip to content

Commit 4cfaca7

Browse files
moufmoufmoufmouf
committed
Fixing default value for weird functions that use non standard default values for parameters.
1 parent 79f2cd2 commit 4cfaca7

File tree

9 files changed

+172
-20
lines changed

9 files changed

+172
-20
lines changed

‎generated/datetime.php‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,17 @@ function date_sun_info(int $time, float $latitude, float $longitude): array
235235
function date_sunrise(int $timestamp, int $format = SUNFUNCS_RET_STRING, float $latitude = null, float $longitude = null, float $zenith = null, float $gmt_offset = 0)
236236
{
237237
error_clear_last();
238-
$result = \date_sunrise($timestamp, $format, $latitude, $longitude, $zenith, $gmt_offset);
238+
if ($gmt_offset !== 0) {
239+
$result = \date_sunrise($timestamp, $format, $latitude, $longitude, $zenith, $gmt_offset);
240+
} elseif ($zenith !== null) {
241+
$result = \date_sunrise($timestamp, $format, $latitude, $longitude, $zenith);
242+
} elseif ($longitude !== null) {
243+
$result = \date_sunrise($timestamp, $format, $latitude, $longitude);
244+
} elseif ($latitude !== null) {
245+
$result = \date_sunrise($timestamp, $format, $latitude);
246+
} else {
247+
$result = \date_sunrise($timestamp, $format);
248+
}
239249
if ($result === false) {
240250
throw DatetimeException::createFromPhpError();
241251
}
@@ -328,7 +338,17 @@ function date_sunrise(int $timestamp, int $format = SUNFUNCS_RET_STRING, float $
328338
function date_sunset(int $timestamp, int $format = SUNFUNCS_RET_STRING, float $latitude = null, float $longitude = null, float $zenith = null, float $gmt_offset = 0)
329339
{
330340
error_clear_last();
331-
$result = \date_sunset($timestamp, $format, $latitude, $longitude, $zenith, $gmt_offset);
341+
if ($gmt_offset !== 0) {
342+
$result = \date_sunset($timestamp, $format, $latitude, $longitude, $zenith, $gmt_offset);
343+
} elseif ($zenith !== null) {
344+
$result = \date_sunset($timestamp, $format, $latitude, $longitude, $zenith);
345+
} elseif ($longitude !== null) {
346+
$result = \date_sunset($timestamp, $format, $latitude, $longitude);
347+
} elseif ($latitude !== null) {
348+
$result = \date_sunset($timestamp, $format, $latitude);
349+
} else {
350+
$result = \date_sunset($timestamp, $format);
351+
}
332352
if ($result === false) {
333353
throw DatetimeException::createFromPhpError();
334354
}
@@ -380,7 +400,21 @@ function date_sunset(int $timestamp, int $format = SUNFUNCS_RET_STRING, float $l
380400
function mktime(int $hour = null, int $minute = null, int $second = null, int $month = null, int $day = null, int $year = null): int
381401
{
382402
error_clear_last();
383-
$result = \mktime($hour, $minute, $second, $month, $day, $year);
403+
if ($year !== null) {
404+
$result = \mktime($hour, $minute, $second, $month, $day, $year);
405+
} elseif ($day !== null) {
406+
$result = \mktime($hour, $minute, $second, $month, $day);
407+
} elseif ($month !== null) {
408+
$result = \mktime($hour, $minute, $second, $month);
409+
} elseif ($second !== null) {
410+
$result = \mktime($hour, $minute, $second);
411+
} elseif ($minute !== null) {
412+
$result = \mktime($hour, $minute);
413+
} elseif ($hour !== null) {
414+
$result = \mktime($hour);
415+
} else {
416+
$result = \mktime();
417+
}
384418
if ($result === false) {
385419
throw DatetimeException::createFromPhpError();
386420
}
@@ -489,7 +523,11 @@ function strptime(string $date, string $format): array
489523
function strtotime(string $time, int $now = null): int
490524
{
491525
error_clear_last();
492-
$result = \strtotime($time, $now);
526+
if ($now !== null) {
527+
$result = \strtotime($time, $now);
528+
} else {
529+
$result = \strtotime($time);
530+
}
493531
if ($result === false) {
494532
throw DatetimeException::createFromPhpError();
495533
}

‎generated/filesystem.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1346,8 +1346,10 @@ function touch(string $filename, int $time = null, int $atime = null): void
13461346
error_clear_last();
13471347
if ($atime !== null) {
13481348
$result = \touch($filename, $time, $atime);
1349-
} else {
1349+
} elseif ($time !== null) {
13501350
$result = \touch($filename, $time);
1351+
} else {
1352+
$result = \touch($filename);
13511353
}
13521354
if ($result === false) {
13531355
throw FilesystemException::createFromPhpError();

‎generated/ldap.php‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,21 @@ function ldap_get_values($link_identifier, $result_entry_identifier, string $att
800800
function ldap_list($link_identifier, string $base_dn, string $filter, array $attributes = null, int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $serverctrls = null)
801801
{
802802
error_clear_last();
803-
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
803+
if ($serverctrls !== null) {
804+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
805+
} elseif ($deref !== LDAP_DEREF_NEVER) {
806+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref);
807+
} elseif ($timelimit !== -1) {
808+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit);
809+
} elseif ($sizelimit !== -1) {
810+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit);
811+
} elseif ($attrsonly !== 0) {
812+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes, $attrsonly);
813+
} elseif ($attributes !== null) {
814+
$result = \ldap_list($link_identifier, $base_dn, $filter, $attributes);
815+
} else {
816+
$result = \ldap_list($link_identifier, $base_dn, $filter);
817+
}
804818
if ($result === false) {
805819
throw LdapException::createFromPhpError();
806820
}
@@ -1181,7 +1195,21 @@ function ldap_parse_result($link, $result, int &$errcode, string &$matcheddn = n
11811195
function ldap_read($link_identifier, string $base_dn, string $filter, array $attributes = null, int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $serverctrls = null)
11821196
{
11831197
error_clear_last();
1184-
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
1198+
if ($serverctrls !== null) {
1199+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
1200+
} elseif ($deref !== LDAP_DEREF_NEVER) {
1201+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref);
1202+
} elseif ($timelimit !== -1) {
1203+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit);
1204+
} elseif ($sizelimit !== -1) {
1205+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit);
1206+
} elseif ($attrsonly !== 0) {
1207+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes, $attrsonly);
1208+
} elseif ($attributes !== null) {
1209+
$result = \ldap_read($link_identifier, $base_dn, $filter, $attributes);
1210+
} else {
1211+
$result = \ldap_read($link_identifier, $base_dn, $filter);
1212+
}
11851213
if ($result === false) {
11861214
throw LdapException::createFromPhpError();
11871215
}
@@ -1349,7 +1377,21 @@ function ldap_sasl_bind($link, string $binddn = null, string $password = null, s
13491377
function ldap_search($link_identifier, string $base_dn, string $filter, array $attributes = null, int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $serverctrls = null)
13501378
{
13511379
error_clear_last();
1352-
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
1380+
if ($serverctrls !== null) {
1381+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref, $serverctrls);
1382+
} elseif ($deref !== LDAP_DEREF_NEVER) {
1383+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit, $deref);
1384+
} elseif ($timelimit !== -1) {
1385+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit, $timelimit);
1386+
} elseif ($sizelimit !== -1) {
1387+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly, $sizelimit);
1388+
} elseif ($attrsonly !== 0) {
1389+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes, $attrsonly);
1390+
} elseif ($attributes !== null) {
1391+
$result = \ldap_search($link_identifier, $base_dn, $filter, $attributes);
1392+
} else {
1393+
$result = \ldap_search($link_identifier, $base_dn, $filter);
1394+
}
13531395
if ($result === false) {
13541396
throw LdapException::createFromPhpError();
13551397
}

‎generated/mbstring.php‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
function mb_check_encoding(string $var = null, string $encoding = null): void
1818
{
1919
error_clear_last();
20-
$result = \mb_check_encoding($var, $encoding);
20+
if ($encoding !== null) {
21+
$result = \mb_check_encoding($var, $encoding);
22+
} else {
23+
$result = \mb_check_encoding($var);
24+
}
2125
if ($result === false) {
2226
throw MbstringException::createFromPhpError();
2327
}
@@ -80,7 +84,11 @@ function mb_chr(int $cp, string $encoding = null): string
8084
function mb_detect_order($encoding_list = null)
8185
{
8286
error_clear_last();
83-
$result = \mb_detect_order($encoding_list);
87+
if ($encoding_list !== null) {
88+
$result = \mb_detect_order($encoding_list);
89+
} else {
90+
$result = \mb_detect_order();
91+
}
8492
if ($result === false) {
8593
throw MbstringException::createFromPhpError();
8694
}
@@ -309,7 +317,11 @@ function mb_eregi_replace(string $pattern, string $replace, string $string, stri
309317
function mb_http_output(string $encoding = null)
310318
{
311319
error_clear_last();
312-
$result = \mb_http_output($encoding);
320+
if ($encoding !== null) {
321+
$result = \mb_http_output($encoding);
322+
} else {
323+
$result = \mb_http_output();
324+
}
313325
if ($result === false) {
314326
throw MbstringException::createFromPhpError();
315327
}
@@ -336,7 +348,11 @@ function mb_http_output(string $encoding = null)
336348
function mb_internal_encoding(string $encoding = null)
337349
{
338350
error_clear_last();
339-
$result = \mb_internal_encoding($encoding);
351+
if ($encoding !== null) {
352+
$result = \mb_internal_encoding($encoding);
353+
} else {
354+
$result = \mb_internal_encoding();
355+
}
340356
if ($result === false) {
341357
throw MbstringException::createFromPhpError();
342358
}
@@ -404,7 +420,11 @@ function mb_parse_str(string $encoded_string, array &$result = null): void
404420
function mb_regex_encoding(string $encoding = null)
405421
{
406422
error_clear_last();
407-
$result = \mb_regex_encoding($encoding);
423+
if ($encoding !== null) {
424+
$result = \mb_regex_encoding($encoding);
425+
} else {
426+
$result = \mb_regex_encoding();
427+
}
408428
if ($result === false) {
409429
throw MbstringException::createFromPhpError();
410430
}

‎generated/mysql.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,19 @@ function mysql_close($link_identifier = null): void
7676
function mysql_connect(string $server = null, string $username = null, string $password = null, bool $new_link = false, int $client_flags = 0)
7777
{
7878
error_clear_last();
79-
$result = \mysql_connect($server, $username, $password, $new_link, $client_flags);
79+
if ($client_flags !== 0) {
80+
$result = \mysql_connect($server, $username, $password, $new_link, $client_flags);
81+
} elseif ($new_link !== false) {
82+
$result = \mysql_connect($server, $username, $password, $new_link);
83+
} elseif ($password !== null) {
84+
$result = \mysql_connect($server, $username, $password);
85+
} elseif ($username !== null) {
86+
$result = \mysql_connect($server, $username);
87+
} elseif ($server !== null) {
88+
$result = \mysql_connect($server);
89+
} else {
90+
$result = \mysql_connect();
91+
}
8092
if ($result === false) {
8193
throw MysqlException::createFromPhpError();
8294
}

‎generated/network.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,11 @@ function dns_get_record(string $hostname, int $type = DNS_ANY, array &$authns =
304304
function fsockopen(string $hostname, int $port = -1, int &$errno = null, string &$errstr = null, float $timeout = null)
305305
{
306306
error_clear_last();
307-
$result = \fsockopen($hostname, $port, $errno, $errstr, $timeout);
307+
if ($timeout !== null) {
308+
$result = \fsockopen($hostname, $port, $errno, $errstr, $timeout);
309+
} else {
310+
$result = \fsockopen($hostname, $port, $errno, $errstr);
311+
}
308312
if ($result === false) {
309313
throw NetworkException::createFromPhpError();
310314
}

‎generated/pcntl.php‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ function pcntl_exec(string $path, array $args = null, array $envs = null): void
5454
function pcntl_getpriority(int $pid = null, int $process_identifier = PRIO_PROCESS): int
5555
{
5656
error_clear_last();
57-
$result = \pcntl_getpriority($pid, $process_identifier);
57+
if ($process_identifier !== PRIO_PROCESS) {
58+
$result = \pcntl_getpriority($pid, $process_identifier);
59+
} elseif ($pid !== null) {
60+
$result = \pcntl_getpriority($pid);
61+
} else {
62+
$result = \pcntl_getpriority();
63+
}
5864
if ($result === false) {
5965
throw PcntlException::createFromPhpError();
6066
}
@@ -81,7 +87,13 @@ function pcntl_getpriority(int $pid = null, int $process_identifier = PRIO_PROCE
8187
function pcntl_setpriority(int $priority, int $pid = null, int $process_identifier = PRIO_PROCESS): void
8288
{
8389
error_clear_last();
84-
$result = \pcntl_setpriority($priority, $pid, $process_identifier);
90+
if ($process_identifier !== PRIO_PROCESS) {
91+
$result = \pcntl_setpriority($priority, $pid, $process_identifier);
92+
} elseif ($pid !== null) {
93+
$result = \pcntl_setpriority($priority, $pid);
94+
} else {
95+
$result = \pcntl_setpriority($priority);
96+
}
8597
if ($result === false) {
8698
throw PcntlException::createFromPhpError();
8799
}

‎generated/stream.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,13 @@ function stream_set_timeout($stream, int $seconds, int $microseconds = 0): void
334334
function stream_socket_accept($server_socket, float $timeout = null, string &$peername = null)
335335
{
336336
error_clear_last();
337-
$result = \stream_socket_accept($server_socket, $timeout, $peername);
337+
if ($peername !== null) {
338+
$result = \stream_socket_accept($server_socket, $timeout, $peername);
339+
} elseif ($timeout !== null) {
340+
$result = \stream_socket_accept($server_socket, $timeout);
341+
} else {
342+
$result = \stream_socket_accept($server_socket);
343+
}
338344
if ($result === false) {
339345
throw StreamException::createFromPhpError();
340346
}
@@ -396,8 +402,12 @@ function stream_socket_client(string $remote_socket, int &$errno = null, string
396402
error_clear_last();
397403
if ($context !== null) {
398404
$result = \stream_socket_client($remote_socket, $errno, $errstr, $timeout, $flags, $context);
399-
} else {
405+
} elseif ($flags !== STREAM_CLIENT_CONNECT) {
400406
$result = \stream_socket_client($remote_socket, $errno, $errstr, $timeout, $flags);
407+
} elseif ($timeout !== null) {
408+
$result = \stream_socket_client($remote_socket, $errno, $errstr, $timeout);
409+
} else {
410+
$result = \stream_socket_client($remote_socket, $errno, $errstr);
401411
}
402412
if ($result === false) {
403413
throw StreamException::createFromPhpError();

‎generator/src/Parameter.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,19 @@ public function isByReference(): bool
7676
*/
7777
public function isOptionalWithNoDefault(): bool
7878
{
79-
return ((string)$this->parameter['choice']) === 'opt' && !$this->hasDefaultValue();
79+
if (((string)$this->parameter['choice']) !== 'opt') {
80+
return false;
81+
}
82+
if (!$this->hasDefaultValue()) {
83+
return true;
84+
}
85+
86+
$initializer = $this->getInitializer();
87+
// Some default value have weird values. For instance, first parameter of "mb_internal_encoding" has default value "mb_internal_encoding()"
88+
if ($initializer !== 'array()' && strpos($initializer, '(') !== false) {
89+
return true;
90+
}
91+
return false;
8092
}
8193

8294
public function isVariadic(): bool

0 commit comments

Comments
 (0)