Skip to content

Commit f374e52

Browse files
committed
FileStats
1 parent 4ce4aab commit f374e52

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
@@ -485,8 +485,8 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
485485
option = PHP_STREAM_META_OWNER_NAME;
486486
value = Z_STRVAL_P(user);
487487
} else {
488-
php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user));
489-
RETURN_FALSE;
488+
zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(user));
489+
RETURN_THROWS();
490490
}
491491
if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
492492
RETURN_TRUE;
@@ -515,8 +515,8 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
515515
RETURN_FALSE;
516516
}
517517
} else {
518-
php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user));
519-
RETURN_FALSE;
518+
zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(user));
519+
RETURN_THROWS();
520520
}
521521

522522
/* 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)