fix inconsistent behavior

Author: alexandre-daubois

NEWS

@@ -46,6 +46,8 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug GH-19926 (reset internal pointer earlier while splicing array
     while COW violation flag is still set). (alexandre-daubois)
+  . Fixed bug GH-18120 (Honor FILE_SKIP_EMPTY_LINES even when
+    FILE_IGNORE_NEW_LINES is not set). (alexandre-daubois)
 
 - Streams:
   . Added so_reuseaddr streams context socket option that allows disabling

ext/standard/file.c

@@ -641,11 +641,26 @@ PHP_FUNCTION(file)
 				p++;
 parse_eol:
 				if (skip_blank_lines) {
-					int windows_eol = 0;
-					if (p != ZSTR_VAL(target_buf) && eol_marker == '\n' && *(p - 1) == '\r') {
-						windows_eol++;
+					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;
+						}
 					}
-					if (p-s-windows_eol == 1) {
+
+					size_t line_len = p - s;
+					if (line_len == eol_len) {
 						s = p;
 						continue;
 					}

ext/standard/tests/file/file_skip_empty_lines.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test file() function with FILE_SKIP_EMPTY_LINES flag
+GH-18120 (Honor FILE_SKIP_EMPTY_LINES even when FILE_IGNORE_NEW_LINES is not set)
 --FILE--
 <?php
 $test_file = __DIR__ . "/file_skip_empty_lines.tmp";
@@ -28,8 +28,24 @@ var_dump($lines);
 $lines = file($test_file, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
 var_dump($lines);
 
-unlink($test_file);
+file_put_contents($test_file, "\r");
+$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
+var_dump($lines);
+
+file_put_contents($test_file, "\r\r");
+$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
+var_dump($lines);
+
+file_put_contents($test_file, "\n");
+$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
+var_dump($lines);
+
+file_put_contents($test_file, "\r\n");
+$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
+var_dump($lines);
 ?>
+--CLEAN--
+<?php unlink(__DIR__ . "/file_skip_empty_lines.tmp"); ?>
 --EXPECT--
 array(3) {
   [0]=>
@@ -84,14 +100,11 @@ array(6) {
   string(6) "Third
 "
 }
-array(3) {
+array(2) {
   [0]=>
   string(7) "First
 "
   [1]=>
-  string(2) "
-"
-  [2]=>
   string(8) "Second
 "
 }
@@ -101,3 +114,11 @@ array(2) {
   [1]=>
   string(6) "Second"
 }
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}