@@ -220,6 +220,11 @@ |
||
220 | 220 | $cellContent = (string) ''; |
221 | 221 | } |
222 | 222 | |
223 | + /** |
|
224 | + * @param integer $row |
|
225 | + * @param string $column |
|
226 | + * @param string $cellContent |
|
227 | + */ |
|
223 | 228 | protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null) |
224 | 229 | { |
225 | 230 | foreach ($element->childNodes as $child) { |
@@ -802,7 +802,7 @@ |
||
802 | 802 | /** |
803 | 803 | * Update named formulas (i.e. containing worksheet references / named ranges) |
804 | 804 | * |
805 | - * @param PHPExcel $pPhpExcel Object to update |
|
805 | + * @param Spreadsheet $pPhpExcel Object to update |
|
806 | 806 | * @param string $oldName Old name (name to replace) |
807 | 807 | * @param string $newName New name |
808 | 808 | */ |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * Convert pixels to EMU |
34 | 34 | * |
35 | 35 | * @param int $pValue Value in pixels |
36 | - * @return int Value in EMU |
|
36 | + * @return double Value in EMU |
|
37 | 37 | */ |
38 | 38 | public static function pixelsToEMU($pValue = 0) |
39 | 39 | { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * Convert pixels to points |
115 | 115 | * |
116 | 116 | * @param int $pValue Value in pixels |
117 | - * @return int Value in points |
|
117 | + * @return double Value in points |
|
118 | 118 | */ |
119 | 119 | public static function pixelsToPoints($pValue = 0) |
120 | 120 | { |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | * Create a new image from file. By alexander at alexauto dot nl |
167 | 167 | * |
168 | 168 | * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214 |
169 | - * @param string $filename Path to Windows DIB (BMP) image |
|
169 | + * @param string $p_sFile |
|
170 | 170 | * @return resource |
171 | 171 | */ |
172 | 172 | public static function imagecreatefrombmp($p_sFile) |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | /** |
207 | 207 | * Get the shape index |
208 | 208 | * |
209 | - * @return int |
|
209 | + * @return boolean |
|
210 | 210 | */ |
211 | 211 | public function getSpId() |
212 | 212 | { |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | * Set an option for the Shape Group Container |
218 | 218 | * |
219 | 219 | * @param int $property The number specifies the option |
220 | - * @param mixed $value |
|
220 | + * @param integer $value |
|
221 | 221 | */ |
222 | 222 | public function setOPT($property, $value) |
223 | 223 | { |
@@ -331,7 +331,6 @@ discard block |
||
331 | 331 | /** |
332 | 332 | * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width |
333 | 333 | * |
334 | - * @param int $startOffsetX |
|
335 | 334 | */ |
336 | 335 | public function setEndOffsetX($endOffsetX = 0) |
337 | 336 | { |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * Calculate an (approximate) OpenXML column width, based on font size and text contained |
239 | 239 | * |
240 | 240 | * @param \PHPExcel\Style\Font $font Font object |
241 | - * @param \PHPExcel\RichText|string $cellText Text to calculate width |
|
241 | + * @param string $cellText Text to calculate width |
|
242 | 242 | * @param integer $rotation Rotation angle |
243 | 243 | * @param \PHPExcel\Style\Font|NULL $defaultFont Font object |
244 | 244 | * @return integer Column width |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | * Calculate an (approximate) pixel size, based on centimeter size |
408 | 408 | * |
409 | 409 | * @param int $sizeInCm Font size (in centimeters) |
410 | - * @return int Size (in pixels) |
|
410 | + * @return double Size (in pixels) |
|
411 | 411 | */ |
412 | 412 | public static function centimeterSizeToPixels($sizeInCm = 1) |
413 | 413 | { |
@@ -418,6 +418,7 @@ discard block |
||
418 | 418 | * Returns the font path given the font |
419 | 419 | * |
420 | 420 | * @param \PHPExcel\Style\Font |
421 | + * @param \PHPExcel\Style\Font $font |
|
421 | 422 | * @return string Path to TrueType font file |
422 | 423 | */ |
423 | 424 | public static function getTrueTypeFontFileFromFont($font) |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | * Return the eigenvector matrix |
817 | 817 | * |
818 | 818 | * @access public |
819 | - * @return V |
|
819 | + * @return Matrix |
|
820 | 820 | */ |
821 | 821 | public function getV() |
822 | 822 | { |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | * Return the block diagonal eigenvalue matrix |
850 | 850 | * |
851 | 851 | * @access public |
852 | - * @return D |
|
852 | + * @return Matrix |
|
853 | 853 | */ |
854 | 854 | public function getD() |
855 | 855 | { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | /** |
60 | 60 | * LU Decomposition constructor. |
61 | 61 | * |
62 | - * @param $A Rectangular matrix |
|
62 | + * @param Matrix $A Rectangular matrix |
|
63 | 63 | * @return Structure to access L, U and piv. |
64 | 64 | */ |
65 | 65 | public function __construct($A) |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | /** |
126 | 126 | * Get lower triangular factor. |
127 | 127 | * |
128 | - * @return array Lower triangular factor |
|
128 | + * @return Matrix Lower triangular factor |
|
129 | 129 | */ |
130 | 130 | public function getL() |
131 | 131 | { |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | /** |
147 | 147 | * Get upper triangular factor. |
148 | 148 | * |
149 | - * @return array Upper triangular factor |
|
149 | + * @return Matrix Upper triangular factor |
|
150 | 150 | */ |
151 | 151 | public function getU() |
152 | 152 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | /** |
186 | 186 | * Is the matrix nonsingular? |
187 | 187 | * |
188 | - * @return true if U, and hence A, is nonsingular. |
|
188 | + * @return boolean if U, and hence A, is nonsingular. |
|
189 | 189 | */ |
190 | 190 | public function isNonsingular() |
191 | 191 | { |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | /** |
219 | 219 | * Solve A*X = B |
220 | 220 | * |
221 | - * @param $B A Matrix with as many rows as A and any number of columns. |
|
221 | + * @param Matrix $B A Matrix with as many rows as A and any number of columns. |
|
222 | 222 | * @return X so that L*U*X = B(piv,:) |
223 | 223 | * @\PHPExcel\Calculation\Exception IllegalArgumentException Matrix row dimensions must agree. |
224 | 224 | * @\PHPExcel\Calculation\Exception RuntimeException Matrix is singular. |
@@ -149,11 +149,6 @@ discard block |
||
149 | 149 | * getMatrix |
150 | 150 | * |
151 | 151 | * Get a submatrix |
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 | - * @return Matrix Submatrix |
|
157 | 152 | */ |
158 | 153 | public function getMatrix() |
159 | 154 | { |
@@ -351,7 +346,7 @@ discard block |
||
351 | 346 | * Generate a diagonal matrix |
352 | 347 | * @param int $m Row dimension |
353 | 348 | * @param int $n Column dimension |
354 | - * @param mixed $c Diagonal value |
|
349 | + * @param integer $c Diagonal value |
|
355 | 350 | * @return Matrix Diagonal matrix |
356 | 351 | */ |
357 | 352 | public function diagonal($m = null, $n = null, $c = 1) |
@@ -388,9 +383,6 @@ discard block |
||
388 | 383 | * getMatrixByCol |
389 | 384 | * |
390 | 385 | * Get a submatrix by column index/range |
391 | - * @param int $i0 Initial column index |
|
392 | - * @param int $iF Final column index |
|
393 | - * @return Matrix Submatrix |
|
394 | 386 | */ |
395 | 387 | public function getMatrixByCol($j0 = null, $jF = null) |
396 | 388 | { |
@@ -426,7 +418,7 @@ discard block |
||
426 | 418 | * trace |
427 | 419 | * |
428 | 420 | * Sum of diagonal elements |
429 | - * @return float Sum of diagonal elements |
|
421 | + * @return integer Sum of diagonal elements |
|
430 | 422 | */ |
431 | 423 | public function trace() |
432 | 424 | { |
@@ -452,8 +444,6 @@ discard block |
||
452 | 444 | * plus |
453 | 445 | * |
454 | 446 | * A + B |
455 | - * @param mixed $B Matrix/Array |
|
456 | - * @return Matrix Sum |
|
457 | 447 | */ |
458 | 448 | public function plus() |
459 | 449 | { |
@@ -492,8 +482,6 @@ discard block |
||
492 | 482 | * plusEquals |
493 | 483 | * |
494 | 484 | * A = A + B |
495 | - * @param mixed $B Matrix/Array |
|
496 | - * @return Matrix Sum |
|
497 | 485 | */ |
498 | 486 | public function plusEquals() |
499 | 487 | { |
@@ -546,8 +534,6 @@ discard block |
||
546 | 534 | * minus |
547 | 535 | * |
548 | 536 | * A - B |
549 | - * @param mixed $B Matrix/Array |
|
550 | - * @return Matrix Sum |
|
551 | 537 | */ |
552 | 538 | public function minus() |
553 | 539 | { |
@@ -586,8 +572,6 @@ discard block |
||
586 | 572 | * minusEquals |
587 | 573 | * |
588 | 574 | * A = A - B |
589 | - * @param mixed $B Matrix/Array |
|
590 | - * @return Matrix Sum |
|
591 | 575 | */ |
592 | 576 | public function minusEquals() |
593 | 577 | { |
@@ -641,8 +625,6 @@ discard block |
||
641 | 625 | * |
642 | 626 | * Element-by-element multiplication |
643 | 627 | * Cij = Aij * Bij |
644 | - * @param mixed $B Matrix/Array |
|
645 | - * @return Matrix Matrix Cij |
|
646 | 628 | */ |
647 | 629 | public function arrayTimes() |
648 | 630 | { |
@@ -682,8 +664,6 @@ discard block |
||
682 | 664 | * |
683 | 665 | * Element-by-element multiplication |
684 | 666 | * Aij = Aij * Bij |
685 | - * @param mixed $B Matrix/Array |
|
686 | - * @return Matrix Matrix Aij |
|
687 | 667 | */ |
688 | 668 | public function arrayTimesEquals() |
689 | 669 | { |
@@ -737,8 +717,6 @@ discard block |
||
737 | 717 | * |
738 | 718 | * Element-by-element right division |
739 | 719 | * A / B |
740 | - * @param Matrix $B Matrix B |
|
741 | - * @return Matrix Division result |
|
742 | 720 | */ |
743 | 721 | public function arrayRightDivide() |
744 | 722 | { |
@@ -798,8 +776,6 @@ discard block |
||
798 | 776 | * |
799 | 777 | * Element-by-element right division |
800 | 778 | * Aij = Aij / Bij |
801 | - * @param mixed $B Matrix/Array |
|
802 | - * @return Matrix Matrix Aij |
|
803 | 779 | */ |
804 | 780 | public function arrayRightDivideEquals() |
805 | 781 | { |
@@ -840,8 +816,6 @@ discard block |
||
840 | 816 | * |
841 | 817 | * Element-by-element Left division |
842 | 818 | * A / B |
843 | - * @param Matrix $B Matrix B |
|
844 | - * @return Matrix Division result |
|
845 | 819 | */ |
846 | 820 | public function arrayLeftDivide() |
847 | 821 | { |
@@ -882,8 +856,6 @@ discard block |
||
882 | 856 | * |
883 | 857 | * Element-by-element Left division |
884 | 858 | * Aij = Aij / Bij |
885 | - * @param mixed $B Matrix/Array |
|
886 | - * @return Matrix Matrix Aij |
|
887 | 859 | */ |
888 | 860 | public function arrayLeftDivideEquals() |
889 | 861 | { |
@@ -923,8 +895,6 @@ discard block |
||
923 | 895 | * times |
924 | 896 | * |
925 | 897 | * Matrix multiplication |
926 | - * @param mixed $n Matrix/Array/Scalar |
|
927 | - * @return Matrix Product |
|
928 | 898 | */ |
929 | 899 | public function times() |
930 | 900 | { |
@@ -1018,8 +988,6 @@ discard block |
||
1018 | 988 | * power |
1019 | 989 | * |
1020 | 990 | * A = A ^ B |
1021 | - * @param mixed $B Matrix/Array |
|
1022 | - * @return Matrix Sum |
|
1023 | 991 | */ |
1024 | 992 | public function power() |
1025 | 993 | { |
@@ -1072,8 +1040,6 @@ discard block |
||
1072 | 1040 | * concat |
1073 | 1041 | * |
1074 | 1042 | * A = A & B |
1075 | - * @param mixed $B Matrix/Array |
|
1076 | - * @return Matrix Sum |
|
1077 | 1043 | */ |
1078 | 1044 | public function concat() |
1079 | 1045 | { |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | * Return the left singular vectors |
437 | 437 | * |
438 | 438 | * @access public |
439 | - * @return U |
|
439 | + * @return Matrix |
|
440 | 440 | */ |
441 | 441 | public function getU() |
442 | 442 | { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | * Return the right singular vectors |
449 | 449 | * |
450 | 450 | * @access public |
451 | - * @return V |
|
451 | + * @return Matrix |
|
452 | 452 | */ |
453 | 453 | public function getV() |
454 | 454 | { |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | * Return the diagonal matrix of singular values |
473 | 473 | * |
474 | 474 | * @access public |
475 | - * @return S |
|
475 | + * @return Matrix |
|
476 | 476 | */ |
477 | 477 | public function getS() |
478 | 478 | { |