geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-09 17:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4106 from oleibman/issue1284

Browse Source 
Html Reader Preserve Unicode Whitespace Characters
This commit is contained in:
oleibman
2024-07-30 22:04:10 +00:00
committed by GitHub
parent a3c5c9e7ce 09584d2950
commit ae2c3ea5e4
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Reader/Html.php
+4 -1
View File
@@ -627,7 +627,10 @@ class Html extends BaseReader
{
foreach ($element->childNodes as $child) {
if ($child instanceof DOMText) {
$domText = (string) preg_replace('/\s+/u', ' ', trim($child->nodeValue ?? ''));
$domText = (string) preg_replace('/\s+/', ' ', trim($child->nodeValue ?? ''));
if ($domText === "\u{a0}") {
$domText = '';
}
if (is_string($cellContent)) {
// simply append the text if the cell content is a plain text string
$cellContent .= $domText;
tests/PhpSpreadsheetTests/Reader/Html/Issue1284Test.php
+36
View File
@@ -0,0 +1,36 @@
<?php
declare(strict_types=1);
namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
class Issue1284Test extends AbstractFunctional
{
public function testIssue1284(): void
{
$ideographicSpace = "\u{3000}";
$nbsp = "\u{a0}";
$spreadsheetOld = new Spreadsheet();
$osheet = $spreadsheetOld->getActiveSheet();
$osheet->getCell('A1')->setValue('# item 1');
$osheet->getCell('A2')->setValue("$ideographicSpace# item 2");
$osheet->getCell('A3')->setValue("$ideographicSpace$ideographicSpace# item 3");
$osheet->getCell('A4')->setValue("$nbsp# item\t4");
$osheet->getCell('A5')->setValue("$nbsp$nbsp# item 5");
$spreadsheet = $this->writeAndReload($spreadsheetOld, 'Html');
$spreadsheetOld->disconnectWorksheets();
$sheet = $spreadsheet->getActiveSheet();
self::assertSame('# item 1', $sheet->getCell('A1')->getValue(), 'nothing changed');
self::assertSame("$ideographicSpace# item 2", $sheet->getCell('A2')->getValue(), 'nothing changed including 1 ideographic space');
self::assertSame("$ideographicSpace$ideographicSpace# item 3", $sheet->getCell('A3')->getValue(), 'nothing changed including 2 ideographic spaces');
self::assertSame("$nbsp# item 4", $sheet->getCell('A4')->getValue(), 'nbsp unchanged, 2 spaces reduced to 1, tab changed to space');
self::assertSame("$nbsp$nbsp# item 5", $sheet->getCell('A5')->getValue(), 'many spaces reduced to 1');
$spreadsheet->disconnectWorksheets();
}
}