diff options
| -rw-r--r-- | ext/standard/filestat.c | 10 | ||||
| -rw-r--r-- | ext/standard/tests/file/chgrp.phpt | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 324bb27065..90744a41c1 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -214,7 +214,7 @@ static int php_disk_free_space(char *path, double *space) /* {{{ */ PHP_WIN32_IOUTIL_CLEANUP_W() return FAILURE; } - + *space = FreeBytesAvailableToCaller.HighPart * (double) (1ULL << 32) + FreeBytesAvailableToCaller.LowPart; PHP_WIN32_IOUTIL_CLEANUP_W() @@ -353,8 +353,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ option = PHP_STREAM_META_GROUP_NAME; value = Z_STRVAL_P(group); } else { - php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group)); - RETURN_FALSE; + zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group)); + return; } if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) { RETURN_TRUE; @@ -382,8 +382,8 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ RETURN_FALSE; } } else { - php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group)); - RETURN_FALSE; + zend_type_error("Parameter 2 should be string or int, %s given", zend_zval_type_name(group)); + return; } /* Check the basedir */ diff --git a/ext/standard/tests/file/chgrp.phpt b/ext/standard/tests/file/chgrp.phpt index 03ea24141b..9003979a75 100644 --- a/ext/standard/tests/file/chgrp.phpt +++ b/ext/standard/tests/file/chgrp.phpt @@ -7,9 +7,11 @@ if(substr(PHP_OS, 0, 3) == "WIN") ?> --FILE-- <?php -chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL); -echo "ALIVE\n"; +try { + chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", null); +} catch (TypeError $exception) { + echo $exception->getMessage() . "\n"; +} ?> --EXPECTF-- -Warning: chgrp(): parameter 2 should be string or int, null given in %schgrp.php on line 2 -ALIVE +Parameter 2 should be string or int, null given |