@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * If a resource pointer to a stream created by fopen() is passed |
60 | 60 | * it will be used, but you have to close such stream by yourself. |
61 | 61 | * |
62 | - * @param resource|string $filename the name of the file or stream where to save the OLE container |
|
62 | + * @param string $filename the name of the file or stream where to save the OLE container |
|
63 | 63 | * |
64 | 64 | * @throws WriterException |
65 | 65 | * |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @param array $raList Reference to an array of PPS's |
126 | 126 | * |
127 | - * @return float[] The array of numbers |
|
127 | + * @return double[] The array of numbers |
|
128 | 128 | */ |
129 | 129 | public function _calcSize(&$raList) |
130 | 130 | { |
@@ -4,53 +4,53 @@ |
||
4 | 4 | |
5 | 5 | return [ |
6 | 6 | [ |
7 | - 19, // Result for Excel |
|
8 | - 19, // Result for OpenOffice |
|
7 | + 19, // Result for Excel |
|
8 | + 19, // Result for OpenOffice |
|
9 | 9 | 22269, |
10 | 10 | ], |
11 | 11 | [ |
12 | - 1, // Result for Excel |
|
13 | - 1, // Result for OpenOffice |
|
12 | + 1, // Result for Excel |
|
13 | + 1, // Result for OpenOffice |
|
14 | 14 | 30348, |
15 | 15 | ], |
16 | 16 | [ |
17 | - 10, // Result for Excel |
|
18 | - 10, // Result for OpenOffice |
|
17 | + 10, // Result for Excel |
|
18 | + 10, // Result for OpenOffice |
|
19 | 19 | 30843, |
20 | 20 | ], |
21 | 21 | [ |
22 | - 11, // Result for Excel |
|
23 | - 11, // Result for OpenOffice |
|
22 | + 11, // Result for Excel |
|
23 | + 11, // Result for OpenOffice |
|
24 | 24 | '11-Nov-1918', |
25 | 25 | ], |
26 | 26 | [ |
27 | - 28, // Result for Excel |
|
28 | - 28, // Result for OpenOffice |
|
27 | + 28, // Result for Excel |
|
28 | + 28, // Result for OpenOffice |
|
29 | 29 | '28-Feb-1904', |
30 | 30 | ], |
31 | 31 | [ |
32 | - '#VALUE!', // Result for Excel |
|
33 | - '#VALUE!', // Result for OpenOffice |
|
32 | + '#VALUE!', // Result for Excel |
|
33 | + '#VALUE!', // Result for OpenOffice |
|
34 | 34 | 'Invalid', |
35 | 35 | ], |
36 | 36 | [ |
37 | - '#NUM!', // Result for Excel |
|
38 | - 29, // Result for OpenOffice |
|
37 | + '#NUM!', // Result for Excel |
|
38 | + 29, // Result for OpenOffice |
|
39 | 39 | -1, |
40 | 40 | ], |
41 | 41 | [ |
42 | - 1, // Result for Excel |
|
43 | - 31, // Result for OpenOffice |
|
42 | + 1, // Result for Excel |
|
43 | + 31, // Result for OpenOffice |
|
44 | 44 | 1, |
45 | 45 | ], |
46 | 46 | [ |
47 | - 0, // Result for Excel |
|
48 | - 30, // Result for OpenOffice |
|
47 | + 0, // Result for Excel |
|
48 | + 30, // Result for OpenOffice |
|
49 | 49 | 0.5, |
50 | 50 | ], |
51 | 51 | [ |
52 | - 0, // Result for Excel |
|
53 | - 30, // Result for OpenOffice |
|
52 | + 0, // Result for Excel |
|
53 | + 30, // Result for OpenOffice |
|
54 | 54 | 0, |
55 | 55 | ], |
56 | 56 | ]; |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * |
16 | 16 | * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month |
17 | 17 | * |
18 | - * @param DateTime $testDate The date for testing |
|
18 | + * @param \DateTime $testDate The date for testing |
|
19 | 19 | * |
20 | 20 | * @return bool |
21 | 21 | */ |
@@ -24,6 +24,10 @@ discard block |
||
24 | 24 | return $testDate->format('d') == $testDate->format('t'); |
25 | 25 | } |
26 | 26 | |
27 | + /** |
|
28 | + * @param integer $frequency |
|
29 | + * @param boolean $next |
|
30 | + */ |
|
27 | 31 | private static function couponFirstPeriodDate($settlement, $maturity, $frequency, $next) |
28 | 32 | { |
29 | 33 | $months = 12 / $frequency; |
@@ -45,6 +49,9 @@ discard block |
||
45 | 49 | return Date::PHPToExcel($result); |
46 | 50 | } |
47 | 51 | |
52 | + /** |
|
53 | + * @param integer $frequency |
|
54 | + */ |
|
48 | 55 | private static function isValidFrequency($frequency) |
49 | 56 | { |
50 | 57 | if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) { |
@@ -126,7 +133,7 @@ discard block |
||
126 | 133 | * The security settlement date is the date after the issue date |
127 | 134 | * when the security is traded to the buyer. |
128 | 135 | * @param float $rate the security's annual coupon rate |
129 | - * @param float $par The security's par value. |
|
136 | + * @param integer $par The security's par value. |
|
130 | 137 | * If you omit par, ACCRINT uses $1,000. |
131 | 138 | * @param int $frequency the number of coupon payments per year. |
132 | 139 | * Valid frequency values are: |
@@ -199,8 +206,8 @@ discard block |
||
199 | 206 | * @param mixed $issue |
200 | 207 | * @param mixed $settlement |
201 | 208 | * @param mixed $rate |
202 | - * @param mixed $par |
|
203 | - * @param mixed $basis |
|
209 | + * @param integer $par |
|
210 | + * @param integer $basis |
|
204 | 211 | * |
205 | 212 | * @return float |
206 | 213 | */ |
@@ -266,7 +273,7 @@ discard block |
||
266 | 273 | * @param mixed $salvage |
267 | 274 | * @param mixed $period |
268 | 275 | * @param mixed $rate |
269 | - * @param mixed $basis |
|
276 | + * @param integer $basis |
|
270 | 277 | * |
271 | 278 | * @return float |
272 | 279 | */ |
@@ -351,7 +358,7 @@ discard block |
||
351 | 358 | * @param mixed $salvage |
352 | 359 | * @param mixed $period |
353 | 360 | * @param mixed $rate |
354 | - * @param mixed $basis |
|
361 | + * @param integer $basis |
|
355 | 362 | * |
356 | 363 | * @return float |
357 | 364 | */ |
@@ -421,8 +428,8 @@ discard block |
||
421 | 428 | * 4 European 30/360 |
422 | 429 | * @param mixed $settlement |
423 | 430 | * @param mixed $maturity |
424 | - * @param mixed $frequency |
|
425 | - * @param mixed $basis |
|
431 | + * @param integer $frequency |
|
432 | + * @param integer $basis |
|
426 | 433 | * |
427 | 434 | * @return float |
428 | 435 | */ |
@@ -485,7 +492,7 @@ discard block |
||
485 | 492 | * @param int $frequency |
486 | 493 | * @param mixed $settlement |
487 | 494 | * @param mixed $maturity |
488 | - * @param mixed $basis |
|
495 | + * @param integer $basis |
|
489 | 496 | * |
490 | 497 | * @return float |
491 | 498 | */ |
@@ -562,8 +569,8 @@ discard block |
||
562 | 569 | * 4 European 30/360 |
563 | 570 | * @param mixed $settlement |
564 | 571 | * @param mixed $maturity |
565 | - * @param mixed $frequency |
|
566 | - * @param mixed $basis |
|
572 | + * @param integer $frequency |
|
573 | + * @param integer $basis |
|
567 | 574 | * |
568 | 575 | * @return float |
569 | 576 | */ |
@@ -626,7 +633,7 @@ discard block |
||
626 | 633 | * @param mixed $settlement |
627 | 634 | * @param mixed $maturity |
628 | 635 | * @param mixed $frequency |
629 | - * @param mixed $basis |
|
636 | + * @param integer $basis |
|
630 | 637 | * |
631 | 638 | * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object, |
632 | 639 | * depending on the value of the ReturnDateType flag |
@@ -687,8 +694,8 @@ discard block |
||
687 | 694 | * 4 European 30/360 |
688 | 695 | * @param mixed $settlement |
689 | 696 | * @param mixed $maturity |
690 | - * @param mixed $frequency |
|
691 | - * @param mixed $basis |
|
697 | + * @param integer $frequency |
|
698 | + * @param integer $basis |
|
692 | 699 | * |
693 | 700 | * @return int |
694 | 701 | */ |
@@ -764,7 +771,7 @@ discard block |
||
764 | 771 | * @param mixed $settlement |
765 | 772 | * @param mixed $maturity |
766 | 773 | * @param mixed $frequency |
767 | - * @param mixed $basis |
|
774 | + * @param integer $basis |
|
768 | 775 | * |
769 | 776 | * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object, |
770 | 777 | * depending on the value of the ReturnDateType flag |
@@ -916,7 +923,7 @@ discard block |
||
916 | 923 | * @param mixed $salvage |
917 | 924 | * @param mixed $life |
918 | 925 | * @param mixed $period |
919 | - * @param mixed $month |
|
926 | + * @param integer $month |
|
920 | 927 | * |
921 | 928 | * @return float |
922 | 929 | */ |
@@ -991,7 +998,7 @@ discard block |
||
991 | 998 | * @param mixed $salvage |
992 | 999 | * @param mixed $life |
993 | 1000 | * @param mixed $period |
994 | - * @param mixed $factor |
|
1001 | + * @param double $factor |
|
995 | 1002 | * |
996 | 1003 | * @return float |
997 | 1004 | */ |
@@ -1060,7 +1067,7 @@ discard block |
||
1060 | 1067 | * @param mixed $maturity |
1061 | 1068 | * @param mixed $price |
1062 | 1069 | * @param mixed $redemption |
1063 | - * @param mixed $basis |
|
1070 | + * @param integer $basis |
|
1064 | 1071 | * |
1065 | 1072 | * @return float |
1066 | 1073 | */ |
@@ -1179,7 +1186,7 @@ discard block |
||
1179 | 1186 | * |
1180 | 1187 | * @category Financial Functions |
1181 | 1188 | * |
1182 | - * @param float $nominal_rate Nominal interest rate |
|
1189 | + * @param integer $nominal_rate Nominal interest rate |
|
1183 | 1190 | * @param int $npery Number of compounding payments per year |
1184 | 1191 | * |
1185 | 1192 | * @return float |
@@ -1207,12 +1214,12 @@ discard block |
||
1207 | 1214 | * |
1208 | 1215 | * @category Financial Functions |
1209 | 1216 | * |
1210 | - * @param float $rate The interest rate per period |
|
1217 | + * @param integer $rate The interest rate per period |
|
1211 | 1218 | * @param int $nper Total number of payment periods in an annuity |
1212 | - * @param float $pmt The payment made each period: it cannot change over the |
|
1219 | + * @param integer $pmt The payment made each period: it cannot change over the |
|
1213 | 1220 | * life of the annuity. Typically, pmt contains principal |
1214 | 1221 | * and interest but no other fees or taxes. |
1215 | - * @param float $pv present Value, or the lump-sum amount that a series of |
|
1222 | + * @param integer $pv present Value, or the lump-sum amount that a series of |
|
1216 | 1223 | * future payments is worth right now |
1217 | 1224 | * @param int $type A number 0 or 1 and indicates when payments are due: |
1218 | 1225 | * 0 or omitted At the end of the period. |
@@ -1330,7 +1337,7 @@ discard block |
||
1330 | 1337 | * @param int $per Period for which we want to find the interest |
1331 | 1338 | * @param int $nper Number of periods |
1332 | 1339 | * @param float $pv Present Value |
1333 | - * @param float $fv Future Value |
|
1340 | + * @param integer $fv Future Value |
|
1334 | 1341 | * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period |
1335 | 1342 | * |
1336 | 1343 | * @return float |
@@ -1525,7 +1532,7 @@ discard block |
||
1525 | 1532 | * |
1526 | 1533 | * Returns the nominal interest rate given the effective rate and the number of compounding payments per year. |
1527 | 1534 | * |
1528 | - * @param float $effect_rate Effective interest rate |
|
1535 | + * @param integer $effect_rate Effective interest rate |
|
1529 | 1536 | * @param int $npery Number of compounding payments per year |
1530 | 1537 | * |
1531 | 1538 | * @return float |
@@ -1549,10 +1556,10 @@ discard block |
||
1549 | 1556 | * |
1550 | 1557 | * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate. |
1551 | 1558 | * |
1552 | - * @param float $rate Interest rate per period |
|
1559 | + * @param integer $rate Interest rate per period |
|
1553 | 1560 | * @param int $pmt Periodic payment (annuity) |
1554 | - * @param float $pv Present Value |
|
1555 | - * @param float $fv Future Value |
|
1561 | + * @param integer $pv Present Value |
|
1562 | + * @param integer $fv Future Value |
|
1556 | 1563 | * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period |
1557 | 1564 | * |
1558 | 1565 | * @return float |
@@ -1618,10 +1625,10 @@ discard block |
||
1618 | 1625 | * |
1619 | 1626 | * Returns the constant payment (annuity) for a cash flow with a constant interest rate. |
1620 | 1627 | * |
1621 | - * @param float $rate Interest rate per period |
|
1628 | + * @param integer $rate Interest rate per period |
|
1622 | 1629 | * @param int $nper Number of periods |
1623 | - * @param float $pv Present Value |
|
1624 | - * @param float $fv Future Value |
|
1630 | + * @param integer $pv Present Value |
|
1631 | + * @param integer $fv Future Value |
|
1625 | 1632 | * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period |
1626 | 1633 | * |
1627 | 1634 | * @return float |
@@ -1656,7 +1663,7 @@ discard block |
||
1656 | 1663 | * @param int $per Period for which we want to find the interest |
1657 | 1664 | * @param int $nper Number of periods |
1658 | 1665 | * @param float $pv Present Value |
1659 | - * @param float $fv Future Value |
|
1666 | + * @param integer $fv Future Value |
|
1660 | 1667 | * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period |
1661 | 1668 | * |
1662 | 1669 | * @return float |
@@ -1746,7 +1753,7 @@ discard block |
||
1746 | 1753 | * @param mixed $maturity |
1747 | 1754 | * @param mixed $discount |
1748 | 1755 | * @param mixed $redemption |
1749 | - * @param mixed $basis |
|
1756 | + * @param integer $basis |
|
1750 | 1757 | * |
1751 | 1758 | * @return float |
1752 | 1759 | */ |
@@ -1798,7 +1805,7 @@ discard block |
||
1798 | 1805 | * @param mixed $issue |
1799 | 1806 | * @param mixed $rate |
1800 | 1807 | * @param mixed $yield |
1801 | - * @param mixed $basis |
|
1808 | + * @param integer $basis |
|
1802 | 1809 | * |
1803 | 1810 | * @return float |
1804 | 1811 | */ |
@@ -1852,10 +1859,10 @@ discard block |
||
1852 | 1859 | * |
1853 | 1860 | * Returns the Present Value of a cash flow with constant payments and interest rate (annuities). |
1854 | 1861 | * |
1855 | - * @param float $rate Interest rate per period |
|
1862 | + * @param integer $rate Interest rate per period |
|
1856 | 1863 | * @param int $nper Number of periods |
1857 | - * @param float $pmt Periodic payment (annuity) |
|
1858 | - * @param float $fv Future Value |
|
1864 | + * @param integer $pmt Periodic payment (annuity) |
|
1865 | + * @param integer $fv Future Value |
|
1859 | 1866 | * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period |
1860 | 1867 | * |
1861 | 1868 | * @return float |
@@ -1912,9 +1919,9 @@ discard block |
||
1912 | 1919 | * @param mixed $nper |
1913 | 1920 | * @param mixed $pmt |
1914 | 1921 | * @param mixed $pv |
1915 | - * @param mixed $fv |
|
1916 | - * @param mixed $type |
|
1917 | - * @param mixed $guess |
|
1922 | + * @param double $fv |
|
1923 | + * @param integer $type |
|
1924 | + * @param double $guess |
|
1918 | 1925 | * |
1919 | 1926 | * @return float |
1920 | 1927 | **/ |
@@ -1983,7 +1990,7 @@ discard block |
||
1983 | 1990 | * @param mixed $maturity |
1984 | 1991 | * @param mixed $investment |
1985 | 1992 | * @param mixed $discount |
1986 | - * @param mixed $basis |
|
1993 | + * @param integer $basis |
|
1987 | 1994 | * |
1988 | 1995 | * @return float |
1989 | 1996 | */ |
@@ -2353,7 +2360,7 @@ discard block |
||
2353 | 2360 | * @param mixed $maturity |
2354 | 2361 | * @param mixed $price |
2355 | 2362 | * @param mixed $redemption |
2356 | - * @param mixed $basis |
|
2363 | + * @param integer $basis |
|
2357 | 2364 | * |
2358 | 2365 | * @return float |
2359 | 2366 | */ |
@@ -2410,7 +2417,7 @@ discard block |
||
2410 | 2417 | * @param mixed $issue |
2411 | 2418 | * @param mixed $rate |
2412 | 2419 | * @param mixed $price |
2413 | - * @param mixed $basis |
|
2420 | + * @param integer $basis |
|
2414 | 2421 | * |
2415 | 2422 | * @return float |
2416 | 2423 | */ |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | * @author Jaco van Kooten |
115 | 115 | * |
116 | 116 | * @param mixed $x |
117 | - * @param mixed $p |
|
118 | - * @param mixed $q |
|
117 | + * @param double $p |
|
118 | + * @param double $q |
|
119 | 119 | */ |
120 | 120 | private static function betaFraction($x, $p, $q) |
121 | 121 | { |
@@ -717,8 +717,8 @@ discard block |
||
717 | 717 | * @param float $value Value at which you want to evaluate the distribution |
718 | 718 | * @param float $alpha Parameter to the distribution |
719 | 719 | * @param float $beta Parameter to the distribution |
720 | - * @param mixed $rMin |
|
721 | - * @param mixed $rMax |
|
720 | + * @param integer $rMin |
|
721 | + * @param integer $rMax |
|
722 | 722 | * |
723 | 723 | * @return float |
724 | 724 | */ |
@@ -756,8 +756,8 @@ discard block |
||
756 | 756 | * @param float $probability Probability at which you want to evaluate the distribution |
757 | 757 | * @param float $alpha Parameter to the distribution |
758 | 758 | * @param float $beta Parameter to the distribution |
759 | - * @param float $rMin Minimum value |
|
760 | - * @param float $rMax Maximum value |
|
759 | + * @param integer $rMin Minimum value |
|
760 | + * @param integer $rMax Maximum value |
|
761 | 761 | * |
762 | 762 | * @return float |
763 | 763 | */ |
@@ -1823,7 +1823,6 @@ discard block |
||
1823 | 1823 | * @category Statistical Functions |
1824 | 1824 | * |
1825 | 1825 | * @param mixed $args Data values |
1826 | - * @param int $entry Position (ordered from the largest) in the array or range of data to return |
|
1827 | 1826 | * |
1828 | 1827 | * @return float |
1829 | 1828 | */ |
@@ -2554,7 +2553,6 @@ discard block |
||
2554 | 2553 | * @category Statistical Functions |
2555 | 2554 | * |
2556 | 2555 | * @param mixed $args Data values |
2557 | - * @param float $entry Percentile value in the range 0..1, inclusive. |
|
2558 | 2556 | * |
2559 | 2557 | * @return float |
2560 | 2558 | */ |
@@ -2605,7 +2603,7 @@ discard block |
||
2605 | 2603 | * @param number the number of significant digits for the returned percentage value |
2606 | 2604 | * @param mixed $valueSet |
2607 | 2605 | * @param mixed $value |
2608 | - * @param mixed $significance |
|
2606 | + * @param integer $significance |
|
2609 | 2607 | * |
2610 | 2608 | * @return float |
2611 | 2609 | */ |
@@ -2726,7 +2724,6 @@ discard block |
||
2726 | 2724 | * @category Statistical Functions |
2727 | 2725 | * |
2728 | 2726 | * @param mixed $args Data values |
2729 | - * @param int $entry Quartile value in the range 1..3, inclusive. |
|
2730 | 2727 | * |
2731 | 2728 | * @return float |
2732 | 2729 | */ |
@@ -2759,7 +2756,7 @@ discard block |
||
2759 | 2756 | * @param mixed Order to sort the values in the value set |
2760 | 2757 | * @param mixed $value |
2761 | 2758 | * @param mixed $valueSet |
2762 | - * @param mixed $order |
|
2759 | + * @param integer $order |
|
2763 | 2760 | * |
2764 | 2761 | * @return float |
2765 | 2762 | */ |
@@ -2901,7 +2898,6 @@ discard block |
||
2901 | 2898 | * @category Statistical Functions |
2902 | 2899 | * |
2903 | 2900 | * @param mixed $args Data values |
2904 | - * @param int $entry Position (ordered from the smallest) in the array or range of data to return |
|
2905 | 2901 | * |
2906 | 2902 | * @return float |
2907 | 2903 | */ |
@@ -3365,7 +3361,6 @@ discard block |
||
3365 | 3361 | * @category Statistical Functions |
3366 | 3362 | * |
3367 | 3363 | * @param mixed $args Data values |
3368 | - * @param float $discard Percentage to discard |
|
3369 | 3364 | * |
3370 | 3365 | * @return float |
3371 | 3366 | */ |
@@ -236,6 +236,9 @@ discard block |
||
236 | 236 | return $this->loadIntoExisting($pFilename, $spreadsheet); |
237 | 237 | } |
238 | 238 | |
239 | + /** |
|
240 | + * @param string $styleAttributeValue |
|
241 | + */ |
|
239 | 242 | private static function identifyFixedStyleValue($styleList, &$styleAttributeValue) |
240 | 243 | { |
241 | 244 | $styleAttributeValue = strtolower($styleAttributeValue); |
@@ -811,6 +814,9 @@ discard block |
||
811 | 814 | return $spreadsheet; |
812 | 815 | } |
813 | 816 | |
817 | + /** |
|
818 | + * @param string $charset |
|
819 | + */ |
|
814 | 820 | protected static function convertStringEncoding($string, $charset) |
815 | 821 | { |
816 | 822 | if ($charset != 'UTF-8') { |
@@ -820,6 +826,9 @@ discard block |
||
820 | 826 | return $string; |
821 | 827 | } |
822 | 828 | |
829 | + /** |
|
830 | + * @param string $is |
|
831 | + */ |
|
823 | 832 | protected function parseRichText($is) |
824 | 833 | { |
825 | 834 | $value = new RichText(); |
@@ -536,7 +536,7 @@ |
||
536 | 536 | * |
537 | 537 | * @param int $string A binary string with the encoded date |
538 | 538 | * |
539 | - * @return string The timestamp corresponding to the string |
|
539 | + * @return double The timestamp corresponding to the string |
|
540 | 540 | */ |
541 | 541 | public static function OLE2LocalDate($string) |
542 | 542 | { |
@@ -2664,7 +2664,7 @@ discard block |
||
2664 | 2664 | |
2665 | 2665 | /** |
2666 | 2666 | * @param string $cellReference |
2667 | - * @param mixed $cellValue |
|
2667 | + * @param boolean $cellValue |
|
2668 | 2668 | */ |
2669 | 2669 | public function saveValueToCache($cellReference, $cellValue) |
2670 | 2670 | { |
@@ -2789,7 +2789,7 @@ discard block |
||
2789 | 2789 | * |
2790 | 2790 | * @param mixed &$matrix matrix operand |
2791 | 2791 | * |
2792 | - * @return int[] An array comprising the number of rows, and number of columns |
|
2792 | + * @return integer[] An array comprising the number of rows, and number of columns |
|
2793 | 2793 | */ |
2794 | 2794 | private static function getMatrixDimensions(&$matrix) |
2795 | 2795 | { |
@@ -3849,7 +3849,7 @@ |
||
3849 | 3849 | * |
3850 | 3850 | * @return bool |
3851 | 3851 | */ |
3852 | - private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack &$stack, $recursingArrays = false) |
|
3852 | + private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack & $stack, $recursingArrays = false) |
|
3853 | 3853 | { |
3854 | 3854 | // If we're dealing with matrix operations, we want a matrix result |
3855 | 3855 | if ((is_array($operand1)) || (is_array($operand2))) { |
@@ -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(); |
@@ -147,7 +147,7 @@ |
||
147 | 147 | /** |
148 | 148 | * Get parent. Only used for style supervisor. |
149 | 149 | * |
150 | - * @return Spreadsheet |
|
150 | + * @return Style |
|
151 | 151 | */ |
152 | 152 | public function getParent() |
153 | 153 | { |