-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
Fix ODS read filter on number-columns-repeated cell #3149
Merged
oleibman
merged 2 commits into
PHPOffice:master
from
JokubasR:fix/ods-read-filter-repeated-columns
Nov 6, 2022
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
tests/PhpSpreadsheetTests/Reader/Ods/RepeatedColumnsTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
<?php | ||
|
||
namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods; | ||
|
||
use PhpOffice\PhpSpreadsheet\Reader\IReadFilter; | ||
use PhpOffice\PhpSpreadsheet\Reader\Ods; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
class RepeatedColumnsTest extends TestCase | ||
{ | ||
/** | ||
* @var Ods | ||
*/ | ||
private $reader; | ||
|
||
protected function setUp(): void | ||
{ | ||
$this->reader = new Ods(); | ||
} | ||
|
||
public function testDefinedNames(): void | ||
{ | ||
$this->reader->setReadFilter( | ||
new class () implements IReadFilter { | ||
public function readCell($columnAddress, $row, $worksheetName = ''): bool | ||
{ | ||
return in_array($columnAddress, ['A', 'C', 'E', 'G', 'J', 'K'], true); | ||
} | ||
} | ||
); | ||
$spreadsheet = $this->reader->load('tests/data/Reader/Ods/RepeatedCells.ods'); | ||
$worksheet = $spreadsheet->getActiveSheet(); | ||
|
||
self::assertEquals('TestA', $worksheet->getCell('A1')->getValue()); | ||
self::assertNull($worksheet->getCell('C1')->getValue()); | ||
self::assertEquals('TestE', $worksheet->getCell('E1')->getValue()); | ||
self::assertEquals('TestG', $worksheet->getCell('G1')->getValue()); | ||
self::assertEquals('A', $worksheet->getCell('J1')->getValue()); | ||
self::assertEquals('TestK', $worksheet->getCell('K1')->getValue()); | ||
} | ||
} |
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why a loop, and not simply
$columnID += $colRepeats;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah! Got it; $columnID is the column address, not its index