MFH: 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 0bbb23f48c3a303aab3b08ec71f4dc9a257ec992..f998278752ffdf342ac63c34e1c3a6013c9eb37d 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2003,6 +2003,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 */
@@ -2013,7 +2015,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];
                }