Revert "Fix GH-8563 Different results for seek() on SplFileObject and SplTempFileObject"

Although the fix is partially correct it also breaks long standing behaviour which has been produced since PHP 5.3.

This reverts commit 6f87a5c.

Author: Girgias

ext/spl/spl_directory.c

@@ -1883,21 +1883,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;

ext/spl/tests/SplFileObject/fgetcsv_file_empty_lines.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"
 }
-NULL

ext/spl/tests/SplFileObject/foreach_file_empty_lines.phpt

@@ -18,5 +18,5 @@ var_dump($s->key());
 var_dump($s->valid());
 ?>
 --EXPECT--
-int(12)
+int(14)
 bool(false)

ext/spl/tests/SplFileObject/gh8563.phpt

@@ -18,5 +18,5 @@ var_dump($s->key());
 var_dump($s->valid());
 ?>
 --EXPECT--
-int(12)
+int(13)
 bool(false)

ext/spl/tests/SplFileObject/SplFileObject_fgetcsv_basic.phpt renamed to ext/spl/tests/SplFileObject_fgetcsv_basic.phpt

@@ -21,6 +21,7 @@ string(8) "baz,bat
 "
 string(10) "more,data
 "
+string(0) ""
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/bug81477.csv');

ext/spl/tests/SplFileObject/SplFileObject_key_error001.phpt renamed to ext/spl/tests/SplFileObject_key_error001.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"