Skip to content

Commit fe222b8

Browse files
committed
Permit CSV Delimiter to be Set to Null
See issue PHPOffice#2287. A 1-character change. The delimiter variable is defined as nullable, and getDelimiter can return null; setDelimiter should follow suit.
1 parent bc9234e commit fe222b8

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/PhpSpreadsheet/Reader/Csv.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public function getDelimiter(): ?string
369369
return $this->delimiter;
370370
}
371371

372-
public function setDelimiter(string $delimiter): self
372+
public function setDelimiter(?string $delimiter): self
373373
{
374374
$this->delimiter = $delimiter;
375375

tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php

+9
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,13 @@ public function providerEscapes(): array
251251
[(version_compare(PHP_VERSION, '7.4') < 0) ? "\x0" : '', ','],
252252
];
253253
}
254+
255+
public function testSetDelimiterNull(): void
256+
{
257+
$reader = new Csv();
258+
$reader->setDelimiter(',');
259+
self::assertSame(',', $reader->getDelimiter());
260+
$reader->setDelimiter(null);
261+
self::assertNull($reader->getDelimiter());
262+
}
254263
}

0 commit comments

Comments
 (0)