Address latest comment

Author: alexandre-daubois

NEWS

@@ -140,6 +140,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-13204 (glob() fails if square bracket is in current directory).
     (ndossche)
   . Add array size maximum to array_diff(). (ndossche)
+  . Fixed bug GH-18120 (Honor FILE_SKIP_EMPTY_LINES even when
+    FILE_IGNORE_NEW_LINES is not set). (alexandre-daubois)
 
 - Streams:
   . Added so_keepalive, tcp_keepidle, tcp_keepintvl and tcp_keepcnt stream

ext/standard/file.c

@@ -641,26 +641,11 @@ PHP_FUNCTION(file)
 				p++;
 parse_eol:
 				if (skip_blank_lines) {
-					size_t eol_len = 1;
-
-					if (eol_marker == '\n') {
-						if (p - ZSTR_VAL(target_buf) >= 2 && *(p - 2) == '\r' && *(p - 1) == '\n') {
-							eol_len = 2;
-						} else if (p == e && p > s) {
-							const char *check = p - 1;
-							while (check > s && *check == '\r') {
-								check--;
-							}
-							if (check == s && *check == '\r') {
-								s = p;
-								continue;
-							}
-							eol_len = 1;
-						}
+					const char *c = s;
+					while (c < p && (*c == '\n' || *c == '\r')) {
+						c++;
 					}
-
-					size_t line_len = p - s;
-					if (line_len == eol_len) {
+					if (c == p) {
 						s = p;
 						continue;
 					}

ext/standard/tests/file/file_skip_empty_lines.phpt

@@ -43,6 +43,11 @@ var_dump($lines);
 file_put_contents($test_file, "\r\n");
 $lines = file($test_file, FILE_SKIP_EMPTY_LINES);
 var_dump($lines);
+
+file_put_contents($test_file, "\r\r\n\n");
+$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
+var_dump($lines);
+
 ?>
 --CLEAN--
 <?php unlink(__DIR__ . "/file_skip_empty_lines.tmp"); ?>
@@ -122,3 +127,5 @@ array(0) {
 }
 array(0) {
 }
+array(0) {
+}