Skip to content

Commit b59e69d

Browse files
committed
FileStats
1 parent 7ac4ebd commit b59e69d

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

ext/standard/filestat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
489489
option = PHP_STREAM_META_OWNER_NAME;
490490
value = Z_STRVAL_P(user);
491491
} else {
492-
php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user));
493-
RETURN_FALSE;
492+
zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(user));
493+
RETURN_THROWS();
494494
}
495495
if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
496496
RETURN_TRUE;
@@ -519,8 +519,8 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
519519
RETURN_FALSE;
520520
}
521521
} else {
522-
php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user));
523-
RETURN_FALSE;
522+
zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(user));
523+
RETURN_THROWS();
524524
}
525525

526526
/* Check the basedir */

ext/standard/tests/file/chown.phpt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ if(substr(PHP_OS, 0, 3) == "WIN")
77
?>
88
--FILE--
99
<?php
10-
chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
10+
try {
11+
chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
12+
} catch (\TypeError $e) {
13+
echo $e->getMessage() . \PHP_EOL;
14+
}
1115
echo "ALIVE\n";
1216
?>
13-
--EXPECTF--
14-
Warning: chown(): Parameter 2 should be string or int, null given in %schown.php on line %d
17+
--EXPECT--
18+
chown(): Argument #2 ($user) must be of type string|int, null given
1519
ALIVE

0 commit comments

Comments
 (0)