archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjust manual zpp-like error message implementations

Browse source 
This should also use int/bool.
This commit is contained in:
Nikita Popov 2018-02-04 23:27:31 +01:00
parent b4dff68379
commit fc23452cbf
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/ftp/php_ftp.c
View file

@ -1543,7 +1543,7 @@ PHP_FUNCTION(ftp_set_option)
switch (option) {
case PHP_FTP_OPT_TIMEOUT_SEC:
if (Z_TYPE_P(z_value) != IS_LONG) {
php_error_docref(NULL, E_WARNING, "Option TIMEOUT_SEC expects value of type long, %s given",
php_error_docref(NULL, E_WARNING, "Option TIMEOUT_SEC expects value of type int, %s given",
zend_zval_type_name(z_value));
RETURN_FALSE;
}
@ -1556,7 +1556,7 @@ PHP_FUNCTION(ftp_set_option)
break;
case PHP_FTP_OPT_AUTOSEEK:
if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) {
php_error_docref(NULL, E_WARNING, "Option AUTOSEEK expects value of type boolean, %s given",
php_error_docref(NULL, E_WARNING, "Option AUTOSEEK expects value of type bool, %s given",
zend_zval_type_name(z_value));
RETURN_FALSE;
}
@ -1565,7 +1565,7 @@ PHP_FUNCTION(ftp_set_option)
break;
case PHP_FTP_OPT_USEPASVADDRESS:
if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) {
php_error_docref(NULL, E_WARNING, "Option USEPASVADDRESS expects value of type boolean, %s given",
php_error_docref(NULL, E_WARNING, "Option USEPASVADDRESS expects value of type bool, %s given",
zend_zval_type_name(z_value));
RETURN_FALSE;
}

8
ext/standard/filestat.c
View file

@ -354,7 +354,7 @@ 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 integer, %s given", zend_zval_type_name(group));
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group));
RETURN_FALSE;
}
if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
@ -383,7 +383,7 @@ 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 integer, %s given", zend_zval_type_name(group));
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(group));
RETURN_FALSE;
}
@ -490,7 +490,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
option = PHP_STREAM_META_OWNER_NAME;
value = Z_STRVAL_P(user);
} else {
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or integer, %s given", zend_zval_type_name(user));
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(user));
RETURN_FALSE;
}
if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
@ -520,7 +520,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
RETURN_FALSE;
}
} else {
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or integer, %s given", zend_zval_type_name(user));
php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(user));
RETURN_FALSE;
}

2
ext/standard/tests/file/chgrp.phpt
View file

@ -11,5 +11,5 @@ chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
echo "ALIVE\n";
?>
--EXPECTF--
Warning: chgrp(): parameter 2 should be string or integer, null given in %schgrp.php on line 2
Warning: chgrp(): parameter 2 should be string or int, null given in %schgrp.php on line 2
ALIVE

2
ext/standard/tests/file/chown.phpt
View file

@ -11,5 +11,5 @@ chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL);
echo "ALIVE\n";
?>
--EXPECTF--
Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d
Warning: chown(): parameter 2 should be string or int, null given in %schown.php on line %d
ALIVE