@@ -236,10 +236,12 @@ discard block |
||
236 | 236 | * @param int &$str_unique Total number of unique strings |
237 | 237 | * @param array &$str_table String Table |
238 | 238 | * @param array &$colors Colour Table |
239 | - * @param mixed $parser The formula parser created for the Workbook |
|
239 | + * @param Parser $parser The formula parser created for the Workbook |
|
240 | 240 | * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
241 | 241 | * @param string $phpSheet The worksheet to write |
242 | 242 | * @param Worksheet $phpSheet |
243 | + * @param integer $str_total |
|
244 | + * @param integer $str_unique |
|
243 | 245 | */ |
244 | 246 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
245 | 247 | { |
@@ -636,7 +638,7 @@ discard block |
||
636 | 638 | * @param int $row Zero indexed row |
637 | 639 | * @param int $col Zero indexed column |
638 | 640 | * @param float $num The number to write |
639 | - * @param mixed $xfIndex The optional XF format |
|
641 | + * @param integer $xfIndex The optional XF format |
|
640 | 642 | * |
641 | 643 | * @return int |
642 | 644 | */ |
@@ -745,7 +747,7 @@ discard block |
||
745 | 747 | * @param int $row Zero indexed row |
746 | 748 | * @param int $col Zero indexed column |
747 | 749 | * @param string $str The string to write |
748 | - * @param mixed $xfIndex The XF format index for the cell |
|
750 | + * @param integer $xfIndex The XF format index for the cell |
|
749 | 751 | * |
750 | 752 | * @return int |
751 | 753 | */ |
@@ -812,7 +814,7 @@ discard block |
||
812 | 814 | * |
813 | 815 | * @param int $row Zero indexed row |
814 | 816 | * @param int $col Zero indexed column |
815 | - * @param mixed $xfIndex The XF format index |
|
817 | + * @param integer $xfIndex The XF format index |
|
816 | 818 | */ |
817 | 819 | public function writeBlank($row, $col, $xfIndex) |
818 | 820 | { |
@@ -859,7 +861,7 @@ discard block |
||
859 | 861 | * @param int $row Zero indexed row |
860 | 862 | * @param int $col Zero indexed column |
861 | 863 | * @param string $formula The formula text string |
862 | - * @param mixed $xfIndex The XF format index |
|
864 | + * @param integer $xfIndex The XF format index |
|
863 | 865 | * @param mixed $calculatedValue Calculated value |
864 | 866 | * |
865 | 867 | * @return int |
@@ -2339,8 +2341,8 @@ discard block |
||
2339 | 2341 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2340 | 2342 | * @param int $x the horizontal position (offset) of the image inside the cell |
2341 | 2343 | * @param int $y the vertical position (offset) of the image inside the cell |
2342 | - * @param float $scale_x The horizontal scale |
|
2343 | - * @param float $scale_y The vertical scale |
|
2344 | + * @param integer $scale_x The horizontal scale |
|
2345 | + * @param integer $scale_y The vertical scale |
|
2344 | 2346 | */ |
2345 | 2347 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2346 | 2348 | { |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | /** |
533 | 533 | * Get cell style. |
534 | 534 | * |
535 | - * @return Style |
|
535 | + * @return Style\Style |
|
536 | 536 | */ |
537 | 537 | public function getStyle() |
538 | 538 | { |
@@ -947,7 +947,7 @@ discard block |
||
947 | 947 | * |
948 | 948 | * [ 'A1:A3' => 'x', 'A4' => 'y' ] |
949 | 949 | * |
950 | - * @param array $pCoordCollection associative array mapping coordinates to values |
|
950 | + * @param DataValidation[] $pCoordCollection associative array mapping coordinates to values |
|
951 | 951 | * |
952 | 952 | * @return array associative array mapping coordinate ranges to valuea |
953 | 953 | */ |
@@ -76,6 +76,9 @@ discard block |
||
76 | 76 | $loaded = true; |
77 | 77 | } |
78 | 78 | |
79 | + /** |
|
80 | + * @param string $markerID |
|
81 | + */ |
|
79 | 82 | private function formatPointMarker($seriesPlot, $markerID) |
80 | 83 | { |
81 | 84 | $plotMarkKeys = array_keys(self::$markSet); |
@@ -103,6 +106,9 @@ discard block |
||
103 | 106 | return $seriesPlot; |
104 | 107 | } |
105 | 108 | |
109 | + /** |
|
110 | + * @param integer $labelCount |
|
111 | + */ |
|
106 | 112 | private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') |
107 | 113 | { |
108 | 114 | $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode(); |
@@ -132,6 +138,9 @@ discard block |
||
132 | 138 | return $datasetLabels; |
133 | 139 | } |
134 | 140 | |
141 | + /** |
|
142 | + * @param integer $seriesCount |
|
143 | + */ |
|
135 | 144 | private function percentageSumCalculation($groupID, $seriesCount) |
136 | 145 | { |
137 | 146 | // Adjust our values to a percentage value across all series in the group |
@@ -162,6 +171,9 @@ discard block |
||
162 | 171 | return $dataValues; |
163 | 172 | } |
164 | 173 | |
174 | + /** |
|
175 | + * @param \PhpOffice\PhpSpreadsheet\Chart\Title $captionElement |
|
176 | + */ |
|
165 | 177 | private function getCaption($captionElement) |
166 | 178 | { |
167 | 179 | // Read any caption |
@@ -271,6 +283,9 @@ discard block |
||
271 | 283 | $this->renderTitle(); |
272 | 284 | } |
273 | 285 | |
286 | + /** |
|
287 | + * @param integer $groupID |
|
288 | + */ |
|
274 | 289 | private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') |
275 | 290 | { |
276 | 291 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -334,6 +349,9 @@ discard block |
||
334 | 349 | $this->graph->Add($groupPlot); |
335 | 350 | } |
336 | 351 | |
352 | + /** |
|
353 | + * @param integer $groupID |
|
354 | + */ |
|
337 | 355 | private function renderPlotBar($groupID, $dimensions = '2d') |
338 | 356 | { |
339 | 357 | $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection(); |
@@ -418,6 +436,10 @@ discard block |
||
418 | 436 | $this->graph->Add($groupPlot); |
419 | 437 | } |
420 | 438 | |
439 | + /** |
|
440 | + * @param integer $groupID |
|
441 | + * @param boolean $bubble |
|
442 | + */ |
|
421 | 443 | private function renderPlotScatter($groupID, $bubble) |
422 | 444 | { |
423 | 445 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -463,6 +485,9 @@ discard block |
||
463 | 485 | } |
464 | 486 | } |
465 | 487 | |
488 | + /** |
|
489 | + * @param integer $groupID |
|
490 | + */ |
|
466 | 491 | private function renderPlotRadar($groupID) |
467 | 492 | { |
468 | 493 | $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -501,6 +526,9 @@ discard block |
||
501 | 526 | } |
502 | 527 | } |
503 | 528 | |
529 | + /** |
|
530 | + * @param integer $groupID |
|
531 | + */ |
|
504 | 532 | private function renderPlotContour($groupID) |
505 | 533 | { |
506 | 534 | $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -521,6 +549,9 @@ discard block |
||
521 | 549 | $this->graph->Add($seriesPlot); |
522 | 550 | } |
523 | 551 | |
552 | + /** |
|
553 | + * @param integer $groupID |
|
554 | + */ |
|
524 | 555 | private function renderPlotStock($groupID) |
525 | 556 | { |
526 | 557 | $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); |
@@ -560,6 +591,9 @@ discard block |
||
560 | 591 | $this->graph->Add($seriesPlot); |
561 | 592 | } |
562 | 593 | |
594 | + /** |
|
595 | + * @param integer $groupCount |
|
596 | + */ |
|
563 | 597 | private function renderAreaChart($groupCount, $dimensions = '2d') |
564 | 598 | { |
565 | 599 | $this->renderCartesianPlotArea(); |
@@ -569,6 +603,9 @@ discard block |
||
569 | 603 | } |
570 | 604 | } |
571 | 605 | |
606 | + /** |
|
607 | + * @param integer $groupCount |
|
608 | + */ |
|
572 | 609 | private function renderLineChart($groupCount, $dimensions = '2d') |
573 | 610 | { |
574 | 611 | $this->renderCartesianPlotArea(); |
@@ -578,6 +615,9 @@ discard block |
||
578 | 615 | } |
579 | 616 | } |
580 | 617 | |
618 | + /** |
|
619 | + * @param integer $groupCount |
|
620 | + */ |
|
581 | 621 | private function renderBarChart($groupCount, $dimensions = '2d') |
582 | 622 | { |
583 | 623 | $this->renderCartesianPlotArea(); |
@@ -587,6 +627,9 @@ discard block |
||
587 | 627 | } |
588 | 628 | } |
589 | 629 | |
630 | + /** |
|
631 | + * @param integer $groupCount |
|
632 | + */ |
|
590 | 633 | private function renderScatterChart($groupCount) |
591 | 634 | { |
592 | 635 | $this->renderCartesianPlotArea('linlin'); |
@@ -596,6 +639,9 @@ discard block |
||
596 | 639 | } |
597 | 640 | } |
598 | 641 | |
642 | + /** |
|
643 | + * @param integer $groupCount |
|
644 | + */ |
|
599 | 645 | private function renderBubbleChart($groupCount) |
600 | 646 | { |
601 | 647 | $this->renderCartesianPlotArea('linlin'); |
@@ -605,6 +651,9 @@ discard block |
||
605 | 651 | } |
606 | 652 | } |
607 | 653 | |
654 | + /** |
|
655 | + * @param integer $groupCount |
|
656 | + */ |
|
608 | 657 | private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false) |
609 | 658 | { |
610 | 659 | $this->renderPiePlotArea(); |
@@ -676,6 +725,9 @@ discard block |
||
676 | 725 | } |
677 | 726 | } |
678 | 727 | |
728 | + /** |
|
729 | + * @param integer $groupCount |
|
730 | + */ |
|
679 | 731 | private function renderRadarChart($groupCount) |
680 | 732 | { |
681 | 733 | $this->renderRadarPlotArea(); |
@@ -685,6 +737,9 @@ discard block |
||
685 | 737 | } |
686 | 738 | } |
687 | 739 | |
740 | + /** |
|
741 | + * @param integer $groupCount |
|
742 | + */ |
|
688 | 743 | private function renderStockChart($groupCount) |
689 | 744 | { |
690 | 745 | $this->renderCartesianPlotArea('intint'); |
@@ -694,6 +749,10 @@ discard block |
||
694 | 749 | } |
695 | 750 | } |
696 | 751 | |
752 | + /** |
|
753 | + * @param integer $groupCount |
|
754 | + * @param string|null $dimensions |
|
755 | + */ |
|
697 | 756 | private function renderContourChart($groupCount, $dimensions) |
698 | 757 | { |
699 | 758 | $this->renderCartesianPlotArea('intint'); |
@@ -703,6 +762,10 @@ discard block |
||
703 | 762 | } |
704 | 763 | } |
705 | 764 | |
765 | + /** |
|
766 | + * @param integer $groupCount |
|
767 | + * @param string $outputDestination |
|
768 | + */ |
|
706 | 769 | private function renderCombinationChart($groupCount, $dimensions, $outputDestination) |
707 | 770 | { |
708 | 771 | $this->renderCartesianPlotArea(); |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | * |
577 | 577 | * @throws Exception |
578 | 578 | * |
579 | - * @return Chart|false |
|
579 | + * @return Chart |
|
580 | 580 | */ |
581 | 581 | public function getChartByIndex($index) |
582 | 582 | { |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | * @param string $column Return the highest data row for the specified column, |
1088 | 1088 | * or the highest data row of any column if no column letter is passed |
1089 | 1089 | * |
1090 | - * @return string Highest row number that contains data |
|
1090 | + * @return integer Highest row number that contains data |
|
1091 | 1091 | */ |
1092 | 1092 | public function getHighestDataRow($column = null) |
1093 | 1093 | { |
@@ -1139,7 +1139,7 @@ discard block |
||
1139 | 1139 | * Set a cell value. |
1140 | 1140 | * |
1141 | 1141 | * @param string $pCoordinate Coordinate of the cell, eg: 'A1' |
1142 | - * @param mixed $pValue Value of the cell |
|
1142 | + * @param string $pValue Value of the cell |
|
1143 | 1143 | * @param string $pDataType Explicit data type, see DataType::TYPE_* |
1144 | 1144 | * |
1145 | 1145 | * @return Worksheet |
@@ -1343,7 +1343,7 @@ discard block |
||
1343 | 1343 | * Get row dimension at a specific row. |
1344 | 1344 | * |
1345 | 1345 | * @param int $pRow Numeric index of the row |
1346 | - * @param mixed $create |
|
1346 | + * @param boolean $create |
|
1347 | 1347 | * |
1348 | 1348 | * @return RowDimension |
1349 | 1349 | */ |
@@ -1369,7 +1369,7 @@ discard block |
||
1369 | 1369 | * Get column dimension at a specific column. |
1370 | 1370 | * |
1371 | 1371 | * @param string $pColumn String index of the column eg: 'A' |
1372 | - * @param mixed $create |
|
1372 | + * @param boolean $create |
|
1373 | 1373 | * |
1374 | 1374 | * @return ColumnDimension |
1375 | 1375 | */ |
@@ -1910,7 +1910,7 @@ discard block |
||
1910 | 1910 | /** |
1911 | 1911 | * Set AutoFilter. |
1912 | 1912 | * |
1913 | - * @param string|Worksheet\AutoFilter $pValue |
|
1913 | + * @param string $pValue |
|
1914 | 1914 | * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility |
1915 | 1915 | * |
1916 | 1916 | * @throws Exception |
@@ -1164,7 +1164,7 @@ |
||
1164 | 1164 | * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet |
1165 | 1165 | * @param array $pValues Array containing cells in a row |
1166 | 1166 | * @param int $pRow Row number (0-based) |
1167 | - * @param mixed $cellType eg: 'td' |
|
1167 | + * @param string $cellType eg: 'td' |
|
1168 | 1168 | * |
1169 | 1169 | * @throws WriterException |
1170 | 1170 | * |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace PhpOffice\PhpSpreadsheet\Writer\Ods; |
4 | 4 | |
5 | 5 | use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; |
6 | -use PhpOffice\PhpSpreadsheet\Spreadsheet; |
|
7 | 6 | |
8 | 7 | class MetaInf extends WriterPart |
9 | 8 | { |
@@ -224,8 +224,8 @@ discard block |
||
224 | 224 | * |
225 | 225 | * @param Style |
226 | 226 | * @param bool Is it a style XF? |
227 | - * @param mixed $style |
|
228 | - * @param mixed $isStyleXf |
|
227 | + * @param Style $style |
|
228 | + * @param boolean $isStyleXf |
|
229 | 229 | * |
230 | 230 | * @return int Index to XF record |
231 | 231 | */ |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | * |
684 | 684 | * @param string $name The name in UTF-8 |
685 | 685 | * @param string $formulaData The binary formula data |
686 | - * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
686 | + * @param integer $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
687 | 687 | * @param bool $isBuiltIn Built-in name? |
688 | 688 | * |
689 | 689 | * @return string Complete binary record data |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * Write Chart Plot Area. |
205 | 205 | * |
206 | 206 | * @param XMLWriter $objWriter XML Writer |
207 | - * @param Worksheet $pSheet |
|
207 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pSheet |
|
208 | 208 | * @param PlotArea $plotArea |
209 | 209 | * @param Title $xAxisLabel |
210 | 210 | * @param Title $yAxisLabel |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | * @param string $id1 |
395 | 395 | * @param string $id2 |
396 | 396 | * @param bool $isMultiLevelSeries |
397 | - * @param mixed $yAxis |
|
397 | + * @param null|Axis $yAxis |
|
398 | 398 | * |
399 | 399 | * @throws WriterException |
400 | 400 | */ |
@@ -515,9 +515,9 @@ discard block |
||
515 | 515 | * @param string $id1 |
516 | 516 | * @param string $id2 |
517 | 517 | * @param bool $isMultiLevelSeries |
518 | - * @param mixed $xAxis |
|
519 | - * @param mixed $majorGridlines |
|
520 | - * @param mixed $minorGridlines |
|
518 | + * @param null|Axis $xAxis |
|
519 | + * @param null|GridLines $majorGridlines |
|
520 | + * @param null|GridLines $minorGridlines |
|
521 | 521 | * |
522 | 522 | * @throws WriterException |
523 | 523 | */ |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | /** |
12 | 12 | * Write comments to XML format. |
13 | 13 | * |
14 | - * @param Worksheet $pWorksheet |
|
14 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet |
|
15 | 15 | * |
16 | 16 | * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception |
17 | 17 | * |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | /** |
95 | 95 | * Write VML comments to XML format. |
96 | 96 | * |
97 | - * @param Worksheet $pWorksheet |
|
97 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet |
|
98 | 98 | * |
99 | 99 | * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception |
100 | 100 | * |