Skip to content

fix: Ensure unmatched optional capture group is treated as null in parseRowColumnSelection #578

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

Open
zigzagdev wants to merge 2 commits into
base: master
Choose a base branch
from
+52 −4
Open

fix: Ensure unmatched optional capture group is treated as null in parseRowColumnSelection #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a169ed
fix: add PREG_UNMATCHED_AS_NULL flag to parseRowColumnSelection
zigzagdev May 28, 2026
bdfcc36
test: add tests for single and mixed row/column selections without ra…
zigzagdev May 28, 2026
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
7 changes: 3 additions & 4 deletions src/FragmentFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,18 +292,17 @@ private function parseColumnSelection(string $selection, TabularData $tabularDat
*/
private function parseRowColumnSelection(string $selection): array
{
if (1 !== preg_match(self::REGEXP_ROWS_COLUMNS_SELECTION, $selection, $found)) {
if (1 !== preg_match(self::REGEXP_ROWS_COLUMNS_SELECTION, $selection, $found, PREG_UNMATCHED_AS_NULL)) {
return [-1, 0];
}

$start = $found['start'];
$end = $found['end'] ?? null;
$start = filter_var($start, FILTER_VALIDATE_INT, ['options' => ['min_range' => 1]]);
$start = filter_var($found['start'], FILTER_VALIDATE_INT, ['options' => ['min_range' => 1]]);
if (false === $start) {
return [-1, 0];
}
--$start;

$end = $found['end'];
if (null === $end || '*' === $end) {
return [$start, $end];
}
Expand Down
49 changes: 49 additions & 0 deletions src/TabularDataReaderTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,37 @@ public static function provideValidExpressions(): iterable
'expression' => 'cell=48,12',
'expected' => null,
];

yield 'multiple single rows without range endpoint' => [
'expression' => 'row=1;3',
'expected' => [
0 => ['date', 'temperature', 'place'],
1 => ['2011-01-02', '-1', 'Galway'],
],
];

yield 'mixed single row and row range' => [
'expression' => 'row=1;3-5',
'expected' => [
0 => ['date', 'temperature', 'place'],
1 => ['2011-01-02', '-1', 'Galway'],
2 => ['2011-01-03', '0', 'Galway'],
3 => ['2011-01-01', '6', 'Berkeley'],
],
];

yield 'multiple single columns without range endpoint' => [
'expression' => 'col=1;3',
'expected' => [
0 => [0 => 'date', 2 => 'place'],
1 => [0 => '2011-01-01', 2 => 'Galway'],
2 => [0 => '2011-01-02', 2 => 'Galway'],
3 => [0 => '2011-01-03', 2 => 'Galway'],
4 => [0 => '2011-01-01', 2 => 'Berkeley'],
5 => [0 => '2011-01-02', 2 => 'Berkeley'],
6 => [0 => '2011-01-03', 2 => 'Berkeley'],
],
];
}

#[Test]
Expand Down Expand Up @@ -323,6 +354,7 @@ public static function provideExpressionWithIgnoredSelections(): iterable
'expression selection is invalid for cell 7' => ['cell=1,0-2,3'],
'expression selection is invalid for row or column 3' => ['row=0-3'],
'expression selection is invalid for row or column 4' => ['row=3-0'],
'all single row selections are out of bounds' => ['row=0;0'],
];
}

Expand Down Expand Up @@ -352,6 +384,23 @@ public function it_fails_if_no_row_is_found(): void
$this->tabularDataWithoutHeader()->matchingFirstOrFail('row=42');
}

#[Test]
public function it_throws_when_expression_contains_invalid_single_selection_alongside_valid(): void
{
$this->expectException(FragmentNotFound::class);

$this->tabularDataWithoutHeader()->matchingFirstOrFail('row=0;3');
}

#[Test]
public function it_returns_valid_rows_when_mixed_selection_contains_invalid_single_row(): void
{
$result = $this->tabularDataWithoutHeader()->matchingFirst('row=0;3');

self::assertNotNull($result);
self::assertSame([0 => ['2011-01-02', '-1', 'Galway']], [...$result]);
}

/***************************
* TabularDataReader::map
****************************/
Expand Down
Loading