Skip to content

Commit dc8951f

Browse files
committed
cs fix
1 parent b0be806 commit dc8951f

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

src/PhpWord/Style/Chart.php

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,31 +152,30 @@ class Chart extends AbstractStyle
152152
/**
153153
* Min value for Y-Axis.
154154
*
155-
* @var float|int
155+
* @var null|float|int
156156
*/
157-
private $minY = 0;
157+
private $minY;
158158

159159
/**
160160
* Max value for X-Axis.
161161
*
162-
* @var float|int
162+
* @var null|float|int
163163
*/
164-
private $minX = 0;
164+
private $minX;
165165

166166
/**
167167
* Max value for Y-Axis.
168168
*
169-
* @var float|int
169+
* @var null|float|int
170170
*/
171-
private $maxY = 0;
171+
private $maxY;
172172

173173
/**
174174
* Max value for X-Axis.
175175
*
176-
* @var float|int
176+
* @var null|float|int
177177
*/
178-
private $maxX = 0;
179-
178+
private $maxX;
180179

181180
/**
182181
* Create a new instance.
@@ -581,43 +580,42 @@ public function setShowGridX($value = true)
581580
return $this;
582581
}
583582

584-
585-
public function minY(): float|int
583+
public function minY(): float|int|null
586584
{
587585
return $this->minY;
588586
}
589587

590-
public function setMinY(float|int $minY): void
588+
public function setMinY(float|int|null $minY): void
591589
{
592590
$this->minY = $minY;
593591
}
594592

595-
public function minX(): float|int
593+
public function minX(): float|int|null
596594
{
597595
return $this->minX;
598596
}
599597

600-
public function setMinX(float|int $minX): void
598+
public function setMinX(float|int|null $minX): void
601599
{
602600
$this->minX = $minX;
603601
}
604602

605-
public function maxY(): float|int
603+
public function maxY(): float|int|null
606604
{
607605
return $this->maxY;
608606
}
609607

610-
public function setMaxY(float|int $maxY): void
608+
public function setMaxY(float|int|null $maxY): void
611609
{
612610
$this->maxY = $maxY;
613611
}
614612

615-
public function maxX(): float|int
613+
public function maxX(): float|int|null
616614
{
617615
return $this->maxX;
618616
}
619617

620-
public function setMaxX(float|int $maxX): void
618+
public function setMaxX(float|int|null $maxX): void
621619
{
622620
$this->maxX = $maxX;
623621
}

src/PhpWord/Writer/Word2007/Part/Chart.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,16 +388,24 @@ private function writeAxis(XMLWriter $xmlWriter, $type): void
388388
$xmlWriter->startElement('c:scaling');
389389
$xmlWriter->writeElementBlock('c:orientation', 'val', 'minMax');
390390
if ($type == 'cat' && $style->minX()) {
391-
$xmlWriter->writeElementBlock('c:min', 'val', $style->minX());
391+
$xmlWriter->startElement('c:min');
392+
$xmlWriter->writeAttribute('val', $style->minX());
393+
$xmlWriter->endElement();
392394
}
393395
if ($type == 'cat' && $style->maxX()) {
394-
$xmlWriter->writeElementBlock('c:max', 'val', $style->maxX());
396+
$xmlWriter->startElement('c:max');
397+
$xmlWriter->writeAttribute('val', $style->maxX());
398+
$xmlWriter->endElement();
395399
}
396400
if ($type == 'val' && $style->minY()) {
397-
$xmlWriter->writeElementBlock('c:min', 'val', $style->minY());
401+
$xmlWriter->startElement('c:min');
402+
$xmlWriter->writeAttribute('val', $style->minY());
403+
$xmlWriter->endElement();
398404
}
399405
if ($type == 'val' && $style->maxY()) {
400-
$xmlWriter->writeElementBlock('c:max', 'val', $style->maxY());
406+
$xmlWriter->startElement('c:max');
407+
$xmlWriter->writeAttribute('val', $style->maxY());
408+
$xmlWriter->endElement();
401409
}
402410
$xmlWriter->endElement(); // c:scaling
403411

0 commit comments

Comments
 (0)