Adjust manual zpp-like error message implementations

This should also use int/bool.

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 5aad7b000f758a6527bee2a929072a6bd268cf39..c6309676ba30047fb044747ad9c97358543eaa04 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -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;
                        }

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 6af241fa64ec4a2584efb547a8853bfdee0b719a..a405f0dfdc973bc1e071c2f00e7d514fbb91d6bf 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -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;
        }
 

diff --git a/ext/standard/tests/file/chgrp.phpt b/ext/standard/tests/file/chgrp.phpt
index 9c85f5c835f46823473be4e3716d1575f4832516..03ea24141bb0a1705eda5791965c9e5d49589475 100644 (file)
--- a/ext/standard/tests/file/chgrp.phpt
+++ b/ext/standard/tests/file/chgrp.phpt
@@ -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

diff --git a/ext/standard/tests/file/chown.phpt b/ext/standard/tests/file/chown.phpt
index 9075d3dc33231526e90d5defc6c8a4456efcb052..049073e7a034b64e1d883fff02f7cb4d5bd56b4c 100644 (file)
--- a/ext/standard/tests/file/chown.phpt
+++ b/ext/standard/tests/file/chown.phpt
@@ -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