@@ -565,7 +565,7 @@ |
||
565 | 565 | /** |
566 | 566 | * Get an array of all styles |
567 | 567 | * |
568 | - * @param PHPExcel $pPHPExcel |
|
568 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
569 | 569 | * @return PHPExcel_Style[] All styles in PHPExcel |
570 | 570 | * @throws \PHPExcel\Writer\Exception |
571 | 571 | */ |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * Write BookViews |
123 | 123 | * |
124 | 124 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
125 | - * @param PHPExcel $pPHPExcel |
|
125 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
126 | 126 | * @throws \PHPExcel\Writer\Exception |
127 | 127 | */ |
128 | 128 | private function writeBookViews(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * Write WorkbookProtection |
153 | 153 | * |
154 | 154 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
155 | - * @param PHPExcel $pPHPExcel |
|
155 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
156 | 156 | * @throws \PHPExcel\Writer\Exception |
157 | 157 | */ |
158 | 158 | private function writeWorkbookProtection(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * Write sheets |
203 | 203 | * |
204 | 204 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
205 | - * @param PHPExcel $pPHPExcel |
|
205 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
206 | 206 | * @throws \PHPExcel\Writer\Exception |
207 | 207 | */ |
208 | 208 | private function writeSheets(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * Write Defined Names |
256 | 256 | * |
257 | 257 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
258 | - * @param PHPExcel $pPHPExcel |
|
258 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
259 | 259 | * @throws \PHPExcel\Writer\Exception |
260 | 260 | */ |
261 | 261 | private function writeDefinedNames(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -67,6 +67,7 @@ |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Process the object to be written |
70 | + * @return string |
|
70 | 71 | */ |
71 | 72 | public function close() |
72 | 73 | { |
@@ -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 | { |
@@ -192,7 +192,9 @@ discard block |
||
192 | 192 | * @param int &$str_unique Total number of unique strings |
193 | 193 | * @param array &$str_table String Table |
194 | 194 | * @param array &$colors Colour Table |
195 | - * @param mixed $parser The formula parser created for the Workbook |
|
195 | + * @param Parser $parser The formula parser created for the Workbook |
|
196 | + * @param integer $str_total |
|
197 | + * @param integer $str_unique |
|
196 | 198 | */ |
197 | 199 | public function __construct(\PHPExcel\Spreadsheet $phpExcel, &$str_total, &$str_unique, &$str_table, &$colors, $parser) |
198 | 200 | { |
@@ -792,7 +794,7 @@ discard block |
||
792 | 794 | * |
793 | 795 | * @param string $name The name in UTF-8 |
794 | 796 | * @param string $formulaData The binary formula data |
795 | - * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
797 | + * @param integer $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
796 | 798 | * @param boolean $isBuiltIn Built-in name? |
797 | 799 | * @return string Complete binary record data |
798 | 800 | */ |
@@ -200,10 +200,12 @@ discard block |
||
200 | 200 | * @param int &$str_unique Total number of unique strings |
201 | 201 | * @param array &$str_table String Table |
202 | 202 | * @param array &$colors Colour Table |
203 | - * @param mixed $parser The formula parser created for the Workbook |
|
203 | + * @param Parser $parser The formula parser created for the Workbook |
|
204 | 204 | * @param boolean $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
205 | 205 | * @param string $phpSheet The worksheet to write |
206 | 206 | * @param \PHPExcel\Worksheet $phpSheet |
207 | + * @param integer $str_total |
|
208 | + * @param integer $str_unique |
|
207 | 209 | */ |
208 | 210 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
209 | 211 | { |
@@ -614,7 +616,7 @@ discard block |
||
614 | 616 | * @param integer $row Zero indexed row |
615 | 617 | * @param integer $col Zero indexed column |
616 | 618 | * @param float $num The number to write |
617 | - * @param mixed $xfIndex The optional XF format |
|
619 | + * @param integer $xfIndex The optional XF format |
|
618 | 620 | * @return integer |
619 | 621 | */ |
620 | 622 | private function writeNumber($row, $col, $num, $xfIndex) |
@@ -652,7 +654,7 @@ discard block |
||
652 | 654 | * @param int $row Row index (0-based) |
653 | 655 | * @param int $col Column index (0-based) |
654 | 656 | * @param string $str The string |
655 | - * @param mixed $xfIndex The XF format index for the cell |
|
657 | + * @param integer $xfIndex The XF format index for the cell |
|
656 | 658 | * @param array $arrcRun Index to Font record and characters beginning |
657 | 659 | */ |
658 | 660 | private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun) |
@@ -720,7 +722,7 @@ discard block |
||
720 | 722 | * @param integer $row Zero indexed row |
721 | 723 | * @param integer $col Zero indexed column |
722 | 724 | * @param string $str The string to write |
723 | - * @param mixed $xfIndex The XF format index for the cell |
|
725 | + * @param integer $xfIndex The XF format index for the cell |
|
724 | 726 | * @return integer |
725 | 727 | */ |
726 | 728 | private function writeLabelSst($row, $col, $str, $xfIndex) |
@@ -785,7 +787,7 @@ discard block |
||
785 | 787 | * |
786 | 788 | * @param integer $row Zero indexed row |
787 | 789 | * @param integer $col Zero indexed column |
788 | - * @param mixed $xfIndex The XF format index |
|
790 | + * @param integer $xfIndex The XF format index |
|
789 | 791 | */ |
790 | 792 | public function writeBlank($row, $col, $xfIndex) |
791 | 793 | { |
@@ -830,7 +832,7 @@ discard block |
||
830 | 832 | * @param integer $row Zero indexed row |
831 | 833 | * @param integer $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 integer |
836 | 838 | */ |
@@ -2307,8 +2309,8 @@ discard block |
||
2307 | 2309 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2308 | 2310 | * @param integer $x The horizontal position (offset) of the image inside the cell. |
2309 | 2311 | * @param integer $y The vertical position (offset) of the image inside the cell. |
2310 | - * @param float $scale_x The horizontal scale |
|
2311 | - * @param float $scale_y The vertical scale |
|
2312 | + * @param integer $scale_x The horizontal scale |
|
2313 | + * @param integer $scale_y The vertical scale |
|
2312 | 2314 | */ |
2313 | 2315 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2314 | 2316 | { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | /** |
136 | 136 | * Create a new PHPExcel_Writer_HTML |
137 | 137 | * |
138 | - * @param PHPExcel $phpExcel PHPExcel object |
|
138 | + * @param Spreadsheet $phpExcel PHPExcel object |
|
139 | 139 | */ |
140 | 140 | public function __construct(Spreadsheet $phpExcel) |
141 | 141 | { |
@@ -1419,7 +1419,7 @@ discard block |
||
1419 | 1419 | * Set images root |
1420 | 1420 | * |
1421 | 1421 | * @param string $pValue |
1422 | - * @return PHPExcel_Writer_HTML |
|
1422 | + * @return HTML |
|
1423 | 1423 | */ |
1424 | 1424 | public function setImagesRoot($pValue = '.') |
1425 | 1425 | { |
@@ -1440,8 +1440,8 @@ discard block |
||
1440 | 1440 | /** |
1441 | 1441 | * Set embed images |
1442 | 1442 | * |
1443 | - * @param boolean $pValue |
|
1444 | - * @return PHPExcel_Writer_HTML |
|
1443 | + * @param string|boolean $pValue |
|
1444 | + * @return HTML |
|
1445 | 1445 | */ |
1446 | 1446 | public function setEmbedImages($pValue = '.') |
1447 | 1447 | { |
@@ -1463,7 +1463,7 @@ discard block |
||
1463 | 1463 | * Set use inline CSS? |
1464 | 1464 | * |
1465 | 1465 | * @param boolean $pValue |
1466 | - * @return PHPExcel_Writer_HTML |
|
1466 | + * @return HTML |
|
1467 | 1467 | */ |
1468 | 1468 | public function setUseInlineCss($pValue = false) |
1469 | 1469 | { |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * Get writer part |
72 | 72 | * |
73 | 73 | * @param string $pPartName Writer part name |
74 | - * @return \PHPExcel\Writer\Excel2007\WriterPart |
|
74 | + * @return PHPExcel_Writer_OpenDocument_WriterPart|null |
|
75 | 75 | */ |
76 | 76 | public function getWriterPart($pPartName = '') |
77 | 77 | { |
@@ -180,9 +180,9 @@ discard block |
||
180 | 180 | /** |
181 | 181 | * Set PHPExcel object |
182 | 182 | * |
183 | - * @param PHPExcel $pPHPExcel PHPExcel object |
|
183 | + * @param \PHPExcel\Spreadsheet $pPHPExcel PHPExcel object |
|
184 | 184 | * @throws \PHPExcel\Writer\Exception |
185 | - * @return PHPExcel_Writer_Excel2007 |
|
185 | + * @return OpenDocument |
|
186 | 186 | */ |
187 | 187 | public function setPHPExcel(\PHPExcel\SpreadSheet $pPHPExcel = null) |
188 | 188 | { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | /** |
46 | 46 | * Write content.xml to XML format |
47 | 47 | * |
48 | - * @param PHPExcel $pPHPExcel |
|
48 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
49 | 49 | * @return string XML Output |
50 | 50 | * @throws \PHPExcel\Writer\Exception |
51 | 51 | */ |