@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | * |
585 | 585 | * @param string $index Chart index position |
586 | 586 | * @throws Exception |
587 | - * @return false|Chart |
|
587 | + * @return null|Chart |
|
588 | 588 | */ |
589 | 589 | public function getChartByIndex($index = null) |
590 | 590 | { |
@@ -1085,7 +1085,7 @@ discard block |
||
1085 | 1085 | * Set a cell value |
1086 | 1086 | * |
1087 | 1087 | * @param string $pCoordinate Coordinate of the cell |
1088 | - * @param mixed $pValue Value of the cell |
|
1088 | + * @param integer $pValue Value of the cell |
|
1089 | 1089 | * @param bool $returnCell Return the worksheet (false, default) or the cell (true) |
1090 | 1090 | * @return Worksheet|Cell Depending on the last parameter being specified |
1091 | 1091 | */ |
@@ -1196,8 +1196,8 @@ discard block |
||
1196 | 1196 | /** |
1197 | 1197 | * Get cell at a specific coordinate by using numeric cell coordinates |
1198 | 1198 | * |
1199 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1200 | - * @param string $pRow Numeric row coordinate of the cell |
|
1199 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1200 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1201 | 1201 | * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't |
1202 | 1202 | * already exist, or a null should be returned instead |
1203 | 1203 | * @return null|Cell Cell that was found/created or null |
@@ -1305,8 +1305,8 @@ discard block |
||
1305 | 1305 | /** |
1306 | 1306 | * Cell at a specific coordinate by using numeric cell coordinates exists? |
1307 | 1307 | * |
1308 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1309 | - * @param string $pRow Numeric row coordinate of the cell |
|
1308 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1309 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1310 | 1310 | * @return bool |
1311 | 1311 | */ |
1312 | 1312 | public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1) |
@@ -1923,7 +1923,7 @@ discard block |
||
1923 | 1923 | /** |
1924 | 1924 | * Set AutoFilter |
1925 | 1925 | * |
1926 | - * @param Worksheet\AutoFilter|string $pValue |
|
1926 | + * @param string $pValue |
|
1927 | 1927 | * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility |
1928 | 1928 | * @throws Exception |
1929 | 1929 | * @return Worksheet |
@@ -2954,7 +2954,7 @@ discard block |
||
2954 | 2954 | * |
2955 | 2955 | * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore) |
2956 | 2956 | * @throws Exception |
2957 | - * @return objWorksheet |
|
2957 | + * @return Worksheet |
|
2958 | 2958 | */ |
2959 | 2959 | public function setCodeName($pValue = null) |
2960 | 2960 | { |
@@ -567,6 +567,11 @@ |
||
567 | 567 | return ['method' => 'filterTestInCustomDataSet', 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND]]; |
568 | 568 | } |
569 | 569 | |
570 | + /** |
|
571 | + * @param integer $columnID |
|
572 | + * @param integer $startRow |
|
573 | + * @param string $ruleType |
|
574 | + */ |
|
570 | 575 | private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue) |
571 | 576 | { |
572 | 577 | $range = $columnID . $startRow . ':' . $columnID . $endRow; |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * Set Row Height |
103 | 103 | * |
104 | - * @param float $pValue |
|
104 | + * @param integer $pValue |
|
105 | 105 | * @return RowDimension |
106 | 106 | */ |
107 | 107 | public function setRowHeight($pValue = -1) |
@@ -60,6 +60,9 @@ discard block |
||
60 | 60 | |
61 | 61 | private static $plotMark = 0; |
62 | 62 | |
63 | + /** |
|
64 | + * @param string $markerID |
|
65 | + */ |
|
63 | 66 | private function formatPointMarker($seriesPlot, $markerID) |
64 | 67 | { |
65 | 68 | $plotMarkKeys = array_keys(self::$markSet); |
@@ -87,6 +90,9 @@ discard block |
||
87 | 90 | return $seriesPlot; |
88 | 91 | } |
89 | 92 | |
93 | + /** |
|
94 | + * @param integer $labelCount |
|
95 | + */ |
|
90 | 96 | private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') |
91 | 97 | { |
92 | 98 | $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode(); |
@@ -116,6 +122,9 @@ discard block |
||
116 | 122 | return $datasetLabels; |
117 | 123 | } |
118 | 124 | |
125 | + /** |
|
126 | + * @param integer $seriesCount |
|
127 | + */ |
|
119 | 128 | private function percentageSumCalculation($groupID, $seriesCount) |
120 | 129 | { |
121 | 130 | // Adjust our values to a percentage value across all series in the group |
@@ -146,6 +155,9 @@ discard block |
||
146 | 155 | return $dataValues; |
147 | 156 | } |
148 | 157 | |
158 | + /** |
|
159 | + * @param \PhpOffice\PhpSpreadsheet\Chart\Title $captionElement |
|
160 | + */ |
|
149 | 161 | private function getCaption($captionElement) |
150 | 162 | { |
151 | 163 | // Read any caption |
@@ -253,6 +265,9 @@ discard block |
||
253 | 265 | $this->renderTitle(); |
254 | 266 | } |
255 | 267 | |
268 | + /** |
|
269 | + * @param integer $groupID |
|
270 | + */ |
|
256 | 271 | private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') |
257 | 272 | { |
258 | 273 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -316,6 +331,9 @@ discard block |
||
316 | 331 | $this->graph->Add($groupPlot); |
317 | 332 | } |
318 | 333 | |
334 | + /** |
|
335 | + * @param integer $groupID |
|
336 | + */ |
|
319 | 337 | private function renderPlotBar($groupID, $dimensions = '2d') |
320 | 338 | { |
321 | 339 | $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection(); |
@@ -400,6 +418,10 @@ discard block |
||
400 | 418 | $this->graph->Add($groupPlot); |
401 | 419 | } |
402 | 420 | |
421 | + /** |
|
422 | + * @param integer $groupID |
|
423 | + * @param boolean $bubble |
|
424 | + */ |
|
403 | 425 | private function renderPlotScatter($groupID, $bubble) |
404 | 426 | { |
405 | 427 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -445,6 +467,9 @@ discard block |
||
445 | 467 | } |
446 | 468 | } |
447 | 469 | |
470 | + /** |
|
471 | + * @param integer $groupID |
|
472 | + */ |
|
448 | 473 | private function renderPlotRadar($groupID) |
449 | 474 | { |
450 | 475 | $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -483,6 +508,9 @@ discard block |
||
483 | 508 | } |
484 | 509 | } |
485 | 510 | |
511 | + /** |
|
512 | + * @param integer $groupID |
|
513 | + */ |
|
486 | 514 | private function renderPlotContour($groupID) |
487 | 515 | { |
488 | 516 | $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -503,6 +531,9 @@ discard block |
||
503 | 531 | $this->graph->Add($seriesPlot); |
504 | 532 | } |
505 | 533 | |
534 | + /** |
|
535 | + * @param integer $groupID |
|
536 | + */ |
|
506 | 537 | private function renderPlotStock($groupID) |
507 | 538 | { |
508 | 539 | $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); |
@@ -542,6 +573,9 @@ discard block |
||
542 | 573 | $this->graph->Add($seriesPlot); |
543 | 574 | } |
544 | 575 | |
576 | + /** |
|
577 | + * @param integer $groupCount |
|
578 | + */ |
|
545 | 579 | private function renderAreaChart($groupCount, $dimensions = '2d') |
546 | 580 | { |
547 | 581 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php'; |
@@ -553,6 +587,9 @@ discard block |
||
553 | 587 | } |
554 | 588 | } |
555 | 589 | |
590 | + /** |
|
591 | + * @param integer $groupCount |
|
592 | + */ |
|
556 | 593 | private function renderLineChart($groupCount, $dimensions = '2d') |
557 | 594 | { |
558 | 595 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php'; |
@@ -564,6 +601,9 @@ discard block |
||
564 | 601 | } |
565 | 602 | } |
566 | 603 | |
604 | + /** |
|
605 | + * @param integer $groupCount |
|
606 | + */ |
|
567 | 607 | private function renderBarChart($groupCount, $dimensions = '2d') |
568 | 608 | { |
569 | 609 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php'; |
@@ -575,6 +615,9 @@ discard block |
||
575 | 615 | } |
576 | 616 | } |
577 | 617 | |
618 | + /** |
|
619 | + * @param integer $groupCount |
|
620 | + */ |
|
578 | 621 | private function renderScatterChart($groupCount) |
579 | 622 | { |
580 | 623 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php'; |
@@ -588,6 +631,9 @@ discard block |
||
588 | 631 | } |
589 | 632 | } |
590 | 633 | |
634 | + /** |
|
635 | + * @param integer $groupCount |
|
636 | + */ |
|
591 | 637 | private function renderBubbleChart($groupCount) |
592 | 638 | { |
593 | 639 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php'; |
@@ -599,6 +645,9 @@ discard block |
||
599 | 645 | } |
600 | 646 | } |
601 | 647 | |
648 | + /** |
|
649 | + * @param integer $groupCount |
|
650 | + */ |
|
602 | 651 | private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false) |
603 | 652 | { |
604 | 653 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php'; |
@@ -675,6 +724,9 @@ discard block |
||
675 | 724 | } |
676 | 725 | } |
677 | 726 | |
727 | + /** |
|
728 | + * @param integer $groupCount |
|
729 | + */ |
|
678 | 730 | private function renderRadarChart($groupCount) |
679 | 731 | { |
680 | 732 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php'; |
@@ -686,6 +738,9 @@ discard block |
||
686 | 738 | } |
687 | 739 | } |
688 | 740 | |
741 | + /** |
|
742 | + * @param integer $groupCount |
|
743 | + */ |
|
689 | 744 | private function renderStockChart($groupCount) |
690 | 745 | { |
691 | 746 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php'; |
@@ -697,6 +752,10 @@ discard block |
||
697 | 752 | } |
698 | 753 | } |
699 | 754 | |
755 | + /** |
|
756 | + * @param integer $groupCount |
|
757 | + * @param string|null $dimensions |
|
758 | + */ |
|
700 | 759 | private function renderContourChart($groupCount, $dimensions) |
701 | 760 | { |
702 | 761 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php'; |
@@ -708,6 +767,9 @@ discard block |
||
708 | 767 | } |
709 | 768 | } |
710 | 769 | |
770 | + /** |
|
771 | + * @param integer $groupCount |
|
772 | + */ |
|
711 | 773 | private function renderCombinationChart($groupCount, $dimensions, $outputDestination) |
712 | 774 | { |
713 | 775 | require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php'; |
@@ -202,6 +202,10 @@ |
||
202 | 202 | return array_pop($this->nestedColumn); |
203 | 203 | } |
204 | 204 | |
205 | + /** |
|
206 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet $sheet |
|
207 | + * @param integer $row |
|
208 | + */ |
|
205 | 209 | protected function flushCell($sheet, $column, $row, &$cellContent) |
206 | 210 | { |
207 | 211 | if (is_string($cellContent)) { |
@@ -235,7 +235,7 @@ |
||
235 | 235 | * Calculate an (approximate) OpenXML column width, based on font size and text contained |
236 | 236 | * |
237 | 237 | * @param \PhpOffice\PhpSpreadsheet\Style\Font $font Font object |
238 | - * @param \PhpOffice\PhpSpreadsheet\RichText|string $cellText Text to calculate width |
|
238 | + * @param string $cellText Text to calculate width |
|
239 | 239 | * @param int $rotation Rotation angle |
240 | 240 | * @param \PhpOffice\PhpSpreadsheet\Style\Font|null $defaultFont Font object |
241 | 241 | * @return int Column width |
@@ -281,6 +281,11 @@ discard block |
||
281 | 281 | return isset($c->v) ? (string) $c->v : null; |
282 | 282 | } |
283 | 283 | |
284 | + /** |
|
285 | + * @param string $r |
|
286 | + * @param string $cellDataType |
|
287 | + * @param string $castBaseType |
|
288 | + */ |
|
284 | 289 | private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType) |
285 | 290 | { |
286 | 291 | $cellDataType = 'f'; |
@@ -335,7 +340,7 @@ discard block |
||
335 | 340 | * |
336 | 341 | * @param string $pFilename |
337 | 342 | * @throws Exception |
338 | - * @return Spreadsheet |
|
343 | + * @return \PhpOffice\PhpSpreadsheet\Spreadsheet |
|
339 | 344 | */ |
340 | 345 | public function load($pFilename) |
341 | 346 | { |
@@ -2005,6 +2010,9 @@ discard block |
||
2005 | 2010 | } |
2006 | 2011 | } |
2007 | 2012 | |
2013 | + /** |
|
2014 | + * @param \PhpOffice\PhpSpreadsheet\Style\Border $docBorder |
|
2015 | + */ |
|
2008 | 2016 | private static function readBorder($docBorder, $eleBorder) |
2009 | 2017 | { |
2010 | 2018 | if (isset($eleBorder['style'])) { |
@@ -2127,6 +2135,9 @@ discard block |
||
2127 | 2135 | return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add"); |
2128 | 2136 | } |
2129 | 2137 | |
2138 | + /** |
|
2139 | + * @param string $style |
|
2140 | + */ |
|
2130 | 2141 | private static function toCSSArray($style) |
2131 | 2142 | { |
2132 | 2143 | $style = str_replace(["\r", "\n"], '', $style); |
@@ -204,6 +204,9 @@ |
||
204 | 204 | return $chart; |
205 | 205 | } |
206 | 206 | |
207 | + /** |
|
208 | + * @param string $type |
|
209 | + */ |
|
207 | 210 | private static function chartTitle($titleDetails, $namespacesChartMeta, $type) |
208 | 211 | { |
209 | 212 | $caption = []; |
@@ -412,6 +412,8 @@ discard block |
||
412 | 412 | * @param string $id1 |
413 | 413 | * @param string $id2 |
414 | 414 | * @param bool $isMultiLevelSeries |
415 | + * @param null|Axis $xAxis |
|
416 | + * @param null|Axis $yAxis |
|
415 | 417 | * |
416 | 418 | * @throws \PhpSpreadsheet\Writer\Exception |
417 | 419 | */ |
@@ -534,6 +536,10 @@ discard block |
||
534 | 536 | * @param string $id1 |
535 | 537 | * @param string $id2 |
536 | 538 | * @param bool $isMultiLevelSeries |
539 | + * @param null|Axis $xAxis |
|
540 | + * @param null|Axis $yAxis |
|
541 | + * @param null|GridLines $majorGridlines |
|
542 | + * @param null|GridLines $minorGridlines |
|
537 | 543 | * |
538 | 544 | * @throws \PhpSpreadsheet\Writer\Exception |
539 | 545 | */ |