@@ -91,11 +91,11 @@ |
||
91 | 91 | * |
92 | 92 | * @param string $dataSource |
93 | 93 | * @param null|mixed $formatCode |
94 | - * @param mixed $pointCount |
|
94 | + * @param integer $pointCount |
|
95 | 95 | * @param mixed $dataValues |
96 | 96 | * @param null|mixed $marker |
97 | - * @param mixed $dataType |
|
98 | - * @param null|mixed $color |
|
97 | + * @param string $dataType |
|
98 | + * @param boolean $color |
|
99 | 99 | */ |
100 | 100 | public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null, $color = null) |
101 | 101 | { |
@@ -330,7 +330,7 @@ |
||
330 | 330 | $calcEngine = \PhpOffice\PhpSpreadsheet\Calculation::getInstance($worksheet->getParent()); |
331 | 331 | $newDataValues = \PhpOffice\PhpSpreadsheet\Calculation::unwrapResult( |
332 | 332 | $calcEngine->_calculateFormulaValue( |
333 | - '='.$this->dataSource, |
|
333 | + '=' . $this->dataSource, |
|
334 | 334 | null, |
335 | 335 | $worksheet->getCell('A1') |
336 | 336 | ) |
@@ -410,8 +410,8 @@ discard block |
||
410 | 410 | * @param string $id1 |
411 | 411 | * @param string $id2 |
412 | 412 | * @param bool $isMultiLevelSeries |
413 | - * @param mixed $xAxis |
|
414 | - * @param mixed $yAxis |
|
413 | + * @param null|Axis $xAxis |
|
414 | + * @param null|Axis $yAxis |
|
415 | 415 | * |
416 | 416 | * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception |
417 | 417 | */ |
@@ -533,10 +533,10 @@ discard block |
||
533 | 533 | * @param string $id1 |
534 | 534 | * @param string $id2 |
535 | 535 | * @param bool $isMultiLevelSeries |
536 | - * @param mixed $xAxis |
|
537 | - * @param mixed $yAxis |
|
538 | - * @param mixed $majorGridlines |
|
539 | - * @param mixed $minorGridlines |
|
536 | + * @param null|Axis $xAxis |
|
537 | + * @param null|Axis $yAxis |
|
538 | + * @param null|GridLines $majorGridlines |
|
539 | + * @param null|GridLines $minorGridlines |
|
540 | 540 | * |
541 | 541 | * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception |
542 | 542 | */ |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | $catIsMultiLevelSeries = $valIsMultiLevelSeries = false; |
246 | 246 | $plotGroupingType = ''; |
247 | 247 | foreach ($chartTypes as $chartType) { |
248 | - $objWriter->startElement('c:'.$chartType); |
|
248 | + $objWriter->startElement('c:' . $chartType); |
|
249 | 249 | |
250 | 250 | $groupCount = $plotArea->getPlotGroupCount(); |
251 | 251 | for ($i = 0; $i < $groupCount; ++$i) { |
@@ -852,7 +852,7 @@ discard block |
||
852 | 852 | |
853 | 853 | if (null !== $xAxis->getFillProperty('value')) { |
854 | 854 | $objWriter->startElement('a:solidFill'); |
855 | - $objWriter->startElement('a:'.$xAxis->getFillProperty('type')); |
|
855 | + $objWriter->startElement('a:' . $xAxis->getFillProperty('type')); |
|
856 | 856 | $objWriter->writeAttribute('val', $xAxis->getFillProperty('value')); |
857 | 857 | $objWriter->startElement('a:alpha'); |
858 | 858 | $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha')); |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | |
870 | 870 | if (null !== $xAxis->getLineProperty('value')) { |
871 | 871 | $objWriter->startElement('a:solidFill'); |
872 | - $objWriter->startElement('a:'.$xAxis->getLineProperty('type')); |
|
872 | + $objWriter->startElement('a:' . $xAxis->getLineProperty('type')); |
|
873 | 873 | $objWriter->writeAttribute('val', $xAxis->getLineProperty('value')); |
874 | 874 | $objWriter->startElement('a:alpha'); |
875 | 875 | $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha')); |
@@ -1320,13 +1320,13 @@ discard block |
||
1320 | 1320 | |
1321 | 1321 | $objWriter->endElement(); |
1322 | 1322 | } else { |
1323 | - $objWriter->startElement('c:'.$dataType.'Ref'); |
|
1323 | + $objWriter->startElement('c:' . $dataType . 'Ref'); |
|
1324 | 1324 | |
1325 | 1325 | $objWriter->startElement('c:f'); |
1326 | 1326 | $objWriter->writeRawData($plotSeriesValues->getDataSource()); |
1327 | 1327 | $objWriter->endElement(); |
1328 | 1328 | |
1329 | - $objWriter->startElement('c:'.$dataType.'Cache'); |
|
1329 | + $objWriter->startElement('c:' . $dataType . 'Cache'); |
|
1330 | 1330 | |
1331 | 1331 | if (($groupType !== DataSeries::TYPE_PIECHART) && ($groupType !== DataSeries::TYPE_PIECHART_3D) && ($groupType !== DataSeries::TYPE_DONUTCHART)) { |
1332 | 1332 | if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) { |