@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), |
54 | 54 | * or an AddressRange object. |
55 | 55 | */ |
56 | - public function __construct(AddressRange|string|array $range = '', ?Worksheet $worksheet = null) |
|
56 | + public function __construct(AddressRange | string | array $range = '', ?Worksheet $worksheet = null) |
|
57 | 57 | { |
58 | 58 | if ($range !== '') { |
59 | 59 | [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | /** |
72 | 72 | * Get AutoFilter Parent Worksheet. |
73 | 73 | */ |
74 | - public function getParent(): null|Worksheet |
|
74 | + public function getParent(): null | Worksheet |
|
75 | 75 | { |
76 | 76 | return $this->workSheet; |
77 | 77 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), |
106 | 106 | * or an AddressRange object. |
107 | 107 | */ |
108 | - public function setRange(AddressRange|string|array $range = ''): self |
|
108 | + public function setRange(AddressRange | string | array $range = ''): self |
|
109 | 109 | { |
110 | 110 | $this->evaluated = false; |
111 | 111 | // extract coordinate |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * |
234 | 234 | * @return $this |
235 | 235 | */ |
236 | - public function setColumn(AutoFilter\Column|string $columnObjectOrString): static |
|
236 | + public function setColumn(AutoFilter\Column | string $columnObjectOrString): static |
|
237 | 237 | { |
238 | 238 | $this->evaluated = false; |
239 | 239 | if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * or an AddressRange object. |
70 | 70 | * @param string $name (e.g. Table1) |
71 | 71 | */ |
72 | - public function __construct(AddressRange|string|array $range = '', string $name = '') |
|
72 | + public function __construct(AddressRange | string | array $range = '', string $name = '') |
|
73 | 73 | { |
74 | 74 | $this->style = new TableStyle(); |
75 | 75 | $this->autoFilter = new AutoFilter($range); |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | * or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]), |
273 | 273 | * or an AddressRange object. |
274 | 274 | */ |
275 | - public function setRange(AddressRange|string|array $range = ''): self |
|
275 | + public function setRange(AddressRange | string | array $range = ''): self |
|
276 | 276 | { |
277 | 277 | // extract coordinate |
278 | 278 | if ($range !== '') { |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | * @param string|Table\Column $columnObjectOrString |
438 | 438 | * A simple string containing a Column ID like 'A' is permitted |
439 | 439 | */ |
440 | - public function setColumn(string|Table\Column $columnObjectOrString): self |
|
440 | + public function setColumn(string | Table\Column $columnObjectOrString): self |
|
441 | 441 | { |
442 | 442 | if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) { |
443 | 443 | $column = $columnObjectOrString; |
@@ -17,7 +17,7 @@ |
||
17 | 17 | /** |
18 | 18 | * @param array{0: int, 1: int}|CellAddress|string $coordinate |
19 | 19 | */ |
20 | - public function __construct(int $breakType, CellAddress|string|array $coordinate, int $maxColOrRow = -1) |
|
20 | + public function __construct(int $breakType, CellAddress | string | array $coordinate, int $maxColOrRow = -1) |
|
21 | 21 | { |
22 | 22 | $coordinate = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate)); |
23 | 23 | $this->breakType = $breakType; |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * @param null|array{0: int, 1: int}|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5'; |
16 | 16 | * or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object. |
17 | 17 | */ |
18 | - public static function validateCellAddress(null|CellAddress|string|array $cellAddress): string |
|
18 | + public static function validateCellAddress(null | CellAddress | string | array $cellAddress): string |
|
19 | 19 | { |
20 | 20 | if (is_string($cellAddress)) { |
21 | 21 | [$worksheet, $address] = Worksheet::extractSheetTitle($cellAddress, true); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]), |
41 | 41 | * or as a CellAddress or AddressRange object. |
42 | 42 | */ |
43 | - public static function validateCellOrCellRange(AddressRange|CellAddress|int|string|array $cellRange): string |
|
43 | + public static function validateCellOrCellRange(AddressRange | CellAddress | int | string | array $cellRange): string |
|
44 | 44 | { |
45 | 45 | if (is_string($cellRange) || is_numeric($cellRange)) { |
46 | 46 | // Convert a single column reference like 'A' to 'A:A', |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]), |
64 | 64 | * or as an AddressRange object. |
65 | 65 | */ |
66 | - public static function validateCellRange(AddressRange|string|array $cellRange): string |
|
66 | + public static function validateCellRange(AddressRange | string | array $cellRange): string |
|
67 | 67 | { |
68 | 68 | if (is_string($cellRange)) { |
69 | 69 | [$worksheet, $addressRange] = Worksheet::extractSheetTitle($cellRange, true); |
@@ -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 |
@@ -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 |
@@ -36,12 +36,12 @@ discard block |
||
36 | 36 | /** |
37 | 37 | * Created. |
38 | 38 | */ |
39 | - private float|int $created; |
|
39 | + private float | int $created; |
|
40 | 40 | |
41 | 41 | /** |
42 | 42 | * Modified. |
43 | 43 | */ |
44 | - private float|int $modified; |
|
44 | + private float | int $modified; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Title. |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - private static function intOrFloatTimestamp(null|bool|float|int|string $timestamp): float|int |
|
143 | + private static function intOrFloatTimestamp(null | bool | float | int | string $timestamp): float | int |
|
144 | 144 | { |
145 | 145 | if ($timestamp === null || is_bool($timestamp)) { |
146 | 146 | $timestamp = (float) (new DateTime())->format('U'); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | /** |
162 | 162 | * Get Created. |
163 | 163 | */ |
164 | - public function getCreated(): float|int |
|
164 | + public function getCreated(): float | int |
|
165 | 165 | { |
166 | 166 | return $this->created; |
167 | 167 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | * |
172 | 172 | * @return $this |
173 | 173 | */ |
174 | - public function setCreated(null|float|int|string $timestamp): self |
|
174 | + public function setCreated(null | float | int | string $timestamp): self |
|
175 | 175 | { |
176 | 176 | $this->created = self::intOrFloatTimestamp($timestamp); |
177 | 177 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | /** |
182 | 182 | * Get Modified. |
183 | 183 | */ |
184 | - public function getModified(): float|int |
|
184 | + public function getModified(): float | int |
|
185 | 185 | { |
186 | 186 | return $this->modified; |
187 | 187 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * |
192 | 192 | * @return $this |
193 | 193 | */ |
194 | - public function setModified(null|float|int|string $timestamp): self |
|
194 | + public function setModified(null | float | int | string $timestamp): self |
|
195 | 195 | { |
196 | 196 | $this->modified = self::intOrFloatTimestamp($timestamp); |
197 | 197 | |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | /** |
360 | 360 | * Get a Custom Property Value. |
361 | 361 | */ |
362 | - public function getCustomPropertyValue(string $propertyName): bool|int|float|string|null |
|
362 | + public function getCustomPropertyValue(string $propertyName): bool | int | float | string | null |
|
363 | 363 | { |
364 | 364 | if (isset($this->customProperties[$propertyName])) { |
365 | 365 | return $this->customProperties[$propertyName]['value']; |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | return $this->customProperties[$propertyName]['type'] ?? null; |
377 | 377 | } |
378 | 378 | |
379 | - private function identifyPropertyType(bool|int|float|string|null $propertyValue): string |
|
379 | + private function identifyPropertyType(bool | int | float | string | null $propertyValue): string |
|
380 | 380 | { |
381 | 381 | if (is_float($propertyValue)) { |
382 | 382 | return self::PROPERTY_TYPE_FLOAT; |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | * |
399 | 399 | * @return $this |
400 | 400 | */ |
401 | - public function setCustomProperty(string $propertyName, bool|int|float|string|null $propertyValue = '', ?string $propertyType = null): self |
|
401 | + public function setCustomProperty(string $propertyName, bool | int | float | string | null $propertyValue = '', ?string $propertyType = null): self |
|
402 | 402 | { |
403 | 403 | if (($propertyType === null) || (!in_array($propertyType, self::VALID_PROPERTY_TYPE_LIST))) { |
404 | 404 | $propertyType = $this->identifyPropertyType($propertyValue); |
@@ -413,32 +413,32 @@ discard block |
||
413 | 413 | } |
414 | 414 | |
415 | 415 | private const PROPERTY_TYPE_ARRAY = [ |
416 | - 'i' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
417 | - 'i1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Signed Integer |
|
418 | - 'i2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Signed Integer |
|
419 | - 'i4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Signed Integer |
|
420 | - 'i8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Signed Integer |
|
421 | - 'int' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
422 | - 'ui1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Unsigned Integer |
|
423 | - 'ui2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Unsigned Integer |
|
424 | - 'ui4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Unsigned Integer |
|
425 | - 'ui8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Unsigned Integer |
|
426 | - 'uint' => self::PROPERTY_TYPE_INTEGER, // Unsigned Integer |
|
427 | - 'f' => self::PROPERTY_TYPE_FLOAT, // Real Number |
|
428 | - 'r4' => self::PROPERTY_TYPE_FLOAT, // 4-Byte Real Number |
|
429 | - 'r8' => self::PROPERTY_TYPE_FLOAT, // 8-Byte Real Number |
|
430 | - 'decimal' => self::PROPERTY_TYPE_FLOAT, // Decimal |
|
431 | - 's' => self::PROPERTY_TYPE_STRING, // String |
|
432 | - 'empty' => self::PROPERTY_TYPE_STRING, // Empty |
|
433 | - 'null' => self::PROPERTY_TYPE_STRING, // Null |
|
434 | - 'lpstr' => self::PROPERTY_TYPE_STRING, // LPSTR |
|
435 | - 'lpwstr' => self::PROPERTY_TYPE_STRING, // LPWSTR |
|
436 | - 'bstr' => self::PROPERTY_TYPE_STRING, // Basic String |
|
437 | - 'd' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
438 | - 'date' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
439 | - 'filetime' => self::PROPERTY_TYPE_DATE, // File Time |
|
440 | - 'b' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
441 | - 'bool' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
416 | + 'i' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
417 | + 'i1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Signed Integer |
|
418 | + 'i2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Signed Integer |
|
419 | + 'i4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Signed Integer |
|
420 | + 'i8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Signed Integer |
|
421 | + 'int' => self::PROPERTY_TYPE_INTEGER, // Integer |
|
422 | + 'ui1' => self::PROPERTY_TYPE_INTEGER, // 1-Byte Unsigned Integer |
|
423 | + 'ui2' => self::PROPERTY_TYPE_INTEGER, // 2-Byte Unsigned Integer |
|
424 | + 'ui4' => self::PROPERTY_TYPE_INTEGER, // 4-Byte Unsigned Integer |
|
425 | + 'ui8' => self::PROPERTY_TYPE_INTEGER, // 8-Byte Unsigned Integer |
|
426 | + 'uint' => self::PROPERTY_TYPE_INTEGER, // Unsigned Integer |
|
427 | + 'f' => self::PROPERTY_TYPE_FLOAT, // Real Number |
|
428 | + 'r4' => self::PROPERTY_TYPE_FLOAT, // 4-Byte Real Number |
|
429 | + 'r8' => self::PROPERTY_TYPE_FLOAT, // 8-Byte Real Number |
|
430 | + 'decimal' => self::PROPERTY_TYPE_FLOAT, // Decimal |
|
431 | + 's' => self::PROPERTY_TYPE_STRING, // String |
|
432 | + 'empty' => self::PROPERTY_TYPE_STRING, // Empty |
|
433 | + 'null' => self::PROPERTY_TYPE_STRING, // Null |
|
434 | + 'lpstr' => self::PROPERTY_TYPE_STRING, // LPSTR |
|
435 | + 'lpwstr' => self::PROPERTY_TYPE_STRING, // LPWSTR |
|
436 | + 'bstr' => self::PROPERTY_TYPE_STRING, // Basic String |
|
437 | + 'd' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
438 | + 'date' => self::PROPERTY_TYPE_DATE, // Date and Time |
|
439 | + 'filetime' => self::PROPERTY_TYPE_DATE, // File Time |
|
440 | + 'b' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
441 | + 'bool' => self::PROPERTY_TYPE_BOOLEAN, // Boolean |
|
442 | 442 | ]; |
443 | 443 | |
444 | 444 | private const SPECIAL_TYPES = [ |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | /** |
450 | 450 | * Convert property to form desired by Excel. |
451 | 451 | */ |
452 | - public static function convertProperty(bool|int|float|string|null $propertyValue, string $propertyType): bool|int|float|string|null |
|
452 | + public static function convertProperty(bool | int | float | string | null $propertyValue, string $propertyType): bool | int | float | string | null |
|
453 | 453 | { |
454 | 454 | return self::SPECIAL_TYPES[$propertyType] ?? self::convertProperty2($propertyValue, $propertyType); |
455 | 455 | } |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | /** |
458 | 458 | * Convert property to form desired by Excel. |
459 | 459 | */ |
460 | - private static function convertProperty2(bool|int|float|string|null $propertyValue, string $type): bool|int|float|string|null |
|
460 | + private static function convertProperty2(bool | int | float | string | null $propertyValue, string $type): bool | int | float | string | null |
|
461 | 461 | { |
462 | 462 | $propertyType = self::convertPropertyType($type); |
463 | 463 | switch ($propertyType) { |