@@ -467,6 +467,7 @@ discard block |
||
467 | 467 | * |
468 | 468 | * @param string $dynamicRuleType |
469 | 469 | * @param AutoFilter\Column &$filterColumn |
470 | + * @param AutoFilter\Column $filterColumn |
|
470 | 471 | * @return mixed[] |
471 | 472 | */ |
472 | 473 | private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn) |
@@ -571,6 +572,11 @@ discard block |
||
571 | 572 | return array('method' => 'filterTestInCustomDataSet', 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND)); |
572 | 573 | } |
573 | 574 | |
575 | + /** |
|
576 | + * @param integer $columnID |
|
577 | + * @param integer $startRow |
|
578 | + * @param string $ruleType |
|
579 | + */ |
|
574 | 580 | private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue) |
575 | 581 | { |
576 | 582 | $range = $columnID.$startRow.':'.$columnID.$endRow; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | /** |
61 | 61 | * Create a new Dimension |
62 | 62 | * |
63 | - * @param int $pIndex Numeric row index |
|
63 | + * @param integer $initialValue |
|
64 | 64 | */ |
65 | 65 | public function __construct($initialValue = null) |
66 | 66 | { |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | * Set first page number |
803 | 803 | * |
804 | 804 | * @param int $value |
805 | - * @return HeaderFooter |
|
805 | + * @return PageSetup |
|
806 | 806 | */ |
807 | 807 | public function setFirstPageNumber($value = null) |
808 | 808 | { |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | /** |
814 | 814 | * Reset first page number |
815 | 815 | * |
816 | - * @return HeaderFooter |
|
816 | + * @return PageSetup |
|
817 | 817 | */ |
818 | 818 | public function resetFirstPageNumber() |
819 | 819 | { |
@@ -67,6 +67,7 @@ |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Process the object to be written |
70 | + * @return string |
|
70 | 71 | */ |
71 | 72 | public function close() |
72 | 73 | { |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | * |
505 | 505 | * @access private |
506 | 506 | * @param mixed $token The token to convert. |
507 | - * @return mixed the converted token on success |
|
507 | + * @return string the converted token on success |
|
508 | 508 | */ |
509 | 509 | private function convert($token) |
510 | 510 | { |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | * |
575 | 575 | * @access private |
576 | 576 | * @param string $string A string for conversion to its ptg value. |
577 | - * @return mixed the converted token on success |
|
577 | + * @return string the converted token on success |
|
578 | 578 | */ |
579 | 579 | private function convertString($string) |
580 | 580 | { |
@@ -654,7 +654,7 @@ discard block |
||
654 | 654 | * |
655 | 655 | * @access private |
656 | 656 | * @param string $token An Excel range in the Sheet1!A1:A2 format. |
657 | - * @return mixed The packed ptgArea3d token on success. |
|
657 | + * @return string The packed ptgArea3d token on success. |
|
658 | 658 | */ |
659 | 659 | private function convertRange3d($token) |
660 | 660 | { |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | * |
727 | 727 | * @access private |
728 | 728 | * @param string $cell An Excel cell reference |
729 | - * @return mixed The packed ptgRef3d token on success. |
|
729 | + * @return string The packed ptgRef3d token on success. |
|
730 | 730 | */ |
731 | 731 | private function convertRef3d($cell) |
732 | 732 | { |
@@ -834,7 +834,7 @@ discard block |
||
834 | 834 | * |
835 | 835 | * @access private |
836 | 836 | * @param string $ext_ref The name of the external reference |
837 | - * @return mixed The reference index in packed() format on success |
|
837 | + * @return string The reference index in packed() format on success |
|
838 | 838 | */ |
839 | 839 | private function getRefIndex($ext_ref) |
840 | 840 | { |
@@ -925,7 +925,7 @@ discard block |
||
925 | 925 | * |
926 | 926 | * @access private |
927 | 927 | * @param string $cell The Excel cell reference to be packed |
928 | - * @return array Array containing the row and column in packed() format |
|
928 | + * @return string[] Array containing the row and column in packed() format |
|
929 | 929 | */ |
930 | 930 | private function cellToPackedRowcol($cell) |
931 | 931 | { |
@@ -954,7 +954,7 @@ discard block |
||
954 | 954 | * |
955 | 955 | * @access private |
956 | 956 | * @param string $range The Excel range to be packed |
957 | - * @return array Array containing (row1,col1,row2,col2) in packed() format |
|
957 | + * @return string[] Array containing (row1,col1,row2,col2) in packed() format |
|
958 | 958 | */ |
959 | 959 | private function rangeToPackedRange($range) |
960 | 960 | { |
@@ -1075,7 +1075,7 @@ discard block |
||
1075 | 1075 | * Checks if it's a valid token. |
1076 | 1076 | * |
1077 | 1077 | * @access private |
1078 | - * @param mixed $token The token to check. |
|
1078 | + * @param string $token The token to check. |
|
1079 | 1079 | * @return mixed The checked token or false on failure |
1080 | 1080 | */ |
1081 | 1081 | private function match($token) |
@@ -1157,7 +1157,7 @@ discard block |
||
1157 | 1157 | * @access public |
1158 | 1158 | * @param string $formula The formula to parse, without the initial equal |
1159 | 1159 | * sign (=). |
1160 | - * @return mixed true on success |
|
1160 | + * @return boolean true on success |
|
1161 | 1161 | */ |
1162 | 1162 | public function parse($formula) |
1163 | 1163 | { |
@@ -200,10 +200,12 @@ discard block |
||
200 | 200 | * @param int &$str_unique Total number of unique strings |
201 | 201 | * @param array &$str_table String Table |
202 | 202 | * @param array &$colors Colour Table |
203 | - * @param mixed $parser The formula parser created for the Workbook |
|
203 | + * @param Parser $parser The formula parser created for the Workbook |
|
204 | 204 | * @param boolean $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
205 | 205 | * @param string $phpSheet The worksheet to write |
206 | 206 | * @param \PHPExcel\Worksheet $phpSheet |
207 | + * @param integer $str_total |
|
208 | + * @param integer $str_unique |
|
207 | 209 | */ |
208 | 210 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
209 | 211 | { |
@@ -614,7 +616,7 @@ discard block |
||
614 | 616 | * @param integer $row Zero indexed row |
615 | 617 | * @param integer $col Zero indexed column |
616 | 618 | * @param float $num The number to write |
617 | - * @param mixed $xfIndex The optional XF format |
|
619 | + * @param integer $xfIndex The optional XF format |
|
618 | 620 | * @return integer |
619 | 621 | */ |
620 | 622 | private function writeNumber($row, $col, $num, $xfIndex) |
@@ -652,7 +654,7 @@ discard block |
||
652 | 654 | * @param int $row Row index (0-based) |
653 | 655 | * @param int $col Column index (0-based) |
654 | 656 | * @param string $str The string |
655 | - * @param mixed $xfIndex The XF format index for the cell |
|
657 | + * @param integer $xfIndex The XF format index for the cell |
|
656 | 658 | * @param array $arrcRun Index to Font record and characters beginning |
657 | 659 | */ |
658 | 660 | private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun) |
@@ -720,7 +722,7 @@ discard block |
||
720 | 722 | * @param integer $row Zero indexed row |
721 | 723 | * @param integer $col Zero indexed column |
722 | 724 | * @param string $str The string to write |
723 | - * @param mixed $xfIndex The XF format index for the cell |
|
725 | + * @param integer $xfIndex The XF format index for the cell |
|
724 | 726 | * @return integer |
725 | 727 | */ |
726 | 728 | private function writeLabelSst($row, $col, $str, $xfIndex) |
@@ -785,7 +787,7 @@ discard block |
||
785 | 787 | * |
786 | 788 | * @param integer $row Zero indexed row |
787 | 789 | * @param integer $col Zero indexed column |
788 | - * @param mixed $xfIndex The XF format index |
|
790 | + * @param integer $xfIndex The XF format index |
|
789 | 791 | */ |
790 | 792 | public function writeBlank($row, $col, $xfIndex) |
791 | 793 | { |
@@ -830,7 +832,7 @@ discard block |
||
830 | 832 | * @param integer $row Zero indexed row |
831 | 833 | * @param integer $col Zero indexed column |
832 | 834 | * @param string $formula The formula text string |
833 | - * @param mixed $xfIndex The XF format index |
|
835 | + * @param integer $xfIndex The XF format index |
|
834 | 836 | * @param mixed $calculatedValue Calculated value |
835 | 837 | * @return integer |
836 | 838 | */ |
@@ -2307,8 +2309,8 @@ discard block |
||
2307 | 2309 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2308 | 2310 | * @param integer $x The horizontal position (offset) of the image inside the cell. |
2309 | 2311 | * @param integer $y The vertical position (offset) of the image inside the cell. |
2310 | - * @param float $scale_x The horizontal scale |
|
2311 | - * @param float $scale_y The vertical scale |
|
2312 | + * @param integer $scale_x The horizontal scale |
|
2313 | + * @param integer $scale_y The vertical scale |
|
2312 | 2314 | */ |
2313 | 2315 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2314 | 2316 | { |
@@ -62,6 +62,9 @@ discard block |
||
62 | 62 | private static $plotMark = 0; |
63 | 63 | |
64 | 64 | |
65 | + /** |
|
66 | + * @param string $markerID |
|
67 | + */ |
|
65 | 68 | private function formatPointMarker($seriesPlot, $markerID) |
66 | 69 | { |
67 | 70 | $plotMarkKeys = array_keys(self::$markSet); |
@@ -90,6 +93,9 @@ discard block |
||
90 | 93 | } |
91 | 94 | |
92 | 95 | |
96 | + /** |
|
97 | + * @param integer $labelCount |
|
98 | + */ |
|
93 | 99 | private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') |
94 | 100 | { |
95 | 101 | $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode(); |
@@ -120,6 +126,9 @@ discard block |
||
120 | 126 | } |
121 | 127 | |
122 | 128 | |
129 | + /** |
|
130 | + * @param integer $seriesCount |
|
131 | + */ |
|
123 | 132 | private function percentageSumCalculation($groupID, $seriesCount) |
124 | 133 | { |
125 | 134 | // Adjust our values to a percentage value across all series in the group |
@@ -152,6 +161,9 @@ discard block |
||
152 | 161 | } |
153 | 162 | |
154 | 163 | |
164 | + /** |
|
165 | + * @param \PhpSpreadsheet\Chart\Title $captionElement |
|
166 | + */ |
|
155 | 167 | private function getCaption($captionElement) |
156 | 168 | { |
157 | 169 | // Read any caption |
@@ -264,6 +276,9 @@ discard block |
||
264 | 276 | } |
265 | 277 | |
266 | 278 | |
279 | + /** |
|
280 | + * @param integer $groupID |
|
281 | + */ |
|
267 | 282 | private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') |
268 | 283 | { |
269 | 284 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -328,6 +343,9 @@ discard block |
||
328 | 343 | } |
329 | 344 | |
330 | 345 | |
346 | + /** |
|
347 | + * @param integer $groupID |
|
348 | + */ |
|
331 | 349 | private function renderPlotBar($groupID, $dimensions = '2d') |
332 | 350 | { |
333 | 351 | $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection(); |
@@ -414,6 +432,10 @@ discard block |
||
414 | 432 | } |
415 | 433 | |
416 | 434 | |
435 | + /** |
|
436 | + * @param integer $groupID |
|
437 | + * @param boolean $bubble |
|
438 | + */ |
|
417 | 439 | private function renderPlotScatter($groupID, $bubble) |
418 | 440 | { |
419 | 441 | $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); |
@@ -460,6 +482,9 @@ discard block |
||
460 | 482 | } |
461 | 483 | |
462 | 484 | |
485 | + /** |
|
486 | + * @param integer $groupID |
|
487 | + */ |
|
463 | 488 | private function renderPlotRadar($groupID) |
464 | 489 | { |
465 | 490 | $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -499,6 +524,9 @@ discard block |
||
499 | 524 | } |
500 | 525 | |
501 | 526 | |
527 | + /** |
|
528 | + * @param integer $groupID |
|
529 | + */ |
|
502 | 530 | private function renderPlotContour($groupID) |
503 | 531 | { |
504 | 532 | $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); |
@@ -520,6 +548,9 @@ discard block |
||
520 | 548 | } |
521 | 549 | |
522 | 550 | |
551 | + /** |
|
552 | + * @param integer $groupID |
|
553 | + */ |
|
523 | 554 | private function renderPlotStock($groupID) |
524 | 555 | { |
525 | 556 | $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); |
@@ -560,6 +591,9 @@ discard block |
||
560 | 591 | } |
561 | 592 | |
562 | 593 | |
594 | + /** |
|
595 | + * @param integer $groupCount |
|
596 | + */ |
|
563 | 597 | private function renderAreaChart($groupCount, $dimensions = '2d') |
564 | 598 | { |
565 | 599 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php'); |
@@ -572,6 +606,9 @@ discard block |
||
572 | 606 | } |
573 | 607 | |
574 | 608 | |
609 | + /** |
|
610 | + * @param integer $groupCount |
|
611 | + */ |
|
575 | 612 | private function renderLineChart($groupCount, $dimensions = '2d') |
576 | 613 | { |
577 | 614 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php'); |
@@ -584,6 +621,9 @@ discard block |
||
584 | 621 | } |
585 | 622 | |
586 | 623 | |
624 | + /** |
|
625 | + * @param integer $groupCount |
|
626 | + */ |
|
587 | 627 | private function renderBarChart($groupCount, $dimensions = '2d') |
588 | 628 | { |
589 | 629 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php'); |
@@ -596,6 +636,9 @@ discard block |
||
596 | 636 | } |
597 | 637 | |
598 | 638 | |
639 | + /** |
|
640 | + * @param integer $groupCount |
|
641 | + */ |
|
599 | 642 | private function renderScatterChart($groupCount) |
600 | 643 | { |
601 | 644 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php'); |
@@ -610,6 +653,9 @@ discard block |
||
610 | 653 | } |
611 | 654 | |
612 | 655 | |
656 | + /** |
|
657 | + * @param integer $groupCount |
|
658 | + */ |
|
613 | 659 | private function renderBubbleChart($groupCount) |
614 | 660 | { |
615 | 661 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php'); |
@@ -622,6 +668,9 @@ discard block |
||
622 | 668 | } |
623 | 669 | |
624 | 670 | |
671 | + /** |
|
672 | + * @param integer $groupCount |
|
673 | + */ |
|
625 | 674 | private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false) |
626 | 675 | { |
627 | 676 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie.php'); |
@@ -699,6 +748,9 @@ discard block |
||
699 | 748 | } |
700 | 749 | |
701 | 750 | |
751 | + /** |
|
752 | + * @param integer $groupCount |
|
753 | + */ |
|
702 | 754 | private function renderRadarChart($groupCount) |
703 | 755 | { |
704 | 756 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_radar.php'); |
@@ -711,6 +763,9 @@ discard block |
||
711 | 763 | } |
712 | 764 | |
713 | 765 | |
766 | + /** |
|
767 | + * @param integer $groupCount |
|
768 | + */ |
|
714 | 769 | private function renderStockChart($groupCount) |
715 | 770 | { |
716 | 771 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_stock.php'); |
@@ -723,6 +778,10 @@ discard block |
||
723 | 778 | } |
724 | 779 | |
725 | 780 | |
781 | + /** |
|
782 | + * @param integer $groupCount |
|
783 | + * @param string|null $dimensions |
|
784 | + */ |
|
726 | 785 | private function renderContourChart($groupCount, $dimensions) |
727 | 786 | { |
728 | 787 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_contour.php'); |
@@ -735,6 +794,9 @@ discard block |
||
735 | 794 | } |
736 | 795 | |
737 | 796 | |
797 | + /** |
|
798 | + * @param integer $groupCount |
|
799 | + */ |
|
738 | 800 | private function renderCombinationChart($groupCount, $dimensions, $outputDestination) |
739 | 801 | { |
740 | 802 | require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php'); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | /** |
178 | 178 | * Get Created |
179 | 179 | * |
180 | - * @return datetime |
|
180 | + * @return integer|null |
|
181 | 181 | */ |
182 | 182 | public function getCreated() |
183 | 183 | { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | /** |
210 | 210 | * Get Modified |
211 | 211 | * |
212 | - * @return datetime |
|
212 | + * @return integer|null |
|
213 | 213 | */ |
214 | 214 | public function getModified() |
215 | 215 | { |
@@ -285,6 +285,11 @@ discard block |
||
285 | 285 | return isset($c->v) ? (string) $c->v : null; |
286 | 286 | } |
287 | 287 | |
288 | + /** |
|
289 | + * @param string $r |
|
290 | + * @param string $cellDataType |
|
291 | + * @param string $castBaseType |
|
292 | + */ |
|
288 | 293 | private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType) |
289 | 294 | { |
290 | 295 | // echo 'Formula', PHP_EOL; |
@@ -327,6 +332,9 @@ discard block |
||
327 | 332 | } |
328 | 333 | |
329 | 334 | |
335 | + /** |
|
336 | + * @return string|null |
|
337 | + */ |
|
330 | 338 | private function getFromZipArchive($archive, $fileName = '') |
331 | 339 | { |
332 | 340 | // Root-relative paths |
@@ -356,7 +364,7 @@ discard block |
||
356 | 364 | * Loads Spreadsheet from file |
357 | 365 | * |
358 | 366 | * @param string $pFilename |
359 | - * @return Spreadsheet |
|
367 | + * @return \PhpSpreadsheet\Spreadsheet |
|
360 | 368 | * @throws Exception |
361 | 369 | */ |
362 | 370 | public function load($pFilename) |
@@ -1921,6 +1929,9 @@ discard block |
||
1921 | 1929 | return 'FF000000'; |
1922 | 1930 | } |
1923 | 1931 | |
1932 | + /** |
|
1933 | + * @param \PhpSpreadsheet\Style $docStyle |
|
1934 | + */ |
|
1924 | 1935 | private static function readStyle($docStyle, $style) |
1925 | 1936 | { |
1926 | 1937 | // format code |
@@ -2120,6 +2131,9 @@ discard block |
||
2120 | 2131 | return $value; |
2121 | 2132 | } |
2122 | 2133 | |
2134 | + /** |
|
2135 | + * @param \PhpSpreadsheet\Spreadsheet $excel |
|
2136 | + */ |
|
2123 | 2137 | private function readRibbon($excel, $customUITarget, $zip) |
2124 | 2138 | { |
2125 | 2139 | $baseDir = dirname($customUITarget); |
@@ -2172,6 +2186,9 @@ discard block |
||
2172 | 2186 | return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add"); |
2173 | 2187 | } |
2174 | 2188 | |
2189 | + /** |
|
2190 | + * @param string $style |
|
2191 | + */ |
|
2175 | 2192 | private static function toCSSArray($style) |
2176 | 2193 | { |
2177 | 2194 | $style = str_replace(array("\r","\n"), "", $style); |