@@ -13,8 +13,8 @@ |
||
13 | 13 | ->disableOriginalConstructor() |
14 | 14 | ->getMock(); |
15 | 15 | $this->mockWorksheet->expects($this->any()) |
16 | - ->method('getHighestRow') |
|
17 | - ->will($this->returnValue(5)); |
|
16 | + ->method('getHighestRow') |
|
17 | + ->will($this->returnValue(5)); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 |
@@ -18,11 +18,11 @@ |
||
18 | 18 | ->getMock(); |
19 | 19 | |
20 | 20 | $this->mockWorksheet->expects($this->any()) |
21 | - ->method('getHighestColumn') |
|
22 | - ->will($this->returnValue('E')); |
|
21 | + ->method('getHighestColumn') |
|
22 | + ->will($this->returnValue('E')); |
|
23 | 23 | $this->mockWorksheet->expects($this->any()) |
24 | - ->method('current') |
|
25 | - ->will($this->returnValue($this->mockColumn)); |
|
24 | + ->method('current') |
|
25 | + ->will($this->returnValue($this->mockColumn)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 |
@@ -18,11 +18,11 @@ |
||
18 | 18 | ->getMock(); |
19 | 19 | |
20 | 20 | $this->mockWorksheet->expects($this->any()) |
21 | - ->method('getHighestRow') |
|
22 | - ->will($this->returnValue(5)); |
|
21 | + ->method('getHighestRow') |
|
22 | + ->will($this->returnValue(5)); |
|
23 | 23 | $this->mockWorksheet->expects($this->any()) |
24 | - ->method('getCellByColumnAndRow') |
|
25 | - ->will($this->returnValue($this->mockCell)); |
|
24 | + ->method('getCellByColumnAndRow') |
|
25 | + ->will($this->returnValue($this->mockCell)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 |
@@ -18,11 +18,11 @@ |
||
18 | 18 | ->getMock(); |
19 | 19 | |
20 | 20 | $this->mockWorksheet->expects($this->any()) |
21 | - ->method('getHighestRow') |
|
22 | - ->will($this->returnValue(5)); |
|
21 | + ->method('getHighestRow') |
|
22 | + ->will($this->returnValue(5)); |
|
23 | 23 | $this->mockWorksheet->expects($this->any()) |
24 | - ->method('current') |
|
25 | - ->will($this->returnValue($this->mockRow)); |
|
24 | + ->method('current') |
|
25 | + ->will($this->returnValue($this->mockRow)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 |
@@ -18,11 +18,11 @@ |
||
18 | 18 | ->getMock(); |
19 | 19 | |
20 | 20 | $this->mockWorksheet->expects($this->any()) |
21 | - ->method('getHighestColumn') |
|
22 | - ->will($this->returnValue('E')); |
|
21 | + ->method('getHighestColumn') |
|
22 | + ->will($this->returnValue('E')); |
|
23 | 23 | $this->mockWorksheet->expects($this->any()) |
24 | - ->method('getCellByColumnAndRow') |
|
25 | - ->will($this->returnValue($this->mockCell)); |
|
24 | + ->method('getCellByColumnAndRow') |
|
25 | + ->will($this->returnValue($this->mockCell)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 |
@@ -13,8 +13,8 @@ |
||
13 | 13 | ->disableOriginalConstructor() |
14 | 14 | ->getMock(); |
15 | 15 | $this->mockWorksheet->expects($this->any()) |
16 | - ->method('getHighestColumn') |
|
17 | - ->will($this->returnValue('E')); |
|
16 | + ->method('getHighestColumn') |
|
17 | + ->will($this->returnValue('E')); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 |
@@ -24,8 +24,8 @@ |
||
24 | 24 | ->getMock(); |
25 | 25 | // Configure the stub. |
26 | 26 | $this->cellStub->expects($this->any()) |
27 | - ->method('setValueExplicit') |
|
28 | - ->will($this->returnValue(true)); |
|
27 | + ->method('setValueExplicit') |
|
28 | + ->will($this->returnValue(true)); |
|
29 | 29 | |
30 | 30 | } |
31 | 31 |
@@ -45,22 +45,22 @@ |
||
45 | 45 | ->disableOriginalConstructor() |
46 | 46 | ->getMock(); |
47 | 47 | $cache->expects($this->any()) |
48 | - ->method('getParent') |
|
49 | - ->will($this->returnValue($sheet)); |
|
48 | + ->method('getParent') |
|
49 | + ->will($this->returnValue($sheet)); |
|
50 | 50 | |
51 | 51 | $sheet->expects($this->once()) |
52 | - ->method('getStyle') |
|
53 | - ->will($this->returnSelf()); |
|
52 | + ->method('getStyle') |
|
53 | + ->will($this->returnSelf()); |
|
54 | 54 | $sheet->expects($this->once()) |
55 | - ->method('getNumberFormat') |
|
56 | - ->will($this->returnSelf()); |
|
55 | + ->method('getNumberFormat') |
|
56 | + ->will($this->returnSelf()); |
|
57 | 57 | $sheet->expects($this->once()) |
58 | - ->method('setFormatCode') |
|
59 | - ->with($format) |
|
60 | - ->will($this->returnSelf()); |
|
58 | + ->method('setFormatCode') |
|
59 | + ->with($format) |
|
60 | + ->will($this->returnSelf()); |
|
61 | 61 | $sheet->expects($this->any()) |
62 | - ->method('getCellCacheController') |
|
63 | - ->will($this->returnValue($cache)); |
|
62 | + ->method('getCellCacheController') |
|
63 | + ->will($this->returnValue($cache)); |
|
64 | 64 | |
65 | 65 | \PHPExcel\Shared\StringHelper::setCurrencyCode($currencyCode); |
66 | 66 | \PHPExcel\Shared\StringHelper::setDecimalSeparator($decimalSeparator); |
@@ -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'); |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | private static $height = 480; |
34 | 34 | |
35 | 35 | private static $colourSet = [ |
36 | - 'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1', |
|
37 | - 'darkmagenta', 'coral', 'dodgerblue3', 'eggplant', |
|
38 | - 'mediumblue', 'magenta', 'sandybrown', 'cyan', |
|
39 | - 'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen', |
|
36 | + 'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1', |
|
37 | + 'darkmagenta', 'coral', 'dodgerblue3', 'eggplant', |
|
38 | + 'mediumblue', 'magenta', 'sandybrown', 'cyan', |
|
39 | + 'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen', |
|
40 | 40 | 'goldenrod2', |
41 | 41 | ]; |
42 | 42 | |
@@ -178,21 +178,21 @@ discard block |
||
178 | 178 | $legendOverlay = $legend->getOverlay(); |
179 | 179 | switch ($legendPosition) { |
180 | 180 | case 'r': |
181 | - $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); // right |
|
181 | + $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); // right |
|
182 | 182 | $this->graph->legend->SetColumns(1); |
183 | 183 | break; |
184 | 184 | case 'l': |
185 | - $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); // left |
|
185 | + $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); // left |
|
186 | 186 | $this->graph->legend->SetColumns(1); |
187 | 187 | break; |
188 | 188 | case 't': |
189 | - $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top |
|
189 | + $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top |
|
190 | 190 | break; |
191 | 191 | case 'b': |
192 | - $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom |
|
192 | + $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom |
|
193 | 193 | break; |
194 | 194 | default: |
195 | - $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right |
|
195 | + $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right |
|
196 | 196 | $this->graph->legend->SetColumns(1); |
197 | 197 | break; |
198 | 198 | } |