@@ -76,7 +76,7 @@ |
||
76 | 76 | |
77 | 77 | private $softEdges = [ |
78 | 78 | 'size' => null, |
79 | - ]; |
|
79 | + ]; |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Get Object State |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
498 | 498 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
499 | 499 | ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
500 | - )) { |
|
500 | + )) { |
|
501 | 501 | continue; |
502 | 502 | } |
503 | 503 | |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
510 | 510 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
511 | 511 | ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
512 | - )) { |
|
512 | + )) { |
|
513 | 513 | continue; |
514 | 514 | } |
515 | 515 |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | 'NULL' => null, |
233 | 233 | ]; |
234 | 234 | |
235 | - // PhpSpreadsheet functions |
|
235 | + // PhpSpreadsheet functions |
|
236 | 236 | private static $phpSpreadsheetFunctions = [ |
237 | 237 | 'ABS' => [ |
238 | 238 | 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, |
@@ -3073,13 +3073,13 @@ discard block |
||
3073 | 3073 | $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null; |
3074 | 3074 | |
3075 | 3075 | $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION . |
3076 | - '|' . self::CALCULATION_REGEXP_CELLREF . |
|
3077 | - '|' . self::CALCULATION_REGEXP_NUMBER . |
|
3078 | - '|' . self::CALCULATION_REGEXP_STRING . |
|
3079 | - '|' . self::CALCULATION_REGEXP_OPENBRACE . |
|
3080 | - '|' . self::CALCULATION_REGEXP_NAMEDRANGE . |
|
3081 | - '|' . self::CALCULATION_REGEXP_ERROR . |
|
3082 | - ')/si'; |
|
3076 | + '|' . self::CALCULATION_REGEXP_CELLREF . |
|
3077 | + '|' . self::CALCULATION_REGEXP_NUMBER . |
|
3078 | + '|' . self::CALCULATION_REGEXP_STRING . |
|
3079 | + '|' . self::CALCULATION_REGEXP_OPENBRACE . |
|
3080 | + '|' . self::CALCULATION_REGEXP_NAMEDRANGE . |
|
3081 | + '|' . self::CALCULATION_REGEXP_ERROR . |
|
3082 | + ')/si'; |
|
3083 | 3083 | |
3084 | 3084 | // Start with initialisation |
3085 | 3085 | $index = 0; |
@@ -254,8 +254,8 @@ |
||
254 | 254 | $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex); |
255 | 255 | |
256 | 256 | $escapeEnclosures = ['\\' . $this->enclosure, |
257 | - $this->enclosure . $this->enclosure, |
|
258 | - ]; |
|
257 | + $this->enclosure . $this->enclosure, |
|
258 | + ]; |
|
259 | 259 | |
260 | 260 | // Set our starting row based on whether we're in contiguous mode or not |
261 | 261 | $currentRow = 1; |
@@ -143,40 +143,40 @@ |
||
143 | 143 | */ |
144 | 144 | public static $defaultColumnWidths = [ |
145 | 145 | 'Arial' => [ |
146 | - 1 => ['px' => 24, 'width' => 12.00000000], |
|
147 | - 2 => ['px' => 24, 'width' => 12.00000000], |
|
148 | - 3 => ['px' => 32, 'width' => 10.66406250], |
|
149 | - 4 => ['px' => 32, 'width' => 10.66406250], |
|
150 | - 5 => ['px' => 40, 'width' => 10.00000000], |
|
151 | - 6 => ['px' => 48, 'width' => 9.59765625], |
|
152 | - 7 => ['px' => 48, 'width' => 9.59765625], |
|
153 | - 8 => ['px' => 56, 'width' => 9.33203125], |
|
154 | - 9 => ['px' => 64, 'width' => 9.14062500], |
|
146 | + 1 => ['px' => 24, 'width' => 12.00000000], |
|
147 | + 2 => ['px' => 24, 'width' => 12.00000000], |
|
148 | + 3 => ['px' => 32, 'width' => 10.66406250], |
|
149 | + 4 => ['px' => 32, 'width' => 10.66406250], |
|
150 | + 5 => ['px' => 40, 'width' => 10.00000000], |
|
151 | + 6 => ['px' => 48, 'width' => 9.59765625], |
|
152 | + 7 => ['px' => 48, 'width' => 9.59765625], |
|
153 | + 8 => ['px' => 56, 'width' => 9.33203125], |
|
154 | + 9 => ['px' => 64, 'width' => 9.14062500], |
|
155 | 155 | 10 => ['px' => 64, 'width' => 9.14062500], |
156 | 156 | ], |
157 | 157 | 'Calibri' => [ |
158 | - 1 => ['px' => 24, 'width' => 12.00000000], |
|
159 | - 2 => ['px' => 24, 'width' => 12.00000000], |
|
160 | - 3 => ['px' => 32, 'width' => 10.66406250], |
|
161 | - 4 => ['px' => 32, 'width' => 10.66406250], |
|
162 | - 5 => ['px' => 40, 'width' => 10.00000000], |
|
163 | - 6 => ['px' => 48, 'width' => 9.59765625], |
|
164 | - 7 => ['px' => 48, 'width' => 9.59765625], |
|
165 | - 8 => ['px' => 56, 'width' => 9.33203125], |
|
166 | - 9 => ['px' => 56, 'width' => 9.33203125], |
|
158 | + 1 => ['px' => 24, 'width' => 12.00000000], |
|
159 | + 2 => ['px' => 24, 'width' => 12.00000000], |
|
160 | + 3 => ['px' => 32, 'width' => 10.66406250], |
|
161 | + 4 => ['px' => 32, 'width' => 10.66406250], |
|
162 | + 5 => ['px' => 40, 'width' => 10.00000000], |
|
163 | + 6 => ['px' => 48, 'width' => 9.59765625], |
|
164 | + 7 => ['px' => 48, 'width' => 9.59765625], |
|
165 | + 8 => ['px' => 56, 'width' => 9.33203125], |
|
166 | + 9 => ['px' => 56, 'width' => 9.33203125], |
|
167 | 167 | 10 => ['px' => 64, 'width' => 9.14062500], |
168 | 168 | 11 => ['px' => 64, 'width' => 9.14062500], |
169 | 169 | ], |
170 | 170 | 'Verdana' => [ |
171 | - 1 => ['px' => 24, 'width' => 12.00000000], |
|
172 | - 2 => ['px' => 24, 'width' => 12.00000000], |
|
173 | - 3 => ['px' => 32, 'width' => 10.66406250], |
|
174 | - 4 => ['px' => 32, 'width' => 10.66406250], |
|
175 | - 5 => ['px' => 40, 'width' => 10.00000000], |
|
176 | - 6 => ['px' => 48, 'width' => 9.59765625], |
|
177 | - 7 => ['px' => 48, 'width' => 9.59765625], |
|
178 | - 8 => ['px' => 64, 'width' => 9.14062500], |
|
179 | - 9 => ['px' => 72, 'width' => 9.00000000], |
|
171 | + 1 => ['px' => 24, 'width' => 12.00000000], |
|
172 | + 2 => ['px' => 24, 'width' => 12.00000000], |
|
173 | + 3 => ['px' => 32, 'width' => 10.66406250], |
|
174 | + 4 => ['px' => 32, 'width' => 10.66406250], |
|
175 | + 5 => ['px' => 40, 'width' => 10.00000000], |
|
176 | + 6 => ['px' => 48, 'width' => 9.59765625], |
|
177 | + 7 => ['px' => 48, 'width' => 9.59765625], |
|
178 | + 8 => ['px' => 64, 'width' => 9.14062500], |
|
179 | + 9 => ['px' => 72, 'width' => 9.00000000], |
|
180 | 180 | 10 => ['px' => 72, 'width' => 9.00000000], |
181 | 181 | ], |
182 | 182 | ]; |
@@ -541,12 +541,12 @@ discard block |
||
541 | 541 | |
542 | 542 | // ----- For each file in the list check the attributes |
543 | 543 | $v_supported_attributes = [ |
544 | - PCLZIP_ATT_FILE_NAME => 'mandatory', |
|
545 | - PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional', |
|
546 | - PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional', |
|
547 | - PCLZIP_ATT_FILE_MTIME => 'optional', |
|
548 | - PCLZIP_ATT_FILE_CONTENT => 'optional', |
|
549 | - PCLZIP_ATT_FILE_COMMENT => 'optional', |
|
544 | + PCLZIP_ATT_FILE_NAME => 'mandatory', |
|
545 | + PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional', |
|
546 | + PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional', |
|
547 | + PCLZIP_ATT_FILE_MTIME => 'optional', |
|
548 | + PCLZIP_ATT_FILE_CONTENT => 'optional', |
|
549 | + PCLZIP_ATT_FILE_COMMENT => 'optional', |
|
550 | 550 | ]; |
551 | 551 | foreach ($v_att_list as $v_entry) { |
552 | 552 | $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes); |
@@ -704,25 +704,25 @@ discard block |
||
704 | 704 | if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { |
705 | 705 | // ----- Parse the options |
706 | 706 | $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ |
707 | - PCLZIP_OPT_PATH => 'optional', |
|
708 | - PCLZIP_OPT_REMOVE_PATH => 'optional', |
|
709 | - PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', |
|
710 | - PCLZIP_OPT_ADD_PATH => 'optional', |
|
711 | - PCLZIP_CB_PRE_EXTRACT => 'optional', |
|
712 | - PCLZIP_CB_POST_EXTRACT => 'optional', |
|
713 | - PCLZIP_OPT_SET_CHMOD => 'optional', |
|
714 | - PCLZIP_OPT_BY_NAME => 'optional', |
|
715 | - PCLZIP_OPT_BY_EREG => 'optional', |
|
716 | - PCLZIP_OPT_BY_PREG => 'optional', |
|
717 | - PCLZIP_OPT_BY_INDEX => 'optional', |
|
718 | - PCLZIP_OPT_EXTRACT_AS_STRING => 'optional', |
|
719 | - PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional', |
|
720 | - PCLZIP_OPT_REPLACE_NEWER => 'optional', |
|
721 | - PCLZIP_OPT_STOP_ON_ERROR => 'optional', |
|
722 | - PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional', |
|
723 | - PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', |
|
724 | - PCLZIP_OPT_TEMP_FILE_ON => 'optional', |
|
725 | - PCLZIP_OPT_TEMP_FILE_OFF => 'optional', |
|
707 | + PCLZIP_OPT_PATH => 'optional', |
|
708 | + PCLZIP_OPT_REMOVE_PATH => 'optional', |
|
709 | + PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', |
|
710 | + PCLZIP_OPT_ADD_PATH => 'optional', |
|
711 | + PCLZIP_CB_PRE_EXTRACT => 'optional', |
|
712 | + PCLZIP_CB_POST_EXTRACT => 'optional', |
|
713 | + PCLZIP_OPT_SET_CHMOD => 'optional', |
|
714 | + PCLZIP_OPT_BY_NAME => 'optional', |
|
715 | + PCLZIP_OPT_BY_EREG => 'optional', |
|
716 | + PCLZIP_OPT_BY_PREG => 'optional', |
|
717 | + PCLZIP_OPT_BY_INDEX => 'optional', |
|
718 | + PCLZIP_OPT_EXTRACT_AS_STRING => 'optional', |
|
719 | + PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional', |
|
720 | + PCLZIP_OPT_REPLACE_NEWER => 'optional', |
|
721 | + PCLZIP_OPT_STOP_ON_ERROR => 'optional', |
|
722 | + PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional', |
|
723 | + PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', |
|
724 | + PCLZIP_OPT_TEMP_FILE_ON => 'optional', |
|
725 | + PCLZIP_OPT_TEMP_FILE_OFF => 'optional', |
|
726 | 726 | ]); |
727 | 727 | if ($v_result != 1) { |
728 | 728 | return 0; |
@@ -170,21 +170,21 @@ |
||
170 | 170 | $ret = str_pad($this->Name, 64, "\x00"); |
171 | 171 | |
172 | 172 | $ret .= pack('v', strlen($this->Name) + 2) // 66 |
173 | - . pack('c', $this->Type) // 67 |
|
174 | - . pack('c', 0x00) //UK // 68 |
|
175 | - . pack('V', $this->PrevPps) //Prev // 72 |
|
176 | - . pack('V', $this->NextPps) //Next // 76 |
|
177 | - . pack('V', $this->DirPps) //Dir // 80 |
|
178 | - . "\x00\x09\x02\x00" // 84 |
|
179 | - . "\x00\x00\x00\x00" // 88 |
|
180 | - . "\xc0\x00\x00\x00" // 92 |
|
181 | - . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
182 | - . "\x00\x00\x00\x00" // 100 |
|
183 | - . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
184 | - . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
185 | - . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
186 | - . pack('V', $this->Size) // 124 |
|
187 | - . pack('V', 0); // 128 |
|
173 | + . pack('c', $this->Type) // 67 |
|
174 | + . pack('c', 0x00) //UK // 68 |
|
175 | + . pack('V', $this->PrevPps) //Prev // 72 |
|
176 | + . pack('V', $this->NextPps) //Next // 76 |
|
177 | + . pack('V', $this->DirPps) //Dir // 80 |
|
178 | + . "\x00\x09\x02\x00" // 84 |
|
179 | + . "\x00\x00\x00\x00" // 88 |
|
180 | + . "\xc0\x00\x00\x00" // 92 |
|
181 | + . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
182 | + . "\x00\x00\x00\x00" // 100 |
|
183 | + . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
184 | + . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
185 | + . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
186 | + . pack('V', $this->Size) // 124 |
|
187 | + . pack('V', 0); // 128 |
|
188 | 188 | return $ret; |
189 | 189 | } |
190 | 190 |
@@ -707,8 +707,8 @@ |
||
707 | 707 | ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN |
708 | 708 | : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN; |
709 | 709 | $ruleValues[] = ['operator' => $operator, |
710 | - 'value' => $average, |
|
711 | - ]; |
|
710 | + 'value' => $average, |
|
711 | + ]; |
|
712 | 712 | $columnFilterTests[$columnID] = [ |
713 | 713 | 'method' => 'filterTestInCustomDataSet', |
714 | 714 | 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR], |
@@ -845,11 +845,11 @@ |
||
845 | 845 | $_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex); |
846 | 846 | } elseif ($pColumnIndex < 702) { |
847 | 847 | $_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) . |
848 | - chr(65 + $pColumnIndex % 26); |
|
848 | + chr(65 + $pColumnIndex % 26); |
|
849 | 849 | } else { |
850 | 850 | $_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) . |
851 | - chr(65 + ((($pColumnIndex - 26) % 676) / 26)) . |
|
852 | - chr(65 + $pColumnIndex % 26); |
|
851 | + chr(65 + ((($pColumnIndex - 26) % 676) / 26)) . |
|
852 | + chr(65 + $pColumnIndex % 26); |
|
853 | 853 | } |
854 | 854 | } |
855 | 855 |