Skip to content

Fix GH-18120: Honor FILE_SKIP_EMPTY_LINES even when FILE_IGNORE_NEW_LINES is not set #19346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexandre-daubois wants to merge 2 commits into
base: master
Choose a base branch
from
+156 −14
Open

Fix GH-18120: Honor FILE_SKIP_EMPTY_LINES even when FILE_IGNORE_NEW_LINES is not set #19346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f62ad9
Fix GH-18120: Honor `FILE_SKIP_EMPTY_LINES` even when `FILE_IGNORE_NE…
alexandre-daubois Aug 1, 2025
f0e3236
fix inconsistent behavior
alexandre-daubois Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions ext/standard/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,31 @@ PHP_FUNCTION(file)
do {
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;
}
}

size_t line_len = p - s;
if (line_len == eol_len) {
s = p;
continue;
}
}
add_index_stringl(return_value, i++, s, p-s);
s = p;
} while ((p = memchr(p, eol_marker, (e-p))));
Expand Down
124 changes: 124 additions & 0 deletions ext/standard/tests/file/file_skip_empty_lines.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
--TEST--
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";

$test_data = "First\n\nSecond\n\n\nThird\n";
file_put_contents($test_file, $test_data);

$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
var_dump($lines);

$lines = file($test_file, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
var_dump($lines);

$lines = file($test_file, FILE_IGNORE_NEW_LINES);
var_dump($lines);

$lines = file($test_file);
var_dump($lines);

$test_data_win = "First\r\n\r\nSecond\r\n";
file_put_contents($test_file, $test_data_win);

$lines = file($test_file, FILE_SKIP_EMPTY_LINES);
var_dump($lines);

$lines = file($test_file, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
var_dump($lines);

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]=>
string(6) "First
"
[1]=>
string(7) "Second
"
[2]=>
string(6) "Third
"
}
array(3) {
[0]=>
string(5) "First"
[1]=>
string(6) "Second"
[2]=>
string(5) "Third"
}
array(6) {
[0]=>
string(5) "First"
[1]=>
string(0) ""
[2]=>
string(6) "Second"
[3]=>
string(0) ""
[4]=>
string(0) ""
[5]=>
string(5) "Third"
}
array(6) {
[0]=>
string(6) "First
"
[1]=>
string(1) "
"
[2]=>
string(7) "Second
"
[3]=>
string(1) "
"
[4]=>
string(1) "
"
[5]=>
string(6) "Third
"
}
array(2) {
[0]=>
string(7) "First
"
[1]=>
string(8) "Second
"
}
array(2) {
[0]=>
string(5) "First"
[1]=>
string(6) "Second"
}
array(0) {
}
array(0) {
}
array(0) {
}
array(0) {
}
10 changes: 2 additions & 8 deletions ext/standard/tests/file/file_variation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,14 @@ array(5) {
[4]=>
string(5) " data"
}
array(5) {
array(3) {
[0]=>
string(4) "Gar
"
[1]=>
string(1) "
"
[2]=>
string(6) "bage
"
[3]=>
string(1) "
"
[4]=>
[2]=>
string(5) " data"
}
*** Testing with variation in use_include_path argument ***
Expand Down
9 changes: 3 additions & 6 deletions ext/standard/tests/file/file_variation7.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,17 @@ array(5) {
}

file() with FILE_SKIP_EMPTY_LINES:
array(5) {
array(4) {
[0]=>
string(7) "Line 1
"
[1]=>
string(1) "
"
[2]=>
string(2) "
"
[3]=>
[2]=>
string(3) "
"
[4]=>
[3]=>
string(7) "\Line 3"
}

Expand Down