Skip to content

Commit ee2a1a6

Browse files
committed
switch to ValueError
1 parent baccc0e commit ee2a1a6

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

ext/standard/link.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ PHP_FUNCTION(linkinfo)
8585
ZEND_PARSE_PARAMETERS_END();
8686

8787
if (UNEXPECTED(link_len == 0)) {
88-
php_error_docref(NULL, E_WARNING, "%s", strerror(ENOENT));
89-
RETURN_LONG(Z_L(-1));
88+
zend_argument_must_not_be_empty_error(1);
89+
RETURN_THROWS();
9090
}
9191

9292
dirname = estrndup(link, link_len);

ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,16 @@ var_dump( symlink($filename, false) ); // false as linkname
2727
echo "\n*** Testing linkinfo() for error conditions ***\n";
2828

2929
//invalid arguments
30-
var_dump( linkinfo('') ); // empty string as linkname
31-
var_dump( linkinfo(false) ); // boolean false as linkname
30+
try {
31+
var_dump(linkinfo('')); // empty string as linkname
32+
} catch (ValueError $e) {
33+
echo $e->getMessage() . "\n";
34+
}
35+
try {
36+
var_dump(linkinfo(false)); // boolean false as linkname
37+
} catch (ValueError $e) {
38+
echo $e->getMessage() . "\n";
39+
}
3240

3341
echo "Done\n";
3442
?>
@@ -54,9 +62,6 @@ bool(false)
5462

5563
*** Testing linkinfo() for error conditions ***
5664

57-
Warning: linkinfo(): %s in %s on line %d
58-
int(-1)
59-
60-
Warning: linkinfo(): %s in %s on line %d
61-
int(-1)
65+
linkinfo(): Argument #1 ($path) must not be empty
66+
linkinfo(): Argument #1 ($path) must not be empty
6267
Done

0 commit comments

Comments
 (0)