SplFileObject::fgetcsv(): Consistently return false on failure

Both the documentation and the stubs state that this method is
supposed to return false on failure. However, if the line read
(rather than the getcsv operation) fails, it would incorrectly
return null instead.

Author: nikic

ext/spl/spl_directory.c

@@ -2345,7 +2345,9 @@ PHP_METHOD(SplFileObject, fgetcsv)
 	case 0:
 		break;
 	}
-	spl_filesystem_file_read_csv(intern, delimiter, enclosure, escape, return_value);
+	if (spl_filesystem_file_read_csv(intern, delimiter, enclosure, escape, return_value) == FAILURE) {
+		RETURN_FALSE;
+	}
 }
 /* }}} */
 

ext/spl/spl_directory_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 00139cce188b3950e5a7606c70c5848c6280851d */
+ * Stub hash: bea6fbfdd7ff20de998dcd24bef4fd2ab56d5041 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)

ext/spl/tests/SplFileObject_fgetcsv_basic.phpt

@@ -13,6 +13,8 @@ fclose($fp);
 
 $fo = new SplFileObject('SplFileObject__fgetcsv1.csv');
 var_dump($fo->fgetcsv());
+var_dump($fo->fgetcsv());
+var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
@@ -29,3 +31,8 @@ array(4) {
   [3]=>
   string(1) "5"
 }
+array(1) {
+  [0]=>
+  NULL
+}
+bool(false)