@@ -236,7 +236,7 @@ |
||
236 | 236 | * Calculate an (approximate) OpenXML column width, based on font size and text contained. |
237 | 237 | * |
238 | 238 | * @param \PhpOffice\PhpSpreadsheet\Style\Font $font Font object |
239 | - * @param \PhpOffice\PhpSpreadsheet\RichText|string $cellText Text to calculate width |
|
239 | + * @param string $cellText Text to calculate width |
|
240 | 240 | * @param int $rotation Rotation angle |
241 | 241 | * @param \PhpOffice\PhpSpreadsheet\Style\Font|null $defaultFont Font object |
242 | 242 | * |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | /** |
820 | 820 | * Return the eigenvector matrix. |
821 | 821 | * |
822 | - * @return V |
|
822 | + * @return Matrix |
|
823 | 823 | */ |
824 | 824 | public function getV() |
825 | 825 | { |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | /** |
850 | 850 | * Return the block diagonal eigenvalue matrix. |
851 | 851 | * |
852 | - * @return D |
|
852 | + * @return Matrix |
|
853 | 853 | */ |
854 | 854 | public function getD() |
855 | 855 | { |
@@ -241,7 +241,7 @@ |
||
241 | 241 | /** |
242 | 242 | * Solve A*X = B. |
243 | 243 | * |
244 | - * @param $B a Matrix with as many rows as A and any number of columns |
|
244 | + * @param Matrix $B a Matrix with as many rows as A and any number of columns |
|
245 | 245 | * |
246 | 246 | * @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception illegalArgumentException Matrix row dimensions must agree |
247 | 247 | * @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception runtimeException Matrix is singular |
@@ -149,10 +149,6 @@ discard block |
||
149 | 149 | * |
150 | 150 | * Get a submatrix |
151 | 151 | * |
152 | - * @param int $i0 Initial row index |
|
153 | - * @param int $iF Final row index |
|
154 | - * @param int $j0 Initial column index |
|
155 | - * @param int $jF Final column index |
|
156 | 152 | * |
157 | 153 | * @return Matrix Submatrix |
158 | 154 | */ |
@@ -345,7 +341,7 @@ discard block |
||
345 | 341 | * |
346 | 342 | * @param int $m Row dimension |
347 | 343 | * @param int $n Column dimension |
348 | - * @param mixed $c Diagonal value |
|
344 | + * @param integer $c Diagonal value |
|
349 | 345 | * |
350 | 346 | * @return Matrix Diagonal matrix |
351 | 347 | */ |
@@ -429,7 +425,7 @@ discard block |
||
429 | 425 | * |
430 | 426 | * Sum of diagonal elements |
431 | 427 | * |
432 | - * @return float Sum of diagonal elements |
|
428 | + * @return integer Sum of diagonal elements |
|
433 | 429 | */ |
434 | 430 | public function trace() |
435 | 431 | { |
@@ -458,7 +454,6 @@ discard block |
||
458 | 454 | * |
459 | 455 | * A + B |
460 | 456 | * |
461 | - * @param mixed $B Matrix/Array |
|
462 | 457 | * |
463 | 458 | * @return Matrix Sum |
464 | 459 | */ |
@@ -500,7 +495,6 @@ discard block |
||
500 | 495 | * |
501 | 496 | * A = A + B |
502 | 497 | * |
503 | - * @param mixed $B Matrix/Array |
|
504 | 498 | * |
505 | 499 | * @return Matrix Sum |
506 | 500 | */ |
@@ -556,7 +550,6 @@ discard block |
||
556 | 550 | * |
557 | 551 | * A - B |
558 | 552 | * |
559 | - * @param mixed $B Matrix/Array |
|
560 | 553 | * |
561 | 554 | * @return Matrix Sum |
562 | 555 | */ |
@@ -598,7 +591,6 @@ discard block |
||
598 | 591 | * |
599 | 592 | * A = A - B |
600 | 593 | * |
601 | - * @param mixed $B Matrix/Array |
|
602 | 594 | * |
603 | 595 | * @return Matrix Sum |
604 | 596 | */ |
@@ -655,7 +647,6 @@ discard block |
||
655 | 647 | * Element-by-element multiplication |
656 | 648 | * Cij = Aij * Bij |
657 | 649 | * |
658 | - * @param mixed $B Matrix/Array |
|
659 | 650 | * |
660 | 651 | * @return Matrix Matrix Cij |
661 | 652 | */ |
@@ -698,7 +689,6 @@ discard block |
||
698 | 689 | * Element-by-element multiplication |
699 | 690 | * Aij = Aij * Bij |
700 | 691 | * |
701 | - * @param mixed $B Matrix/Array |
|
702 | 692 | * |
703 | 693 | * @return Matrix Matrix Aij |
704 | 694 | */ |
@@ -755,7 +745,6 @@ discard block |
||
755 | 745 | * Element-by-element right division |
756 | 746 | * A / B |
757 | 747 | * |
758 | - * @param Matrix $B Matrix B |
|
759 | 748 | * |
760 | 749 | * @return Matrix Division result |
761 | 750 | */ |
@@ -817,7 +806,6 @@ discard block |
||
817 | 806 | * Element-by-element right division |
818 | 807 | * Aij = Aij / Bij |
819 | 808 | * |
820 | - * @param mixed $B Matrix/Array |
|
821 | 809 | * |
822 | 810 | * @return Matrix Matrix Aij |
823 | 811 | */ |
@@ -860,7 +848,6 @@ discard block |
||
860 | 848 | * Element-by-element Left division |
861 | 849 | * A / B |
862 | 850 | * |
863 | - * @param Matrix $B Matrix B |
|
864 | 851 | * |
865 | 852 | * @return Matrix Division result |
866 | 853 | */ |
@@ -903,7 +890,6 @@ discard block |
||
903 | 890 | * Element-by-element Left division |
904 | 891 | * Aij = Aij / Bij |
905 | 892 | * |
906 | - * @param mixed $B Matrix/Array |
|
907 | 893 | * |
908 | 894 | * @return Matrix Matrix Aij |
909 | 895 | */ |
@@ -945,7 +931,6 @@ discard block |
||
945 | 931 | * |
946 | 932 | * Matrix multiplication |
947 | 933 | * |
948 | - * @param mixed $n Matrix/Array/Scalar |
|
949 | 934 | * |
950 | 935 | * @return Matrix Product |
951 | 936 | */ |
@@ -1038,7 +1023,6 @@ discard block |
||
1038 | 1023 | * |
1039 | 1024 | * A = A ^ B |
1040 | 1025 | * |
1041 | - * @param mixed $B Matrix/Array |
|
1042 | 1026 | * |
1043 | 1027 | * @return Matrix Sum |
1044 | 1028 | */ |
@@ -1094,7 +1078,6 @@ discard block |
||
1094 | 1078 | * |
1095 | 1079 | * A = A & B |
1096 | 1080 | * |
1097 | - * @param mixed $B Matrix/Array |
|
1098 | 1081 | * |
1099 | 1082 | * @return Matrix Sum |
1100 | 1083 | */ |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | /** |
442 | 442 | * Return the left singular vectors. |
443 | 443 | * |
444 | - * @return U |
|
444 | + * @return Matrix |
|
445 | 445 | */ |
446 | 446 | public function getU() |
447 | 447 | { |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | /** |
452 | 452 | * Return the right singular vectors. |
453 | 453 | * |
454 | - * @return V |
|
454 | + * @return Matrix |
|
455 | 455 | */ |
456 | 456 | public function getV() |
457 | 457 | { |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | /** |
472 | 472 | * Return the diagonal matrix of singular values. |
473 | 473 | * |
474 | - * @return S |
|
474 | + * @return Matrix |
|
475 | 475 | */ |
476 | 476 | public function getS() |
477 | 477 | { |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | * |
591 | 591 | * @throws Exception |
592 | 592 | * |
593 | - * @return false|Chart |
|
593 | + * @return null|Chart |
|
594 | 594 | */ |
595 | 595 | public function getChartByIndex($index = null) |
596 | 596 | { |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | * Set a cell value. |
1121 | 1121 | * |
1122 | 1122 | * @param string $pCoordinate Coordinate of the cell |
1123 | - * @param mixed $pValue Value of the cell |
|
1123 | + * @param integer $pValue Value of the cell |
|
1124 | 1124 | * @param bool $returnCell Return the worksheet (false, default) or the cell (true) |
1125 | 1125 | * |
1126 | 1126 | * @return Worksheet|Cell Depending on the last parameter being specified |
@@ -1237,8 +1237,8 @@ discard block |
||
1237 | 1237 | /** |
1238 | 1238 | * Get cell at a specific coordinate by using numeric cell coordinates. |
1239 | 1239 | * |
1240 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1241 | - * @param string $pRow Numeric row coordinate of the cell |
|
1240 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1241 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1242 | 1242 | * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't |
1243 | 1243 | * already exist, or a null should be returned instead |
1244 | 1244 | * |
@@ -1348,8 +1348,8 @@ discard block |
||
1348 | 1348 | /** |
1349 | 1349 | * Cell at a specific coordinate by using numeric cell coordinates exists? |
1350 | 1350 | * |
1351 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1352 | - * @param string $pRow Numeric row coordinate of the cell |
|
1351 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1352 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1353 | 1353 | * |
1354 | 1354 | * @return bool |
1355 | 1355 | */ |
@@ -1362,7 +1362,7 @@ discard block |
||
1362 | 1362 | * Get row dimension at a specific row. |
1363 | 1363 | * |
1364 | 1364 | * @param int $pRow Numeric index of the row |
1365 | - * @param mixed $create |
|
1365 | + * @param boolean $create |
|
1366 | 1366 | * |
1367 | 1367 | * @return Worksheet\RowDimension |
1368 | 1368 | */ |
@@ -1388,7 +1388,7 @@ discard block |
||
1388 | 1388 | * Get column dimension at a specific column. |
1389 | 1389 | * |
1390 | 1390 | * @param string $pColumn String index of the column |
1391 | - * @param mixed $create |
|
1391 | + * @param boolean $create |
|
1392 | 1392 | * |
1393 | 1393 | * @return Worksheet\ColumnDimension |
1394 | 1394 | */ |
@@ -1934,7 +1934,7 @@ discard block |
||
1934 | 1934 | /** |
1935 | 1935 | * Set AutoFilter. |
1936 | 1936 | * |
1937 | - * @param Worksheet\AutoFilter|string $pValue |
|
1937 | + * @param string $pValue |
|
1938 | 1938 | * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility |
1939 | 1939 | * |
1940 | 1940 | * @throws Exception |
@@ -2996,7 +2996,7 @@ discard block |
||
2996 | 2996 | * |
2997 | 2997 | * @throws Exception |
2998 | 2998 | * |
2999 | - * @return objWorksheet |
|
2999 | + * @return Worksheet |
|
3000 | 3000 | */ |
3001 | 3001 | public function setCodeName($pValue = null) |
3002 | 3002 | { |
@@ -43,7 +43,6 @@ discard block |
||
43 | 43 | /** |
44 | 44 | * Create a new row. |
45 | 45 | * |
46 | - * @param \PhpOffice\PhpSpreadsheet\Worksheet $parent |
|
47 | 46 | * @param int $rowIndex |
48 | 47 | */ |
49 | 48 | public function __construct(\PhpOffice\PhpSpreadsheet\Worksheet $worksheet = null, $rowIndex = 1) |
@@ -87,7 +86,7 @@ discard block |
||
87 | 86 | /** |
88 | 87 | * Returns bound worksheet. |
89 | 88 | * |
90 | - * @return Worksheet |
|
89 | + * @return |
|
91 | 90 | */ |
92 | 91 | public function getWorksheet() |
93 | 92 | { |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | * |
241 | 241 | * @param \PhpOffice\PhpSpreadsheet\Style |
242 | 242 | * @param bool Is it a style XF? |
243 | - * @param mixed $style |
|
244 | - * @param mixed $isStyleXf |
|
243 | + * @param \PhpOffice\PhpSpreadsheet\Style $style |
|
244 | + * @param boolean $isStyleXf |
|
245 | 245 | * |
246 | 246 | * @return int Index to XF record |
247 | 247 | */ |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | * |
797 | 797 | * @param string $name The name in UTF-8 |
798 | 798 | * @param string $formulaData The binary formula data |
799 | - * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
799 | + * @param integer $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
800 | 800 | * @param bool $isBuiltIn Built-in name? |
801 | 801 | * |
802 | 802 | * @return string Complete binary record data |
@@ -223,10 +223,12 @@ discard block |
||
223 | 223 | * @param int &$str_unique Total number of unique strings |
224 | 224 | * @param array &$str_table String Table |
225 | 225 | * @param array &$colors Colour Table |
226 | - * @param mixed $parser The formula parser created for the Workbook |
|
226 | + * @param Parser $parser The formula parser created for the Workbook |
|
227 | 227 | * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
228 | 228 | * @param string $phpSheet The worksheet to write |
229 | 229 | * @param \PhpOffice\PhpSpreadsheet\Worksheet $phpSheet |
230 | + * @param integer $str_total |
|
231 | + * @param integer $str_unique |
|
230 | 232 | */ |
231 | 233 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
232 | 234 | { |
@@ -624,7 +626,7 @@ discard block |
||
624 | 626 | * @param int $row Zero indexed row |
625 | 627 | * @param int $col Zero indexed column |
626 | 628 | * @param float $num The number to write |
627 | - * @param mixed $xfIndex The optional XF format |
|
629 | + * @param integer $xfIndex The optional XF format |
|
628 | 630 | * |
629 | 631 | * @return int |
630 | 632 | */ |
@@ -733,7 +735,7 @@ discard block |
||
733 | 735 | * @param int $row Zero indexed row |
734 | 736 | * @param int $col Zero indexed column |
735 | 737 | * @param string $str The string to write |
736 | - * @param mixed $xfIndex The XF format index for the cell |
|
738 | + * @param integer $xfIndex The XF format index for the cell |
|
737 | 739 | * |
738 | 740 | * @return int |
739 | 741 | */ |
@@ -800,7 +802,7 @@ discard block |
||
800 | 802 | * |
801 | 803 | * @param int $row Zero indexed row |
802 | 804 | * @param int $col Zero indexed column |
803 | - * @param mixed $xfIndex The XF format index |
|
805 | + * @param integer $xfIndex The XF format index |
|
804 | 806 | */ |
805 | 807 | public function writeBlank($row, $col, $xfIndex) |
806 | 808 | { |
@@ -847,7 +849,7 @@ discard block |
||
847 | 849 | * @param int $row Zero indexed row |
848 | 850 | * @param int $col Zero indexed column |
849 | 851 | * @param string $formula The formula text string |
850 | - * @param mixed $xfIndex The XF format index |
|
852 | + * @param integer $xfIndex The XF format index |
|
851 | 853 | * @param mixed $calculatedValue Calculated value |
852 | 854 | * |
853 | 855 | * @return int |
@@ -2327,8 +2329,8 @@ discard block |
||
2327 | 2329 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2328 | 2330 | * @param int $x the horizontal position (offset) of the image inside the cell |
2329 | 2331 | * @param int $y the vertical position (offset) of the image inside the cell |
2330 | - * @param float $scale_x The horizontal scale |
|
2331 | - * @param float $scale_y The vertical scale |
|
2332 | + * @param integer $scale_x The horizontal scale |
|
2333 | + * @param integer $scale_y The vertical scale |
|
2332 | 2334 | */ |
2333 | 2335 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2334 | 2336 | { |