@@ -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 | { |
@@ -32,7 +32,7 @@ |
||
32 | 32 | /** |
33 | 33 | * Write Thumbnails/thumbnail.png to PNG format |
34 | 34 | * |
35 | - * @param PHPExcel $pPHPExcel |
|
35 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
36 | 36 | * @return string XML Output |
37 | 37 | * @throws \PHPExcel\Writer\Exception |
38 | 38 | */ |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | * Set Paper Size |
257 | 257 | * |
258 | 258 | * @param string $pValue Paper size |
259 | - * @return PHPExcel_Writer_PDF |
|
259 | + * @return Core |
|
260 | 260 | */ |
261 | 261 | public function setPaperSize($pValue = \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER) |
262 | 262 | { |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * Set Orientation |
279 | 279 | * |
280 | 280 | * @param string $pValue Page orientation |
281 | - * @return PHPExcel_Writer_PDF |
|
281 | + * @return Core |
|
282 | 282 | */ |
283 | 283 | public function setOrientation($pValue = \PHPExcel\Worksheet\PageSetup::ORIENTATION_DEFAULT) |
284 | 284 | { |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * |
302 | 302 | * @param string $pValue Temporary storage directory |
303 | 303 | * @throws \PHPExcel\Writer\Exception when directory does not exist |
304 | - * @return PHPExcel_Writer_PDF |
|
304 | + * @return Core |
|
305 | 305 | */ |
306 | 306 | public function setTempDir($pValue = '') |
307 | 307 | { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | /** |
113 | 113 | * Set the Default timezone to use for dates |
114 | 114 | * |
115 | - * @param string|\DateTimeZone $timezone The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions |
|
115 | + * @param string|\DateTimeZone $timeZone The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions |
|
116 | 116 | * @return boolean Success or failure |
117 | 117 | * @throws \Exception |
118 | 118 | */ |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | /** |
142 | 142 | * Validate a timezone |
143 | 143 | * |
144 | - * @param string|\DateTimeZone $timezone The timezone to validate, either as a timezone string or object |
|
144 | + * @param string|\DateTimeZone $timeZone The timezone to validate, either as a timezone string or object |
|
145 | 145 | * @return \DateTimeZone The timezone as a timezone object |
146 | 146 | * @throws \Exception |
147 | 147 | */ |
@@ -158,8 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Convert a MS serialized datetime value from Excel to a PHP Date/Time object |
160 | 160 | * |
161 | - * @param integer|float $dateValue Excel date/time value |
|
162 | - * @param \DateTimeZone|string|null $timezone The timezone to assume for the Excel timestamp, |
|
161 | + * @param \DateTimeZone|string|null $timeZone The timezone to assume for the Excel timestamp, |
|
163 | 162 | * if you don't want to treat it as a UTC value |
164 | 163 | * @return \DateTime PHP date/time object |
165 | 164 | * @throws \Exception |
@@ -189,8 +188,7 @@ discard block |
||
189 | 188 | /** |
190 | 189 | * Convert a MS serialized datetime value from Excel to a unix timestamp |
191 | 190 | * |
192 | - * @param integer|float $dateValue Excel date/time value |
|
193 | - * @return integer Unix timetamp for this date/time |
|
191 | + * @return string Unix timetamp for this date/time |
|
194 | 192 | * @throws \Exception |
195 | 193 | */ |
196 | 194 | public static function excelToTimestamp($excelTimestamp = 0, $timeZone = null) |
@@ -203,7 +201,7 @@ discard block |
||
203 | 201 | /** |
204 | 202 | * Convert a date from PHP to Excel |
205 | 203 | * |
206 | - * @param mixed $dateValue PHP serialized date/time or date object |
|
204 | + * @param integer $dateValue PHP serialized date/time or date object |
|
207 | 205 | * @param boolean $adjustToTimezone Flag indicating whether $dateValue should be treated as |
208 | 206 | * a UST timestamp, or adjusted to UST |
209 | 207 | * @param string $timezone The timezone for finding the adjustment from UST |
@@ -244,7 +242,7 @@ discard block |
||
244 | 242 | * @param integer $hours |
245 | 243 | * @param integer $minutes |
246 | 244 | * @param integer $seconds |
247 | - * @return integer Excel date/time value |
|
245 | + * @return double Excel date/time value |
|
248 | 246 | */ |
249 | 247 | public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0) |
250 | 248 | { |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * Set Row Height |
103 | 103 | * |
104 | - * @param double $pValue |
|
104 | + * @param integer $pValue |
|
105 | 105 | * @return RowDimension |
106 | 106 | */ |
107 | 107 | public function setRowHeight($pValue = -1) |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * Set Row Height |
103 | 103 | * |
104 | - * @param double $pValue |
|
104 | + * @param integer $pValue |
|
105 | 105 | * @return RowDimension |
106 | 106 | */ |
107 | 107 | public function setRowHeight($pValue = -1) |