add a notice to fgetcsv() when delimiter or enclosure is longer than 1 char

(feature request #38496)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 9e53da1f0650bcc8dbe1e6a5284b86e98eae7cbd..6e6c1faf23bbd84318441ba35bffc65073d5eedf 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2081,6 +2081,8 @@ PHP_FUNCTION(fgetcsv)
                        if (delimiter_str_len < 1) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "delimiter must be a character");
                                RETURN_FALSE;
+                       } else if (delimiter_str_len > 1) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "delimiter must be a single character");
                        }
 
                        /* use first character from string */
@@ -2091,7 +2093,10 @@ PHP_FUNCTION(fgetcsv)
                        if (enclosure_str_len < 1) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "enclosure must be a character");
                                RETURN_FALSE;
+                       } else if (enclosure_str_len > 1) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "enclosure must be a single character");
                        }
+
                        /* use first character from string */
                        enclosure = enclosure_str[0];
                }