@@ -1176,8 +1176,8 @@ |
||
1176 | 1176 | $objWriter->startElement('c:numFmt'); |
1177 | 1177 | $objWriter->writeAttribute('formatCode', 'General'); |
1178 | 1178 | $objWriter->writeAttribute('sourceLinked', '0'); |
1179 | - $objWriter->endElement(); // numFmt |
|
1180 | - $objWriter->endElement(); // trendlineLbl |
|
1179 | + $objWriter->endElement(); // numFmt |
|
1180 | + $objWriter->endElement(); // trendlineLbl |
|
1181 | 1181 | } |
1182 | 1182 | |
1183 | 1183 | $objWriter->endElement(); // trendline |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | true, // plotVisibleOnly |
156 | 156 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
157 | 157 | null, // xAxisLabel |
158 | - $yAxisLabel, // yAxisLabel |
|
158 | + $yAxisLabel, // yAxisLabel |
|
159 | 159 | // added xAxis for correct date display |
160 | 160 | $xAxis, // xAxis |
161 | 161 | // $yAxis, // yAxis |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | true, // plotVisibleOnly |
252 | 252 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
253 | 253 | null, // xAxisLabel |
254 | - $yAxisLabel, // yAxisLabel |
|
254 | + $yAxisLabel, // yAxisLabel |
|
255 | 255 | // added xAxis for correct date display |
256 | 256 | $xAxis, // xAxis |
257 | 257 | // $yAxis, // yAxis |
@@ -129,7 +129,7 @@ |
||
129 | 129 | |
130 | 130 | $yAxis = new ChartAxis(); |
131 | 131 | $yAxis->setLineStyleProperties( |
132 | - 2.5, // width in points |
|
132 | + 2.5, // width in points |
|
133 | 133 | Properties::LINE_STYLE_COMPOUND_SIMPLE, |
134 | 134 | Properties::LINE_STYLE_DASH_DASH_DOT, |
135 | 135 | Properties::LINE_STYLE_CAP_FLAT, |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | $yAxis = new ChartAxis(); |
130 | 130 | $yAxis->setLineStyleProperties( |
131 | - 2.5, // width in points |
|
131 | + 2.5, // width in points |
|
132 | 132 | Properties::LINE_STYLE_COMPOUND_SIMPLE, |
133 | 133 | Properties::LINE_STYLE_DASH_DASH_DOT, |
134 | 134 | Properties::LINE_STYLE_CAP_FLAT, |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | true, // plotVisibleOnly |
167 | 167 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
168 | 168 | null, // xAxisLabel |
169 | - $yAxisLabel, // yAxisLabel |
|
169 | + $yAxisLabel, // yAxisLabel |
|
170 | 170 | // added xAxis for correct date display |
171 | 171 | $xAxis, // xAxis |
172 | 172 | $yAxis, // yAxis |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | true, // plotVisibleOnly |
182 | 182 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
183 | 183 | null, // xAxisLabel |
184 | - $yAxisLabel, // yAxisLabel |
|
184 | + $yAxisLabel, // yAxisLabel |
|
185 | 185 | // added xAxis for correct date display |
186 | 186 | $xAxis, // xAxis |
187 | 187 | $yAxis, // yAxis |
@@ -291,13 +291,13 @@ discard block |
||
291 | 291 | null, // minor_tick_mark |
292 | 292 | $dateMinMax['min'], // minimum calculate this from the earliest data: 'Data!$A$2' |
293 | 293 | $dateMinMax['max'], // maximum calculate this from the last data: 'Data!$A$'.($nrows+1) |
294 | - $tickMarkInterval, // majorUnit determines tickmarks & Gridlines ? |
|
294 | + $tickMarkInterval, // majorUnit determines tickmarks & Gridlines ? |
|
295 | 295 | null, // minorUnit |
296 | 296 | null, // textRotation |
297 | 297 | null, // hidden |
298 | 298 | 'days', // baseTimeUnit |
299 | 299 | 'months', // majorTimeUnit, |
300 | - 'months', // minorTimeUnit |
|
300 | + 'months', // minorTimeUnit |
|
301 | 301 | ); |
302 | 302 | |
303 | 303 | $yAxisLabel = new Title('Value ($k)'); |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | true, // plotVisibleOnly |
318 | 318 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
319 | 319 | null, // xAxisLabel |
320 | - $yAxisLabel, // yAxisLabel |
|
320 | + $yAxisLabel, // yAxisLabel |
|
321 | 321 | // added xAxis for correct date display |
322 | 322 | $xAxis, // xAxis |
323 | 323 | $yAxis, // yAxis |
@@ -116,8 +116,8 @@ |
||
116 | 116 | true, // plotVisibleOnly |
117 | 117 | DataSeries::EMPTY_AS_GAP, // displayBlanksAs |
118 | 118 | null, // xAxisLabel |
119 | - $yAxisLabel, // yAxisLabel |
|
120 | - $xAxis, // xAxis |
|
119 | + $yAxisLabel, // yAxisLabel |
|
120 | + $xAxis, // xAxis |
|
121 | 121 | $yAxis // yAxis |
122 | 122 | ); |
123 | 123 |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | ["[\$€-fy-NL]\u{a0}#,##0.00;[\$€-fy-NL]\u{a0}#,##0.00-", '€', 'fy-NL'], // Trailing negative |
68 | 68 | ["[\$€-nl-NL]\u{a0}#,##0.00;[\$€-nl-NL]\u{a0}-#,##0.00", '€', 'nl-NL'], // Sign between currency and value |
69 | 69 | ["[\$€-nl-BE]\u{a0}#,##0.00;[\$€-nl-BE]\u{a0}-#,##0.00", '€', 'NL-BE'], // Sign between currency and value |
70 | - ["#,##0.00\u{a0}[\$€-fr-BE]", '€', 'fr-be'], // Trailing currency code |
|
71 | - ["#,##0.00\u{a0}[\$€-el-GR]", '€', 'el-gr'], // Trailing currency code |
|
70 | + ["#,##0.00\u{a0}[\$€-fr-BE]", '€', 'fr-be'], // Trailing currency code |
|
71 | + ["#,##0.00\u{a0}[\$€-el-GR]", '€', 'el-gr'], // Trailing currency code |
|
72 | 72 | ['[$$-en-CA]#,##0.00', '$', 'en-ca'], |
73 | - ["#,##0.00\u{a0}[\$\$-fr-CA]", '$', 'fr-ca'], // Trailing currency code |
|
73 | + ["#,##0.00\u{a0}[\$\$-fr-CA]", '$', 'fr-ca'], // Trailing currency code |
|
74 | 74 | ['[$¥-ja-JP]#,##0', '¥', 'ja-JP'], // No decimals |
75 | - ["#,##0.000\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals |
|
75 | + ["#,##0.000\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals |
|
76 | 76 | ]; |
77 | 77 | } |
78 | 78 | |
@@ -130,12 +130,12 @@ discard block |
||
130 | 130 | ["[\$€-fy-NL]\u{a0}#,##0;[\$€-fy-NL]\u{a0}#,##0-", '€', 'fy-NL'], // Trailing negative |
131 | 131 | ["[\$€-nl-NL]\u{a0}#,##0;[\$€-nl-NL]\u{a0}-#,##0", '€', 'nl-NL'], // Sign between currency and value |
132 | 132 | ["[\$€-nl-BE]\u{a0}#,##0;[\$€-nl-BE]\u{a0}-#,##0", '€', 'NL-BE'], // Sign between currency and value |
133 | - ["#,##0\u{a0}[\$€-fr-BE]", '€', 'fr-be'], // Trailing currency code |
|
134 | - ["#,##0\u{a0}[\$€-el-GR]", '€', 'el-gr'], // Trailing currency code |
|
133 | + ["#,##0\u{a0}[\$€-fr-BE]", '€', 'fr-be'], // Trailing currency code |
|
134 | + ["#,##0\u{a0}[\$€-el-GR]", '€', 'el-gr'], // Trailing currency code |
|
135 | 135 | ['[$$-en-CA]#,##0', '$', 'en-ca'], |
136 | - ["#,##0\u{a0}[\$\$-fr-CA]", '$', 'fr-ca'], // Trailing currency code |
|
136 | + ["#,##0\u{a0}[\$\$-fr-CA]", '$', 'fr-ca'], // Trailing currency code |
|
137 | 137 | ['[$¥-ja-JP]#,##0', '¥', 'ja-JP'], // No decimals to truncate |
138 | - ["#,##0\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals truncated to none |
|
138 | + ["#,##0\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals truncated to none |
|
139 | 139 | ]; |
140 | 140 | } |
141 | 141 |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | ['[$$-en-CA]#,##0.00;([$$-en-CA]#,##0.00)', '$', 'en-ca'], |
73 | 73 | ["#,##0.00\u{a0}[\$\$-fr-CA];(#,##0.00\u{a0}[\$\$-fr-CA])", '$', 'fr-ca'], |
74 | 74 | ['[$¥-ja-JP]#,##0;([$¥-ja-JP]#,##0)', '¥', 'ja-JP'], // No decimals |
75 | - ["#,##0.000\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals |
|
75 | + ["#,##0.000\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals |
|
76 | 76 | ]; |
77 | 77 | } |
78 | 78 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | ['[$$-en-CA]#,##0;([$$-en-CA]#,##0)', '$', 'en-ca'], |
136 | 136 | ["#,##0\u{a0}[\$\$-fr-CA];(#,##0\u{a0}[\$\$-fr-CA])", '$', 'fr-ca'], |
137 | 137 | ['[$¥-ja-JP]#,##0;([$¥-ja-JP]#,##0)', '¥', 'ja-JP'], // No decimals to truncate |
138 | - ["#,##0\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals truncated to none |
|
138 | + ["#,##0\u{a0}[\$د.ب\u{200e}-ar-BH]", "د.ب\u{200e}", 'ar-BH', true], // 3 decimals truncated to none |
|
139 | 139 | ]; |
140 | 140 | } |
141 | 141 |
@@ -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; |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row", $tryNumeric); |
312 | 312 | } |
313 | 313 | |
314 | - private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate, bool $tryNumeric): void |
|
314 | + private function processCFinal(Spreadsheet & $spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate, bool $tryNumeric): void |
|
315 | 315 | { |
316 | 316 | // Set cell value |
317 | 317 | $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData); |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | } |
322 | 322 | } |
323 | 323 | |
324 | - private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void |
|
324 | + private function processFRecord(array $rowData, Spreadsheet & $spreadsheet, string &$row, string &$column): void |
|
325 | 325 | { |
326 | 326 | // Read cell formatting |
327 | 327 | $formatStyle = $columnWidth = ''; |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | } |
390 | 390 | } |
391 | 391 | |
392 | - private function addFormats(Spreadsheet &$spreadsheet, string $formatStyle, string $row, string $column): void |
|
392 | + private function addFormats(Spreadsheet & $spreadsheet, string $formatStyle, string $row, string $column): void |
|
393 | 393 | { |
394 | 394 | if ($formatStyle && $column > '' && $row > '') { |
395 | 395 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | } |
400 | 400 | } |
401 | 401 | |
402 | - private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $row, string $column): void |
|
402 | + private function addFonts(Spreadsheet & $spreadsheet, string $fontStyle, string $row, string $column): void |
|
403 | 403 | { |
404 | 404 | if ($fontStyle && $column > '' && $row > '') { |
405 | 405 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | } |
410 | 410 | } |
411 | 411 | |
412 | - private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void |
|
412 | + private function addStyle(Spreadsheet & $spreadsheet, array $styleData, string $row, string $column): void |
|
413 | 413 | { |
414 | 414 | if ((!empty($styleData)) && $column > '' && $row > '') { |
415 | 415 | $columnLetter = Coordinate::stringFromColumnIndex((int) $column); |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | } |
435 | 435 | } |
436 | 436 | |
437 | - private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void |
|
437 | + private function processPRecord(array $rowData, Spreadsheet & $spreadsheet): void |
|
438 | 438 | { |
439 | 439 | // Read shared styles |
440 | 440 | $formatArray = []; |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | } |
488 | 488 | } |
489 | 489 | |
490 | - private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): void |
|
490 | + private function processPFinal(Spreadsheet & $spreadsheet, array $formatArray): void |
|
491 | 491 | { |
492 | 492 | if (array_key_exists('numberFormat', $formatArray)) { |
493 | 493 | $this->formats['P' . $this->format] = $formatArray; |