first batch of changes #182
This commit is contained in:
parent
f1c58bdb59
commit
3c8796043b
@ -4,6 +4,11 @@ namespace Box\Spout\Writer\Common;
|
|||||||
|
|
||||||
use Box\Spout\Writer\Common\Helper\CellHelper;
|
use Box\Spout\Writer\Common\Helper\CellHelper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class Cell
|
||||||
|
*
|
||||||
|
* @package Box\Spout\Writer\Common
|
||||||
|
*/
|
||||||
class Cell
|
class Cell
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -18,13 +23,14 @@ class Cell
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Formula cell type
|
* Formula cell type
|
||||||
|
* Not used at the moment
|
||||||
*/
|
*/
|
||||||
const TYPE_FORMULA = 2;
|
const TYPE_FORMULA = 2;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Blank cell type
|
* Empty cell type
|
||||||
*/
|
*/
|
||||||
const TYPE_BLANK = 3;
|
const TYPE_EMPTY = 3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Boolean cell type
|
* Boolean cell type
|
||||||
@ -38,20 +44,19 @@ class Cell
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The value of this cell
|
* The value of this cell
|
||||||
* @var null | mixed
|
* @var mixed|null
|
||||||
*/
|
*/
|
||||||
protected $value = null;
|
protected $value = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The cell type
|
* The cell type
|
||||||
* @var null
|
* @var int
|
||||||
*/
|
*/
|
||||||
protected $type = null;
|
protected $type = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cell constructor.
|
* Cell constructor.
|
||||||
* @param $value mixed
|
* @param $value mixed
|
||||||
* @param $comment string
|
|
||||||
*/
|
*/
|
||||||
public function __construct($value)
|
public function __construct($value)
|
||||||
{
|
{
|
||||||
@ -92,7 +97,7 @@ class Cell
|
|||||||
if (CellHelper::isBoolean($value)) {
|
if (CellHelper::isBoolean($value)) {
|
||||||
return self::TYPE_BOOLEAN;
|
return self::TYPE_BOOLEAN;
|
||||||
} elseif (CellHelper::isEmpty($value)) {
|
} elseif (CellHelper::isEmpty($value)) {
|
||||||
return self::TYPE_BLANK;
|
return self::TYPE_EMPTY;
|
||||||
} elseif (CellHelper::isNumeric($this->getValue())) {
|
} elseif (CellHelper::isNumeric($this->getValue())) {
|
||||||
return self::TYPE_NUMERIC;
|
return self::TYPE_NUMERIC;
|
||||||
} elseif (CellHelper::isNonEmptyString($value)) {
|
} elseif (CellHelper::isNonEmptyString($value)) {
|
||||||
@ -113,12 +118,13 @@ class Cell
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isBlank()
|
public function isEmpty()
|
||||||
{
|
{
|
||||||
return $this->type === self::TYPE_BLANK;
|
return $this->type === self::TYPE_EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Not used at the moment
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isFormula()
|
public function isFormula()
|
||||||
|
@ -215,7 +215,7 @@ class Worksheet implements WorksheetInterface
|
|||||||
$data .= ' office:value-type="float" calcext:value-type="float" office:value="' . $cell->getValue() . '">';
|
$data .= ' office:value-type="float" calcext:value-type="float" office:value="' . $cell->getValue() . '">';
|
||||||
$data .= '<text:p>' . $cell->getValue() . '</text:p>';
|
$data .= '<text:p>' . $cell->getValue() . '</text:p>';
|
||||||
$data .= '</table:table-cell>';
|
$data .= '</table:table-cell>';
|
||||||
} else if ($cell->isBlank()) {
|
} else if ($cell->isEmpty()) {
|
||||||
$data .= '/>';
|
$data .= '/>';
|
||||||
} else {
|
} else {
|
||||||
throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cell->getValue()));
|
throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cell->getValue()));
|
||||||
|
@ -226,7 +226,7 @@ EOD;
|
|||||||
$cellXML .= ' t="b"><v>' . intval($cell->getValue()) . '</v></c>';
|
$cellXML .= ' t="b"><v>' . intval($cell->getValue()) . '</v></c>';
|
||||||
} else if ($cell->isNumeric()) {
|
} else if ($cell->isNumeric()) {
|
||||||
$cellXML .= '><v>' . $cell->getValue() . '</v></c>';
|
$cellXML .= '><v>' . $cell->getValue() . '</v></c>';
|
||||||
} else if ($cell->isBlank()) {
|
} else if ($cell->isEmpty()) {
|
||||||
if ($this->styleHelper->shouldApplyStyleOnEmptyCell($styleId)) {
|
if ($this->styleHelper->shouldApplyStyleOnEmptyCell($styleId)) {
|
||||||
$cellXML .= '/>';
|
$cellXML .= '/>';
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user