Fix various problems

This commit is contained in:
Adrien Loison committed 2015-07-27 00:23:18 -07:00
1 parent 86a4c3790a
commit 37d87a8a27
9 files changed
+21 -11

No files matched your search

+3 -3
View File
@@ -111,9 +111,9 @@ class RowIterator implements IteratorInterface
if (!$this->hasReachedEndOfFile) {
do {
$lineData = $this->globalFunctionsHelper->fgetcsv($this->filePointer, 0, $this->fieldDelimiter, $this->fieldEnclosure);
} while ($lineData && $this->isEmptyLine($lineData));
} while ($lineData === false || ($lineData !== null && $this->isEmptyLine($lineData)));
if ($lineData !== null) {
if ($lineData !== false && $lineData !== null) {
$this->rowDataBuffer = $lineData;
$this->numReadRows++;
}
@@ -133,7 +133,7 @@ class RowIterator implements IteratorInterface
* Return the current element from the buffer
* @link http://php.net/manual/en/iterator.current.php
*
* @return array
* @return array|null
*/
public function current()
{