@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * Calculate an (approximate) OpenXML column width, based on font size and text contained |
238 | 238 | * |
239 | 239 | * @param \PhpSpreadsheet\Style\Font $font Font object |
240 | - * @param \PhpSpreadsheet\RichText|string $cellText Text to calculate width |
|
240 | + * @param string $cellText Text to calculate width |
|
241 | 241 | * @param integer $rotation Rotation angle |
242 | 242 | * @param \PhpSpreadsheet\Style\Font|NULL $defaultFont Font object |
243 | 243 | * @return integer Column width |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | * Calculate an (approximate) pixel size, based on centimeter size |
407 | 407 | * |
408 | 408 | * @param int $sizeInCm Font size (in centimeters) |
409 | - * @return int Size (in pixels) |
|
409 | + * @return double Size (in pixels) |
|
410 | 410 | */ |
411 | 411 | public static function centimeterSizeToPixels($sizeInCm = 1) |
412 | 412 | { |
@@ -417,6 +417,7 @@ discard block |
||
417 | 417 | * Returns the font path given the font |
418 | 418 | * |
419 | 419 | * @param \PhpSpreadsheet\Style\Font |
420 | + * @param \PhpSpreadsheet\Style\Font $font |
|
420 | 421 | * @return string Path to TrueType font file |
421 | 422 | */ |
422 | 423 | public static function getTrueTypeFontFileFromFont($font) |
@@ -147,7 +147,7 @@ |
||
147 | 147 | /** |
148 | 148 | * Get parent. Only used for style supervisor |
149 | 149 | * |
150 | - * @return PhpSpreadsheet |
|
150 | + * @return Style |
|
151 | 151 | */ |
152 | 152 | public function getParent() |
153 | 153 | { |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | /** |
329 | 329 | * Create a new worksheet |
330 | 330 | * |
331 | - * @param Spreadsheet $Parent |
|
331 | + * @param Spreadsheet $parent |
|
332 | 332 | * @param string $pTitle |
333 | 333 | */ |
334 | 334 | public function __construct(Spreadsheet $parent = null, $pTitle = 'Worksheet') |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | * Get a chart by its index position |
586 | 586 | * |
587 | 587 | * @param string $index Chart index position |
588 | - * @return false|Chart |
|
588 | + * @return null|Chart |
|
589 | 589 | * @throws Exception |
590 | 590 | */ |
591 | 591 | public function getChartByIndex($index = null) |
@@ -767,7 +767,7 @@ discard block |
||
767 | 767 | /** |
768 | 768 | * Get parent |
769 | 769 | * |
770 | - * @return PhpSpreadsheet |
|
770 | + * @return Spreadsheet |
|
771 | 771 | */ |
772 | 772 | public function getParent() |
773 | 773 | { |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | * Set a cell value |
1078 | 1078 | * |
1079 | 1079 | * @param string $pCoordinate Coordinate of the cell |
1080 | - * @param mixed $pValue Value of the cell |
|
1080 | + * @param integer $pValue Value of the cell |
|
1081 | 1081 | * @param bool $returnCell Return the worksheet (false, default) or the cell (true) |
1082 | 1082 | * @return Worksheet|Cell Depending on the last parameter being specified |
1083 | 1083 | */ |
@@ -1090,8 +1090,8 @@ discard block |
||
1090 | 1090 | /** |
1091 | 1091 | * Set a cell value by using numeric cell coordinates |
1092 | 1092 | * |
1093 | - * @param string $pColumn Numeric column coordinate of the cell (A = 0) |
|
1094 | - * @param string $pRow Numeric row coordinate of the cell |
|
1093 | + * @param integer $pColumn Numeric column coordinate of the cell (A = 0) |
|
1094 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1095 | 1095 | * @param mixed $pValue Value of the cell |
1096 | 1096 | * @param bool $returnCell Return the worksheet (false, default) or the cell (true) |
1097 | 1097 | * @return Worksheet|Cell Depending on the last parameter being specified |
@@ -1121,8 +1121,8 @@ discard block |
||
1121 | 1121 | /** |
1122 | 1122 | * Set a cell value by using numeric cell coordinates |
1123 | 1123 | * |
1124 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1125 | - * @param string $pRow Numeric row coordinate of the cell |
|
1124 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1125 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1126 | 1126 | * @param mixed $pValue Value of the cell |
1127 | 1127 | * @param string $pDataType Explicit data type |
1128 | 1128 | * @param bool $returnCell Return the worksheet (false, default) or the cell (true) |
@@ -1182,8 +1182,8 @@ discard block |
||
1182 | 1182 | /** |
1183 | 1183 | * Get cell at a specific coordinate by using numeric cell coordinates |
1184 | 1184 | * |
1185 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1186 | - * @param string $pRow Numeric row coordinate of the cell |
|
1185 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1186 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1187 | 1187 | * @param boolean $createIfNotExists Flag indicating whether a new cell should be created if it doesn't |
1188 | 1188 | * already exist, or a null should be returned instead |
1189 | 1189 | * @return null|Cell Cell that was found/created or null |
@@ -1290,8 +1290,8 @@ discard block |
||
1290 | 1290 | /** |
1291 | 1291 | * Cell at a specific coordinate by using numeric cell coordinates exists? |
1292 | 1292 | * |
1293 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1294 | - * @param string $pRow Numeric row coordinate of the cell |
|
1293 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1294 | + * @param integer $pRow Numeric row coordinate of the cell |
|
1295 | 1295 | * @return boolean |
1296 | 1296 | */ |
1297 | 1297 | public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1) |
@@ -1350,7 +1350,7 @@ discard block |
||
1350 | 1350 | /** |
1351 | 1351 | * Get column dimension at a specific column by using numeric cell coordinates |
1352 | 1352 | * |
1353 | - * @param string $pColumn Numeric column coordinate of the cell |
|
1353 | + * @param integer $pColumn Numeric column coordinate of the cell |
|
1354 | 1354 | * @return Worksheet\ColumnDimension |
1355 | 1355 | */ |
1356 | 1356 | public function getColumnDimensionByColumn($pColumn = 0) |
@@ -1471,7 +1471,7 @@ discard block |
||
1471 | 1471 | /** |
1472 | 1472 | * Set conditional styles |
1473 | 1473 | * |
1474 | - * @param $pCoordinate string E.g. 'A1' |
|
1474 | + * @param string $pCoordinate string E.g. 'A1' |
|
1475 | 1475 | * @param $pValue Style\Conditional[] |
1476 | 1476 | * @return Worksheet |
1477 | 1477 | */ |
@@ -1892,7 +1892,7 @@ discard block |
||
1892 | 1892 | /** |
1893 | 1893 | * Set AutoFilter |
1894 | 1894 | * |
1895 | - * @param Worksheet\AutoFilter|string $pValue |
|
1895 | + * @param string $pValue |
|
1896 | 1896 | * A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility |
1897 | 1897 | * @throws Exception |
1898 | 1898 | * @return Worksheet |
@@ -2902,7 +2902,7 @@ discard block |
||
2902 | 2902 | * Define the code name of the sheet |
2903 | 2903 | * |
2904 | 2904 | * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore) |
2905 | - * @return objWorksheet |
|
2905 | + * @return Worksheet |
|
2906 | 2906 | * @throws Exception |
2907 | 2907 | */ |
2908 | 2908 | public function setCodeName($pValue = null) |
@@ -285,7 +285,7 @@ |
||
285 | 285 | * |
286 | 286 | * @param string $pRuleType |
287 | 287 | * @throws \PhpSpreadsheet\Exception |
288 | - * @return \PhpSpreadsheet\Worksheet\AutoFilter\Column |
|
288 | + * @return Rule |
|
289 | 289 | */ |
290 | 290 | public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) |
291 | 291 | { |
@@ -135,7 +135,7 @@ |
||
135 | 135 | /** |
136 | 136 | * Return the current cell in this worksheet column |
137 | 137 | * |
138 | - * @return Row |
|
138 | + * @return null|\PhpSpreadsheet\Cell |
|
139 | 139 | */ |
140 | 140 | public function current() |
141 | 141 | { |
@@ -229,7 +229,7 @@ |
||
229 | 229 | /** |
230 | 230 | * Set Color |
231 | 231 | * |
232 | - * @param \PhpSpreadsheet\Style_Color $pValue |
|
232 | + * @param \PhpSpreadsheet\Style\Color $pValue |
|
233 | 233 | * @throws \PhpSpreadsheet\Exception |
234 | 234 | * @return Shadow |
235 | 235 | */ |
@@ -311,7 +311,7 @@ |
||
311 | 311 | /** |
312 | 312 | * Write line to CSV file |
313 | 313 | * |
314 | - * @param mixed $pFileHandle PHP filehandle |
|
314 | + * @param resource $pFileHandle PHP filehandle |
|
315 | 315 | * @param array $pValues Array containing values in a row |
316 | 316 | * @throws Exception |
317 | 317 | */ |
@@ -411,6 +411,8 @@ discard block |
||
411 | 411 | * @param string $id1 |
412 | 412 | * @param string $id2 |
413 | 413 | * @param boolean $isMultiLevelSeries |
414 | + * @param null|Axis $xAxis |
|
415 | + * @param null|Axis $yAxis |
|
414 | 416 | * |
415 | 417 | * @throws \PhpSpreadsheet\Writer\Exception |
416 | 418 | */ |
@@ -533,6 +535,10 @@ discard block |
||
533 | 535 | * @param string $id1 |
534 | 536 | * @param string $id2 |
535 | 537 | * @param boolean $isMultiLevelSeries |
538 | + * @param null|Axis $xAxis |
|
539 | + * @param null|Axis $yAxis |
|
540 | + * @param null|GridLines $majorGridlines |
|
541 | + * @param null|GridLines $minorGridlines |
|
536 | 542 | * |
537 | 543 | * @throws \PhpSpreadsheet\Writer\Exception |
538 | 544 | */ |
@@ -1259,7 +1265,6 @@ discard block |
||
1259 | 1265 | * @param \PhpSpreadsheet\Shared\XMLWriter $objWriter XML Writer |
1260 | 1266 | * @param string $groupType Type of plot for dataseries |
1261 | 1267 | * @param string $dataType Datatype of series values |
1262 | - * @param \PhpSpreadsheet\Worksheet $pSheet |
|
1263 | 1268 | * |
1264 | 1269 | * @throws \PhpSpreadsheet\Writer\Exception |
1265 | 1270 | */ |
@@ -191,7 +191,9 @@ discard block |
||
191 | 191 | * @param int &$str_unique Total number of unique strings |
192 | 192 | * @param array &$str_table String Table |
193 | 193 | * @param array &$colors Colour Table |
194 | - * @param mixed $parser The formula parser created for the Workbook |
|
194 | + * @param Parser $parser The formula parser created for the Workbook |
|
195 | + * @param integer $str_total |
|
196 | + * @param integer $str_unique |
|
195 | 197 | */ |
196 | 198 | public function __construct(\PhpSpreadsheet\Spreadsheet $spreadsheet, &$str_total, &$str_unique, &$str_table, &$colors, $parser) |
197 | 199 | { |
@@ -238,6 +240,7 @@ discard block |
||
238 | 240 | * |
239 | 241 | * @param \PhpSpreadsheet\Style |
240 | 242 | * @param boolean Is it a style XF? |
243 | + * @param \PhpSpreadsheet\Style $style |
|
241 | 244 | * @return int Index to XF record |
242 | 245 | */ |
243 | 246 | public function addXfWriter($style, $isStyleXf = false) |
@@ -790,7 +793,7 @@ discard block |
||
790 | 793 | * |
791 | 794 | * @param string $name The name in UTF-8 |
792 | 795 | * @param string $formulaData The binary formula data |
793 | - * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
796 | + * @param integer $sheetIndex 1-based sheet index the defined name applies to. 0 = global |
|
794 | 797 | * @param boolean $isBuiltIn Built-in name? |
795 | 798 | * @return string Complete binary record data |
796 | 799 | */ |