Skip to content

Commit 9bb090d

Browse files
committed
Found an Untested String Increment Operator
1 parent acba6d1 commit 9bb090d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/PhpSpreadsheet/Writer/Ods/Settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Composer\Pcre\Preg;
66
use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
77
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
8+
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
89
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
910
use PhpOffice\PhpSpreadsheet\Spreadsheet;
1011
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -137,7 +138,7 @@ private function writeFreezePane(XMLWriter $objWriter, Worksheet $worksheet): vo
137138
$this->writeSplitValue($objWriter, 'PositionLeft', 'short', '0');
138139
$this->writeSplitValue($objWriter, 'PositionRight', 'short', (string) ($columnId - 1));
139140

140-
for ($column = 'A'; $column !== $columnName; ++$column) {
141+
for ($column = 'A'; $column !== $columnName; StringHelper::stringIncrement($column)) {
141142
$worksheet->getColumnDimension($column)->setAutoSize(true);
142143
}
143144

tests/PhpSpreadsheetTests/Writer/Ods/FreezeTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ public static function testFreeze(): void
1919
['A', 'B', 'C', 'D'],
2020
[1, 2, 3, 4],
2121
]);
22-
$sheet->freezePane('A2');
22+
$sheet->freezePane('B2');
2323
$writer = new OdsWriter($spreadsheet);
2424
$writerSettings = new OdsWriter\Settings($writer);
2525
$settings = $writerSettings->write();
2626
// The items we are particular interested in below are:
27-
// HorizontalSplitMode, HorizontalSplitPosition
28-
// VerticalSplitMode, VerticalSplitPosition
27+
// HorizontalSplitMode, HorizontalSplitPosition, PositionLeft, PositionRight
28+
// VerticalSplitMode, VerticalSplitPosition, PositionTop, PositionBottom
2929
$expected = '<config:config-item-map-entry config:name="Worksheet">'
3030
. '<config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item>'
3131
. '<config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item>'
3232
. '<config:config-item config:name="HorizontalSplitMode" config:type="short">2</config:config-item>'
33-
. '<config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item>'
33+
. '<config:config-item config:name="HorizontalSplitPosition" config:type="int">1</config:config-item>'
3434
. '<config:config-item config:name="PositionLeft" config:type="short">0</config:config-item>'
35-
. '<config:config-item config:name="PositionRight" config:type="short">0</config:config-item>'
35+
. '<config:config-item config:name="PositionRight" config:type="short">1</config:config-item>'
3636
. '<config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>'
3737
. '<config:config-item config:name="VerticalSplitPosition" config:type="int">1</config:config-item>'
3838
. '<config:config-item config:name="PositionTop" config:type="short">0</config:config-item>'

0 commit comments

Comments
 (0)