mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-01 04:59:14 +00:00
oleibman
10ec62707e
Fix #3999. Fix #4000. Fix #4002. Several bug reports and feature requests for Xml Reader arrived practically simultaneously. They are all small and hit the same code modules, so I have bundled them together in one PR. - `loadSpreadsheetFromString` might try to open a file with a falsy name (like '0'), which results in an exception with a misleading message (or a completely unexpected result if a file with that name exists). Code will still throw an exception, but the message will no longer be misleading, and no file I/O will be attempted. - function `trySimpleXmlLoadString` is deprecated. It should never have been implemented with public visibility, and the fact that it was made the fix above a little more difficult than it would otherwise have been. It is replaced with a private equivalent. - Style reader function `parseStyles` will now use a better namespace-aware method of reading its Xml data. Peculiarly, the Xml for the Style elements can either include or not a namespace prefix. This is probably because the global namespace and the styles namespace are the same. The existing prefix-based code does not recognize their equivalence, but the new namespace-based code does. Xml Reader continues to use prefix-based code in several other places. - Border line styles with Weight omitted or equal to 0 have been treated as no border, but they should be treated as 'hair' thickness. - Support for Zoom is added to Xml Reader. - In support of the above, new properties (and getters and setters) zoomScalePageLayoutView and zoomScaleSheetLayoutView are added to Worksheet/SheetView. (As far as I can tell, Excel does not support Sheet Layout View for Xml spreadsheets). - Support is added for those new properties in Xlsx Reader and Writer. - Xls Reader and Writer seem to work okay without changes. There is one test where Xls shows a different value for one of the properties than Xml or Xlsx, but the spreadsheet looks okay and I don't see any practical consequences of the difference. - PageBreak support is added to Xml Reader. - Code for writing out Column Page Breaks in Xlsx Writer was wrong (and, unsurprisingly, untested). A one-line change fixes it, and tests are added.
92 lines
4.0 KiB
PHP
92 lines
4.0 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
|
|
|
|
use PhpOffice\PhpSpreadsheet\Reader\Xml;
|
|
use PhpOffice\PhpSpreadsheet\Style\Border;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
class XmlIssue4000Test extends TestCase
|
|
{
|
|
public function testFontBoldItalic(): void
|
|
{
|
|
// Styles tag and children have ss: prefixes
|
|
$xmldata = <<< 'EOT'
|
|
<?xml version="1.0"?>
|
|
<?mso-application progid="Excel.Sheet"?>
|
|
<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
|
|
xmlns:o="urn:schemas-microsoft-com:office:office"
|
|
xmlns:x="urn:schemas-microsoft-com:office:excel"
|
|
xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
|
|
xmlns:html="http://www.w3.org/TR/REC-html40">
|
|
<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
|
|
<Version>16.00</Version>
|
|
</DocumentProperties>
|
|
<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
|
|
<AllowPNG/>
|
|
</OfficeDocumentSettings>
|
|
<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
|
|
<WindowHeight>6510</WindowHeight>
|
|
<WindowWidth>19200</WindowWidth>
|
|
<WindowTopX>32767</WindowTopX>
|
|
<WindowTopY>32767</WindowTopY>
|
|
<ProtectStructure>False</ProtectStructure>
|
|
<ProtectWindows>False</ProtectWindows>
|
|
</ExcelWorkbook>
|
|
<ss:Styles>
|
|
<ss:Style ss:ID="Default" ss:Name="Normal">
|
|
<ss:Alignment ss:Vertical="Bottom"/>
|
|
<ss:Borders/>
|
|
<ss:Font ss:FontName="Aptos Narrow" x:Family="Swiss" ss:Size="11"
|
|
ss:Color="#000000"/>
|
|
<ss:Interior/>
|
|
<ss:NumberFormat/>
|
|
<ss:Protection/>
|
|
</ss:Style>
|
|
<ss:Style ss:ID="s63">
|
|
<ss:Alignment ss:Vertical="Bottom"/>
|
|
<ss:Borders>
|
|
<ss:Border ss:Position="Bottom" ss:LineStyle="Double" ss:Weight="3"/>
|
|
<ss:Border ss:Position="Left" ss:LineStyle="Continuous"/>
|
|
<ss:Border ss:Position="Right" ss:LineStyle="DashDot" ss:Weight="2"/>
|
|
<ss:Border ss:Position="Top" ss:LineStyle="Dash" ss:Weight="1"/>
|
|
</ss:Borders>
|
|
<ss:Font ss:FontName="Aptos Narrow" x:Family="Swiss" ss:Size="11"
|
|
ss:Color="#000000" ss:Bold="1"/>
|
|
<ss:Interior/>
|
|
<ss:NumberFormat/>
|
|
<ss:Protection/>
|
|
</ss:Style>
|
|
</ss:Styles>
|
|
<Worksheet ss:Name="Test">
|
|
<Table ss:ExpandedColumnCount="2" ss:ExpandedRowCount="2" x:FullColumns="1"
|
|
x:FullRows="1" ss:DefaultRowHeight="14.5">
|
|
<Row ss:Index="2" ss:Height="15">
|
|
<Cell ss:Index="2" ss:StyleID="s63"><Data ss:Type="String">TEST</Data></Cell>
|
|
</Row>
|
|
</Table>
|
|
<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
|
|
<Selected/>
|
|
<ProtectObjects>False</ProtectObjects>
|
|
<ProtectScenarios>False</ProtectScenarios>
|
|
</WorksheetOptions>
|
|
</Worksheet>
|
|
</Workbook>
|
|
EOT;
|
|
$reader = new Xml();
|
|
$spreadsheet = $reader->loadSpreadsheetFromString($xmldata);
|
|
self::assertEquals(1, $spreadsheet->getSheetCount());
|
|
|
|
$sheet = $spreadsheet->getActiveSheet();
|
|
self::assertEquals('Test', $sheet->getTitle());
|
|
self::assertSame(Border::BORDER_DOUBLE, $sheet->getStyle('B2')->getBorders()->getBottom()->getBorderStyle());
|
|
self::assertSame(Border::BORDER_MEDIUMDASHDOT, $sheet->getStyle('B2')->getBorders()->getRight()->getBorderStyle());
|
|
self::assertSame(Border::BORDER_DASHED, $sheet->getStyle('B2')->getBorders()->getTop()->getBorderStyle());
|
|
self::assertSame(Border::BORDER_HAIR, $sheet->getStyle('B2')->getBorders()->getLeft()->getBorderStyle());
|
|
|
|
$spreadsheet->disconnectWorksheets();
|
|
}
|
|
}
|