Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Locale-Independent Float Conversion for Xlsx Writer Custom Property (#3099) 

Fix #3095. Issue is not a problem for Php8, but is for 7.4. Code used to write Xml for float custom property uses locale-dependent (in Php7) cast. Change to use locale-independent (all Php releases) `sprintf('%F'...)` instead.
This commit is contained in:
oleibman 2022-10-02 18:37:55 -07:00 committed by GitHub
parent cd9811cbd3
commit 88bbac9849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
View File

@ -216,7 +216,7 @@ class DocProps extends WriterPart
break; break;
case Properties::PROPERTY_TYPE_FLOAT: case Properties::PROPERTY_TYPE_FLOAT:
$objWriter->writeElement('vt:r8', $propertyValue); $objWriter->writeElement('vt:r8', sprintf('%F', $propertyValue));
break; break;
case Properties::PROPERTY_TYPE_BOOLEAN: case Properties::PROPERTY_TYPE_BOOLEAN:

36
tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
View File

@ -2,9 +2,10 @@
namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx; namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
use PHPUnit\Framework\TestCase; use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
class LocaleFloatsTest extends TestCase class LocaleFloatsTest extends AbstractFunctional
{ {
/** /**
* @var bool * @var bool
@ -16,6 +17,12 @@ class LocaleFloatsTest extends TestCase
*/ */
private $currentLocale; private $currentLocale;
/** @var ?Spreadsheet */
private $spreadsheet;
/** @var ?Spreadsheet */
private $reloadedSpreadsheet;
protected function setUp(): void protected function setUp(): void
{ {
$this->currentLocale = setlocale(LC_ALL, '0'); $this->currentLocale = setlocale(LC_ALL, '0');
@ -34,6 +41,14 @@ class LocaleFloatsTest extends TestCase
if ($this->localeAdjusted && is_string($this->currentLocale)) { if ($this->localeAdjusted && is_string($this->currentLocale)) {
setlocale(LC_ALL, $this->currentLocale); setlocale(LC_ALL, $this->currentLocale);
} }
if ($this->spreadsheet !== null) {
$this->spreadsheet->disconnectWorksheets();
$this->spreadsheet = null;
}
if ($this->reloadedSpreadsheet !== null) {
$this->reloadedSpreadsheet->disconnectWorksheets();
$this->reloadedSpreadsheet = null;
}
} }
public function testLocaleFloatsCorrectlyConvertedByWriter(): void public function testLocaleFloatsCorrectlyConvertedByWriter(): void
@ -42,18 +57,17 @@ class LocaleFloatsTest extends TestCase
self::markTestSkipped('Unable to set locale for testing.'); self::markTestSkipped('Unable to set locale for testing.');
} }
$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet(); $this->spreadsheet = $spreadsheet = new Spreadsheet();
$properties = $spreadsheet->getProperties();
$properties->setCustomProperty('Version', 1.2);
$spreadsheet->getActiveSheet()->setCellValue('A1', 1.1); $spreadsheet->getActiveSheet()->setCellValue('A1', 1.1);
$filename = 'decimalcomma.xlsx'; $this->reloadedSpreadsheet = $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
$writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
$writer->save($filename);
$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx(); $result = $reloadedSpreadsheet->getActiveSheet()->getCell('A1')->getValue();
$spreadsheet = $reader->load($filename); self::assertEqualsWithDelta(1.1, $result, 1.0E-8);
unlink($filename); $prop = $reloadedSpreadsheet->getProperties()->getCustomPropertyValue('Version');
self::assertEqualsWithDelta(1.2, $prop, 1.0E-8);
$result = $spreadsheet->getActiveSheet()->getCell('A1')->getValue();
$actual = sprintf('%f', $result); $actual = sprintf('%f', $result);
self::assertStringContainsString('1,1', $actual); self::assertStringContainsString('1,1', $actual);