@@ -35,13 +35,13 @@ |
||
35 | 35 | $set6 = [0, $dataArray3, '=IF(A1+B1>3,C1,0)', 'E5']; |
36 | 36 | |
37 | 37 | $dataArray4 = [ |
38 | - ['noflag', 0, 0], |
|
39 | - [127000, 0, 0], |
|
40 | - [10000, 0.03, 0], |
|
41 | - [20000, 0.06, 0], |
|
42 | - [40000, 0.09, 0], |
|
43 | - [70000, 0.12, 0], |
|
44 | - [90000, 0.03, 0], |
|
38 | + ['noflag', 0, 0], |
|
39 | + [127000, 0, 0], |
|
40 | + [10000, 0.03, 0], |
|
41 | + [20000, 0.06, 0], |
|
42 | + [40000, 0.09, 0], |
|
43 | + [70000, 0.12, 0], |
|
44 | + [90000, 0.03, 0], |
|
45 | 45 | ]; |
46 | 46 | $formula2 = '=IF(A1="flag",IF(A2<10, 0) + IF(A3<10000, 0))'; |
47 | 47 | $set7 = [false, $dataArray4, $formula2, 'E5']; |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | ], |
18 | 18 | [ |
19 | 19 | [ |
20 | - [30, 36, 42], |
|
21 | - [66, 81, 96], |
|
20 | + [30, 36, 42], |
|
21 | + [66, 81, 96], |
|
22 | 22 | [102, 126, 150], |
23 | 23 | ], |
24 | 24 | [ |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | ], |
63 | 63 | [ |
64 | 64 | [ |
65 | - [62.00, 49.46], |
|
65 | + [62.00, 49.46], |
|
66 | 66 | [176.40, 144.50], |
67 | 67 | ], |
68 | 68 | [ |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - [ // Office reference example #1 |
|
4 | + [// Office reference example #1 |
|
5 | 5 | 'orange', |
6 | 6 | 4.19, |
7 | 7 | [ |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | ['blue'], |
20 | 20 | ], |
21 | 21 | ], |
22 | - [ // Office reference example #2 |
|
22 | + [// Office reference example #2 |
|
23 | 23 | 'yellow', |
24 | 24 | 5.75, |
25 | 25 | [ |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | ['blue'], |
38 | 38 | ], |
39 | 39 | ], |
40 | - [ // Office reference example #3 |
|
40 | + [// Office reference example #3 |
|
41 | 41 | 'blue', |
42 | 42 | 7.66, |
43 | 43 | [ |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | ['blue'], |
56 | 56 | ], |
57 | 57 | ], |
58 | - [ // Office reference example #4 |
|
58 | + [// Office reference example #4 |
|
59 | 59 | '#N/A', |
60 | 60 | 0, |
61 | 61 | [ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ['blue'], |
74 | 74 | ], |
75 | 75 | ], |
76 | - [ // Array form test |
|
76 | + [// Array form test |
|
77 | 77 | 'orange', |
78 | 78 | 4.2, |
79 | 79 | [ |
@@ -94,7 +94,7 @@ |
||
94 | 94 | [8, 8, 3, 2], |
95 | 95 | -1, |
96 | 96 | ], |
97 | - [ // Default matchtype |
|
97 | + [// Default matchtype |
|
98 | 98 | 4, // Expected |
99 | 99 | 4, // Input |
100 | 100 | [2, 0, 0, 3], |
@@ -30,7 +30,7 @@ |
||
30 | 30 | Fill::FILL_PATTERN_GRAY125 => 0x11, |
31 | 31 | Fill::FILL_PATTERN_GRAY0625 => 0x12, |
32 | 32 | Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8 |
33 | - Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8 |
|
33 | + Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8 |
|
34 | 34 | ]; |
35 | 35 | |
36 | 36 | public static function style(Fill $fill): int |
@@ -457,32 +457,32 @@ |
||
457 | 457 | } |
458 | 458 | |
459 | 459 | private const PROPERTY_TYPE_ARRAY = [ |
460 | - 'i' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
461 | - 'i1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Signed Integer |
|
462 | - 'i2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Signed Integer |
|
463 | - 'i4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Signed Integer |
|
464 | - 'i8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Signed Integer |
|
465 | - 'int' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
466 | - 'ui1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Unsigned Integer |
|
467 | - 'ui2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Unsigned Integer |
|
468 | - 'ui4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Unsigned Integer |
|
469 | - 'ui8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Unsigned Integer |
|
470 | - 'uint' => self::PROPERTY_TYPE_INTEGER, // Unsigned Integer |
|
471 | - 'f' => self::PROPERTY_TYPE_FLOAT, // Real Number |
|
472 | - 'r4' => self::PROPERTY_TYPE_FLOAT, // 4-Byte Real Number |
|
473 | - 'r8' => self::PROPERTY_TYPE_FLOAT, // 8-Byte Real Number |
|
474 | - 'decimal' => self::PROPERTY_TYPE_FLOAT, // Decimal |
|
475 | - 's' => self::PROPERTY_TYPE_STRING, // String |
|
476 | - 'empty' => self::PROPERTY_TYPE_STRING, // Empty |
|
477 | - 'null' => self::PROPERTY_TYPE_STRING, // Null |
|
478 | - 'lpstr' => self::PROPERTY_TYPE_STRING, // LPSTR |
|
479 | - 'lpwstr' => self::PROPERTY_TYPE_STRING, // LPWSTR |
|
480 | - 'bstr' => self::PROPERTY_TYPE_STRING, // Basic String |
|
481 | - 'd' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
482 | - 'date' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
483 | - 'filetime' => self::PROPERTY_TYPE_DATE, // File Time |
|
484 | - 'b' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
485 | - 'bool' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
460 | + 'i' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
461 | + 'i1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Signed Integer |
|
462 | + 'i2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Signed Integer |
|
463 | + 'i4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Signed Integer |
|
464 | + 'i8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Signed Integer |
|
465 | + 'int' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
466 | + 'ui1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Unsigned Integer |
|
467 | + 'ui2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Unsigned Integer |
|
468 | + 'ui4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Unsigned Integer |
|
469 | + 'ui8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Unsigned Integer |
|
470 | + 'uint' => self::PROPERTY_TYPE_INTEGER, // Unsigned Integer |
|
471 | + 'f' => self::PROPERTY_TYPE_FLOAT, // Real Number |
|
472 | + 'r4' => self::PROPERTY_TYPE_FLOAT, // 4-Byte Real Number |
|
473 | + 'r8' => self::PROPERTY_TYPE_FLOAT, // 8-Byte Real Number |
|
474 | + 'decimal' => self::PROPERTY_TYPE_FLOAT, // Decimal |
|
475 | + 's' => self::PROPERTY_TYPE_STRING, // String |
|
476 | + 'empty' => self::PROPERTY_TYPE_STRING, // Empty |
|
477 | + 'null' => self::PROPERTY_TYPE_STRING, // Null |
|
478 | + 'lpstr' => self::PROPERTY_TYPE_STRING, // LPSTR |
|
479 | + 'lpwstr' => self::PROPERTY_TYPE_STRING, // LPWSTR |
|
480 | + 'bstr' => self::PROPERTY_TYPE_STRING, // Basic String |
|
481 | + 'd' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
482 | + 'date' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
483 | + 'filetime' => self::PROPERTY_TYPE_DATE, // File Time |
|
484 | + 'b' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
485 | + 'bool' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
486 | 486 | ]; |
487 | 487 | |
488 | 488 | private const SPECIAL_TYPES = [ |
@@ -51,7 +51,7 @@ |
||
51 | 51 | ], |
52 | 52 | [ |
53 | 53 | -30879.0, |
54 | - '1815-06-15', // Dates outside the Excel Range should fail really |
|
54 | + '1815-06-15', // Dates outside the Excel Range should fail really |
|
55 | 55 | DataType::TYPE_ISO_DATE, |
56 | 56 | ], |
57 | 57 | [ |
@@ -172,8 +172,7 @@ |
||
172 | 172 | // Initialise values |
173 | 173 | $this->setShadow(); |
174 | 174 | |
175 | - // Set image index |
|
176 | - ++self::$imageCounter; |
|
175 | + // Set image index++self::$imageCounter; |
|
177 | 176 | $this->imageIndex = self::$imageCounter; |
178 | 177 | } |
179 | 178 |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $hasCalculatedValue = true; |
267 | 267 | } |
268 | 268 | |
269 | - private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void |
|
269 | + private function processCRecord(array $rowData, Spreadsheet & $spreadsheet, string &$row, string &$column): void |
|
270 | 270 | { |
271 | 271 | // Read cell value data |
272 | 272 | $hasCalculatedValue = false; |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row"); |
310 | 310 | } |
311 | 311 | |
312 | - private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate): void |
|
312 | + private function processCFinal(Spreadsheet & $spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate): void |
|
313 | 313 | { |
314 | 314 | // Set cell value |
315 | 315 | $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData); |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | } |
320 | 320 | } |
321 | 321 | |
322 | - private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void |
|
322 | + private function processFRecord(array $rowData, Spreadsheet & $spreadsheet, string &$row, string &$column): void |
|
323 | 323 | { |
324 | 324 | // Read cell formatting |
325 | 325 | $formatStyle = $columnWidth = ''; |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | } |
388 | 388 | } |
389 | 389 | |
390 | - private function addFormats(Spreadsheet &$spreadsheet, string $formatStyle, string $row, string $column): void |
|
390 | + private function addFormats(Spreadsheet & $spreadsheet, string $formatStyle, string $row, string $column): void |
|
391 | 391 | { |
392 | 392 | if ($formatStyle && $column > '' && $row > '') { |
393 | 393 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | } |
398 | 398 | } |
399 | 399 | |
400 | - private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $row, string $column): void |
|
400 | + private function addFonts(Spreadsheet & $spreadsheet, string $fontStyle, string $row, string $column): void |
|
401 | 401 | { |
402 | 402 | if ($fontStyle && $column > '' && $row > '') { |
403 | 403 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | } |
408 | 408 | } |
409 | 409 | |
410 | - private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void |
|
410 | + private function addStyle(Spreadsheet & $spreadsheet, array $styleData, string $row, string $column): void |
|
411 | 411 | { |
412 | 412 | if ((!empty($styleData)) && $column > '' && $row > '') { |
413 | 413 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | } |
433 | 433 | } |
434 | 434 | |
435 | - private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void |
|
435 | + private function processPRecord(array $rowData, Spreadsheet & $spreadsheet): void |
|
436 | 436 | { |
437 | 437 | // Read shared styles |
438 | 438 | $formatArray = []; |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | } |
486 | 486 | } |
487 | 487 | |
488 | - private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): void |
|
488 | + private function processPFinal(Spreadsheet & $spreadsheet, array $formatArray): void |
|
489 | 489 | { |
490 | 490 | if (array_key_exists('numberFormat', $formatArray)) { |
491 | 491 | $this->formats['P' . $this->format] = $formatArray; |