Skip to content

Xlsx Writer Eliminate xml:space From Non-Text Nodes #4556

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

Merged
merged 2 commits into from
Aug 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).

### Fixed

- Nothing yet.
- Xlsx Writer eliminate xml:space from non-text nodes. [Issue #4542](https://github.com/PHPOffice/PhpSpreadsheet/issues/4542) [PR #4556](https://github.com/PHPOffice/PhpSpreadsheet/pull/4556)

## 2025-07-23 - 4.5.0

Expand Down
19 changes: 15 additions & 4 deletions src/PhpSpreadsheet/Writer/Xlsx.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
use PhpOffice\PhpSpreadsheet\Calculation\Functions;
use PhpOffice\PhpSpreadsheet\HashTable;
use PhpOffice\PhpSpreadsheet\RichText\RichText;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Style\Borders;
use PhpOffice\PhpSpreadsheet\Style\Conditional;
Expand Down Expand Up @@ -283,6 +284,19 @@ public function createStyleDictionaries(): void
);
}

/**
* @return (RichText|string)[] $stringTable
*/
public function createStringTable(): array
{
$this->stringTable = [];
for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
$this->stringTable = $this->getWriterPartStringTable()->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
}

return $this->stringTable;
}

/**
* Save PhpSpreadsheet to file.
*
Expand All @@ -303,10 +317,7 @@ public function save($filename, int $flags = 0): void
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);

// Create string lookup table
$this->stringTable = [];
for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
$this->stringTable = $this->getWriterPartStringTable()->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
}
$this->createStringTable();

// Create styles dictionaries
$this->createStyleDictionaries();
Expand Down
1 change: 0 additions & 1 deletion src/PhpSpreadsheet/Writer/Xlsx/Style.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public function writeStyles(Spreadsheet $spreadsheet): string

// styleSheet
$objWriter->startElement('styleSheet');
$objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeAttribute('xmlns', Namespaces::MAIN);

// numFmts
Expand Down
1 change: 0 additions & 1 deletion src/PhpSpreadsheet/Writer/Xlsx/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function writeTable(WorksheetTable $table, int $tableRef): string
$range = $table->getRange();

$objWriter->startElement('table');
$objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeAttribute('xmlns', Namespaces::MAIN);
$objWriter->writeAttribute('id', (string) $tableRef);
$objWriter->writeAttribute('name', $name);
Expand Down
1 change: 0 additions & 1 deletion src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public function writeWorkbook(Spreadsheet $spreadsheet, bool $preCalculateFormul

// workbook
$objWriter->startElement('workbook');
$objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeAttribute('xmlns', Namespaces::MAIN);
$objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);

Expand Down
16 changes: 9 additions & 7 deletions src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, array $string

// Worksheet
$objWriter->startElement('worksheet');
$objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeAttribute('xmlns', Namespaces::MAIN);
$objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);

Expand Down Expand Up @@ -1436,13 +1435,16 @@ private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, Ri
$objWriter->writeAttribute('t', $mappedType);
if (!$cellValue instanceof RichText) {
$objWriter->startElement('is');
$objWriter->writeElement(
't',
StringHelper::controlCharacterPHP2OOXML(
$cellValue
)
$objWriter->startElement('t');
$textToWrite = StringHelper::controlCharacterPHP2OOXML(
$cellValue
);
$objWriter->endElement();
if ($textToWrite !== trim($textToWrite)) {
$objWriter->writeAttribute('xml:space', 'preserve');
}
$objWriter->writeRawData($textToWrite);
$objWriter->endElement(); // t
$objWriter->endElement(); // is
} else {
$objWriter->startElement('is');
$this->getParentWriter()
Expand Down
109 changes: 109 additions & 0 deletions tests/PhpSpreadsheetTests/Writer/Xlsx/Issue4542Test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?php

declare(strict_types=1);

namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;

use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
use PHPUnit\Framework\TestCase;

class Issue4542Test extends TestCase
{
public function testXmlSpace(): void
{
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
$string = ' Ye&ar ';
$trimString = trim($string);
$sheet->getCell('A1')->setValue($string);
$sheet->getCell('A2')->setValueExplicit($string, DataType::TYPE_INLINE);
$sheet->getCell('B1')->setValue($trimString);
$sheet->getCell('B2')->setValueExplicit($trimString, DataType::TYPE_INLINE);
$writer = new XlsxWriter($spreadsheet);

$writer->createStyleDictionaries();
$writerStyle = new XlsxWriter\Style($writer);
$data = $writerStyle->writeStyles($spreadsheet);
self::assertStringContainsString(
'<styleSheet',
$data
);
self::assertStringNotContainsString(
'xml:space',
$data
);

$writerWorkbook = new XlsxWriter\Workbook($writer);
$data = $writerWorkbook->writeWorkbook($spreadsheet);
self::assertStringContainsString(
'<workbook',
$data
);
self::assertStringNotContainsString(
'xml:space',
$data
);

$stringTable = $writer->createStringTable();
$writerStringTable = new XlsxWriter\StringTable($writer);
$data = $writerStringTable->writeStringTable($stringTable);
self::assertStringContainsString(
'<si><t xml:space="preserve"> Ye&amp;ar </t></si>',
$data
);
self::assertStringContainsString(
'<si><t>Ye&amp;ar</t></si>',
$data
);

$writerWorksheet = new XlsxWriter\Worksheet($writer);
$data = $writerWorksheet->writeWorksheet($sheet, []);
self::assertStringContainsString(
'<c r="A2" t="inlineStr"><is><t xml:space="preserve"> Ye&amp;ar </t></is></c>',
$data
);
self::assertStringContainsString(
'<c r="B2" t="inlineStr"><is><t>Ye&amp;ar</t></is></c>',
$data
);

$spreadsheet->disconnectWorksheets();
}

public function testTable(): void
{
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
$sheet->fromArray(
[
['MyCol', 'Colonne2', 'Colonne3'],
[10, 20],
[2],
[3],
[4],
],
null,
'B1',
true
);
$table = new Table('B1:D5', 'Tableau1');
$sheet->addTable($table);

$writer = new XlsxWriter($spreadsheet);
$writerTable = new XlsxWriter\Table($writer);
$data = $writerTable->writeTable($table, 1);

self::assertStringContainsString(
'<table ',
$data
);
self::assertStringNotContainsString(
'xml:space',
$data
);
$spreadsheet->disconnectWorksheets();
}
}