mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ac2342b26028eafe1cf6de25ebe5f969a85dd766 into 84596668410bea89d21aa9867b91e1550e359329

Browse Source
This commit is contained in:
David Bonting 2022-05-26 15:55:27 +02:00 committed by GitHub
commit ccb7bdb162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Spout/Common/Entity/Cell.php
View File

@ -139,6 +139,9 @@ class Cell
*/
protected function detectType($value)
{
if (CellTypeHelper::isFormula($value)) {
return self::TYPE_FORMULA;
}
if (CellTypeHelper::isBoolean($value)) {
return self::TYPE_BOOLEAN;
}
@ -198,6 +201,14 @@ class Cell
return $this->type === self::TYPE_DATE;
}
/**
* @return bool
*/
public function isFormula()
{
return $this->type === self::TYPE_FORMULA;
}
/**
* @return bool
*/

14
src/Spout/Common/Helper/CellTypeHelper.php
View File

@ -60,9 +60,19 @@ class CellTypeHelper
*/
public static function isDateTimeOrDateInterval($value)
{
return (
$value instanceof \DateTimeInterface ||
return ($value instanceof \DateTimeInterface ||
$value instanceof \DateInterval
);
}
/**
* Returns whether the given value looks like a formula
*
* @param $value
* @return bool whether the given value looks like a formula
*/
public static function isFormula($value)
{
return (is_array($value) || strpos($value, '=') === 0);
}
}

10
src/Spout/Writer/XLSX/Manager/WorksheetManager.php
View File

@ -179,7 +179,7 @@ EOD;
* @throws InvalidArgumentException If the given value cannot be processed
* @return RegisteredStyle
*/
private function applyStyleAndRegister(Cell $cell, Style $rowStyle) : RegisteredStyle
private function applyStyleAndRegister(Cell $cell, Style $rowStyle): RegisteredStyle
{
$isMatchingRowStyle = false;
if ($cell->getStyle()->isEmpty()) {
@ -228,7 +228,13 @@ EOD;
$cellXML = '<c r="' . $columnLetters . $rowIndexOneBased . '"';
$cellXML .= ' s="' . $styleId . '"';
if ($cell->isString()) {
if ($cell->isFormula()) {
if (is_array($cell->getValue())) {
$cellXML .= ' ><f>' . substr($cell->getValue()[0], 1) . '</f><v>' . $cell->getValue()[1] . '</v></c>';
} else {
$cellXML .= ' ><f>' . substr($cell->getValue(), 1) . '</f></c>';
}
} elseif ($cell->isString()) {
$cellXML .= $this->getCellXMLFragmentForNonEmptyString($cell->getValue());
} elseif ($cell->isBoolean()) {
$cellXML .= ' t="b"><v>' . (int) ($cell->getValue()) . '</v></c>';