Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0: Revert "Fix GH-8563 Different results for seek() on SplFileObject and SplTempFileObject"
php · Jul 5, 2022 · e67336f · e67336f
2 parents 35ca407 + 79a2832
commit e67336f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 139 deletions.
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -1891,21 +1891,22 @@ static zend_result spl_filesystem_file_read_ex(spl_filesystem_object *intern, bo
 	}
 
 	if (!buf) {
-		return FAILURE;
-	}
-
-	if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_DROP_NEW_LINE)) {
-		if (line_len > 0 && buf[line_len - 1] == '\n') {
-			line_len--;
-			if (line_len > 0 && buf[line_len - 1] == '\r') {
+		intern->u.file.current_line = estrdup("");
+		intern->u.file.current_line_len = 0;
+	} else {
+		if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_DROP_NEW_LINE)) {
+			if (line_len > 0 && buf[line_len - 1] == '\n') {
 				line_len--;
+				if (line_len > 0 && buf[line_len - 1] == '\r') {
+					line_len--;
+				}
+				buf[line_len] = '\0';
 			}
-			buf[line_len] = '\0';
 		}
-	}
 
-	intern->u.file.current_line = buf;
-	intern->u.file.current_line_len = line_len;
+		intern->u.file.current_line = buf;
+		intern->u.file.current_line_len = line_len;
+	}
 	intern->u.file.current_line_num += line_add;
 
 	return SUCCESS;

diff --git a/ext/spl/tests/SplFileObject/fgetcsv_file_empty_lines.phpt b/ext/spl/tests/SplFileObject/fgetcsv_file_empty_lines.phpt
diff --git a/ext/spl/tests/SplFileObject/foreach_file_empty_lines.phpt b/ext/spl/tests/SplFileObject/foreach_file_empty_lines.phpt
diff --git a/ext/spl/tests/SplFileObject/gh8563.phpt b/ext/spl/tests/SplFileObject/gh8563.phpt
diff --git a/...leObject/SplFileObject_fgetcsv_basic.phpt → ...pl/tests/SplFileObject_fgetcsv_basic.phpt b/...leObject/SplFileObject_fgetcsv_basic.phpt → ...pl/tests/SplFileObject_fgetcsv_basic.phpt
@@ -13,7 +13,6 @@ fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv1.csv');
 var_dump($fo->fgetcsv());
-var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
@@ -30,4 +29,3 @@ array(4) {
   [3]=>
   string(1) "5"
 }
-bool(false)
diff --git a/...ileObject/SplFileObject_key_error001.phpt → ...spl/tests/SplFileObject_key_error001.phpt b/...ileObject/SplFileObject_key_error001.phpt → ...spl/tests/SplFileObject_key_error001.phpt
@@ -18,5 +18,5 @@ var_dump($s->key());
 var_dump($s->valid());
 ?>
 --EXPECT--
-int(12)
+int(14)
 bool(false)
diff --git a/...ileObject/SplFileObject_key_error002.phpt → ...spl/tests/SplFileObject_key_error002.phpt b/...ileObject/SplFileObject_key_error002.phpt → ...spl/tests/SplFileObject_key_error002.phpt
@@ -18,5 +18,5 @@ var_dump($s->key());
 var_dump($s->valid());
 ?>
 --EXPECT--
-int(12)
+int(13)
 bool(false)
diff --git a/ext/spl/tests/bug81477.phpt b/ext/spl/tests/bug81477.phpt
@@ -21,6 +21,7 @@ string(8) "baz,bat
 "
 string(10) "more,data
 "
+string(0) ""
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/bug81477.csv');

diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/fileobject_001.phpt
@@ -70,7 +70,7 @@ string(1) "4"
 int(5)
 string(1) "5"
 int(6)
-bool(false)
+string(0) ""
 ===B===
 int(0)
 string(1) "0"