Skip to content

fix splCsvReader #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2025
Merged

fix splCsvReader #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e53f458
fix splCsvReader
achrafAa Jun 12, 2025
4f1c2e0
Refactor SplCsvReader to improve record reading logic and ensure vali…
achrafAa Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 52 additions & 12 deletions src/Readers/SplCsvReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,23 +238,63 @@ public function nextRecord(): array|false
return false;
}

$filePosition = $nextPosition;
if ($this->getConfig()->hasHeader()) {
$filePosition++; // Skip header line
}

try {
$reader->seek($filePosition);
$record = $reader->current();

if ($record === false || $record === null || ! is_array($record)) {
return false;
// Position the reader at the correct record
if ($this->position === -1) {
// First read - start from beginning
if ($this->getConfig()->hasHeader()) {
// Cache header first
if ($this->header === null) {
$reader->rewind();
$headerRecord = $reader->current();
if ($headerRecord !== false && $headerRecord !== [null] && is_array($headerRecord) && ! $this->isInvalidRecord($headerRecord)) {
$this->header = $headerRecord;
}
}
// Now seek to first data record (line 1)
$reader->seek(1);
} else {
// No header, start at beginning
$reader->rewind();
}
// Reader is now positioned at the first data record
} else {
// Subsequent reads - advance to next record
$reader->next();
}

// Update position only after successful read
// Read records until we find a valid one
do {
$record = $reader->current();

if ($record === false) {
return false;
}

// Ensure we have a valid array record
if (! is_array($record)) {
$reader->next();
$nextPosition++;

continue; // skip non-array data
}

if ($this->isInvalidRecord($record)) {
$reader->next();
$nextPosition++;

continue; // skip invalid record
}

break; // valid record found
} while (true);

$this->position = $nextPosition;
$this->cachedRecord = $record; // Cache the record

/** @var array $record */
$this->cachedRecord = $record;

/** @var array $record */
return $record;
} catch (Exception) {
return false;
Expand Down