Merge branch 'PHP-8.1'

* PHP-8.1: Revert "Fix GH-8563 Different results for seek() on SplFileObject and SplTempFileObject" Revert "Update FreeBSD CI image."
php · Jul 5, 2022 · 6f26102 · 6f26102
2 parents da8bfd4 + e67336f
commit 6f26102
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 229 deletions.
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -1914,21 +1914,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/SplFileObject_fgetcsv_basic.phpt b/ext/spl/tests/SplFileObject/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/ext/spl/tests/SplFileObject/SplFileObject_key_error001.phpt b/ext/spl/tests/SplFileObject/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/ext/spl/tests/SplFileObject/SplFileObject_key_error002.phpt b/ext/spl/tests/SplFileObject/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 → ext/spl/tests/SplFileObject/bug81477.phpt b/ext/spl/tests/bug81477.phpt → ext/spl/tests/SplFileObject/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/SplFileObject/fgetcsv_file_empty_lines.phpt b/ext/spl/tests/SplFileObject/fgetcsv_file_empty_lines.phpt
diff --git a/ext/spl/tests/SplFileObject/fileobject_001.phpt b/ext/spl/tests/SplFileObject/fileobject_001.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/gh8121.csv b/ext/spl/tests/SplFileObject/gh8121.csv
@@ -1,5 +1,5 @@
-id,status,on_sale,brand,name,link,meta_title,meta_desc,description
-1,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
-2,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
-3,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
-4,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
+id,status,on_sale,brand,name,link,meta_title,meta_desc,description
+1,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
+2,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
+3,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
+4,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
diff --git a/ext/spl/tests/SplFileObject/gh8563.phpt b/ext/spl/tests/SplFileObject/gh8563.phpt