geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-08-30 20:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Named Constant Rather than Literal for Highest Column

Browse Source 
I would like to have used `use const`, but couldn't find a way that satisfied all of phpcs, php-cs-fixer, and phpstan.
This commit is contained in:
oleibman
2026-02-25 09:55:35 -08:00
parent aa631c68ef
commit 6b7d2043b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Reader/Ods.php
+4 -3
View File
@@ -11,6 +11,7 @@ use DOMDocument;
use DOMElement;
use DOMNode;
use DOMText;
use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\Helper\Dimension as HelperDimension;
@@ -496,7 +497,7 @@ class Ods extends BaseReader
// Go through every child of table element
$rowID = 1;
$tableColumnIndex = 1;
$this->highestDataIndex = 16384;
$this->highestDataIndex = AddressRange::MAX_COLUMN_INT;
foreach ($worksheetDataSet->childNodes as $childNode) {
/** @var DOMElement $childNode */
@@ -1291,7 +1292,7 @@ class Ods extends BaseReader
$columnWidth = new HelperDimension($columnWidths[$tableStyleName]);
$tableColumnIndex2 = $tableColumnIndex;
$tableColumnString = Coordinate::stringFromColumnIndex($tableColumnIndex2);
for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0 && $tableColumnIndex2 <= 16384; --$rowRepeats2) {
for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0 && $tableColumnIndex2 <= AddressRange::MAX_COLUMN_INT; --$rowRepeats2) {
if (!$this->readEmptyCells && $tableColumnIndex2 > $this->highestDataIndex) {
break;
}
@@ -1310,7 +1311,7 @@ class Ods extends BaseReader
if ($defaultStyleName !== 'Default' && isset($this->allStyles[$defaultStyleName])) {
$tableColumnIndex2 = $tableColumnIndex;
$tableColumnString = Coordinate::stringFromColumnIndex($tableColumnIndex2);
for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0 && $tableColumnIndex2 <= 16384; --$rowRepeats2) {
for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0 && $tableColumnIndex2 <= AddressRange::MAX_COLUMN_INT; --$rowRepeats2) {
$spreadsheet->getActiveSheet()
->getStyle($tableColumnString)
->applyFromArray(