Skip to content

Commit a2d83a6

Browse files
committed
Promote warrnings to exceptions in chgrp() function
GH-5004
1 parent 9585964 commit a2d83a6

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

ext/standard/filestat.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static int php_disk_free_space(char *path, double *space) /* {{{ */
214214
PHP_WIN32_IOUTIL_CLEANUP_W()
215215
return FAILURE;
216216
}
217-
217+
218218
*space = FreeBytesAvailableToCaller.HighPart * (double) (1ULL << 32) + FreeBytesAvailableToCaller.LowPart;
219219

220220
PHP_WIN32_IOUTIL_CLEANUP_W()
@@ -353,8 +353,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
353353
option = PHP_STREAM_META_GROUP_NAME;
354354
value = Z_STRVAL_P(group);
355355
} else {
356-
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group));
357-
RETURN_FALSE;
356+
zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group));
357+
return;
358358
}
359359
if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
360360
RETURN_TRUE;
@@ -382,8 +382,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
382382
RETURN_FALSE;
383383
}
384384
} else {
385-
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group));
386-
RETURN_FALSE;
385+
zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group));
386+
return;
387387
}
388388

389389
/* Check the basedir */

ext/standard/tests/file/chgrp.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ if(substr(PHP_OS, 0, 3) == "WIN")
77
?>
88
--FILE--
99
<?php
10-
chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
11-
echo "ALIVE\n";
10+
try {
11+
chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", null);
12+
} catch (TypeError $exception) {
13+
echo $exception->getMessage() . "\n";
14+
}
1215
?>
1316
--EXPECTF--
14-
Warning: chgrp(): parameter 2 should be string or int, null given in %schgrp.php on line 2
15-
ALIVE
17+
Parameter 2 should be string or int, null given

0 commit comments

Comments
 (0)