@@ -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 | { |
@@ -233,6 +233,7 @@ discard block |
||
233 | 233 | * |
234 | 234 | * @param \PhpOffice\PhpSpreadsheet\Style |
235 | 235 | * @param bool Is it a style XF? |
236 | + * @param \PhpOffice\PhpSpreadsheet\Style $style |
|
236 | 237 | * @return int Index to XF record |
237 | 238 | */ |
238 | 239 | public function addXfWriter($style, $isStyleXf = false) |
@@ -783,7 +784,7 @@ discard block |
||
783 | 784 | * |
784 | 785 | * @param string $name The name in UTF-8 |
785 | 786 | * @param string $formulaData The binary formula data |
786 | - * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
787 | + * @param integer $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
787 | 788 | * @param bool $isBuiltIn Built-in name? |
788 | 789 | * @return string Complete binary record data |
789 | 790 | */ |
@@ -199,10 +199,12 @@ discard block |
||
199 | 199 | * @param int &$str_unique Total number of unique strings |
200 | 200 | * @param array &$str_table String Table |
201 | 201 | * @param array &$colors Colour Table |
202 | - * @param mixed $parser The formula parser created for the Workbook |
|
202 | + * @param Parser $parser The formula parser created for the Workbook |
|
203 | 203 | * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
204 | 204 | * @param string $phpSheet The worksheet to write |
205 | 205 | * @param \PhpSpreadsheet\Worksheet $phpSheet |
206 | + * @param integer $str_total |
|
207 | + * @param integer $str_unique |
|
206 | 208 | */ |
207 | 209 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
208 | 210 | { |
@@ -611,7 +613,7 @@ discard block |
||
611 | 613 | * @param int $row Zero indexed row |
612 | 614 | * @param int $col Zero indexed column |
613 | 615 | * @param float $num The number to write |
614 | - * @param mixed $xfIndex The optional XF format |
|
616 | + * @param integer $xfIndex The optional XF format |
|
615 | 617 | * @return int |
616 | 618 | */ |
617 | 619 | private function writeNumber($row, $col, $num, $xfIndex) |
@@ -717,7 +719,7 @@ discard block |
||
717 | 719 | * @param int $row Zero indexed row |
718 | 720 | * @param int $col Zero indexed column |
719 | 721 | * @param string $str The string to write |
720 | - * @param mixed $xfIndex The XF format index for the cell |
|
722 | + * @param integer $xfIndex The XF format index for the cell |
|
721 | 723 | * @return int |
722 | 724 | */ |
723 | 725 | private function writeLabelSst($row, $col, $str, $xfIndex) |
@@ -783,7 +785,7 @@ discard block |
||
783 | 785 | * |
784 | 786 | * @param int $row Zero indexed row |
785 | 787 | * @param int $col Zero indexed column |
786 | - * @param mixed $xfIndex The XF format index |
|
788 | + * @param integer $xfIndex The XF format index |
|
787 | 789 | */ |
788 | 790 | public function writeBlank($row, $col, $xfIndex) |
789 | 791 | { |
@@ -830,7 +832,7 @@ discard block |
||
830 | 832 | * @param int $row Zero indexed row |
831 | 833 | * @param int $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 int |
836 | 838 | */ |
@@ -2299,8 +2301,8 @@ discard block |
||
2299 | 2301 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2300 | 2302 | * @param int $x The horizontal position (offset) of the image inside the cell. |
2301 | 2303 | * @param int $y The vertical position (offset) of the image inside the cell. |
2302 | - * @param float $scale_x The horizontal scale |
|
2303 | - * @param float $scale_y The vertical scale |
|
2304 | + * @param integer $scale_x The horizontal scale |
|
2305 | + * @param integer $scale_y The vertical scale |
|
2304 | 2306 | */ |
2305 | 2307 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2306 | 2308 | { |
@@ -168,16 +168,25 @@ discard block |
||
168 | 168 | return fread($this->fileHandle, $blockSize); |
169 | 169 | } |
170 | 170 | |
171 | + /** |
|
172 | + * @param string $data |
|
173 | + */ |
|
171 | 174 | private static function startsWithTag($data) |
172 | 175 | { |
173 | 176 | return '<' === substr(trim($data), 0, 1); |
174 | 177 | } |
175 | 178 | |
179 | + /** |
|
180 | + * @param string $data |
|
181 | + */ |
|
176 | 182 | private static function endsWithTag($data) |
177 | 183 | { |
178 | 184 | return '>' === substr(trim($data), -1, 1); |
179 | 185 | } |
180 | 186 | |
187 | + /** |
|
188 | + * @param string $data |
|
189 | + */ |
|
181 | 190 | private static function containsTags($data) |
182 | 191 | { |
183 | 192 | return strlen($data) !== strlen(strip_tags($data)); |
@@ -249,6 +258,10 @@ discard block |
||
249 | 258 | return array_pop($this->nestedColumn); |
250 | 259 | } |
251 | 260 | |
261 | + /** |
|
262 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet $sheet |
|
263 | + * @param integer $row |
|
264 | + */ |
|
252 | 265 | protected function flushCell($sheet, $column, $row, &$cellContent) |
253 | 266 | { |
254 | 267 | if (is_string($cellContent)) { |