@@ -105,8 +105,8 @@ |
||
105 | 105 | public function getHashCode() |
106 | 106 | { |
107 | 107 | return md5( |
108 | - $this->url . |
|
109 | - $this->tooltip . |
|
108 | + $this->url. |
|
109 | + $this->tooltip. |
|
110 | 110 | __CLASS__ |
111 | 111 | ); |
112 | 112 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | |
237 | 237 | break; |
238 | 238 | default: |
239 | - throw new Exception('Invalid datatype: ' . $pDataType); |
|
239 | + throw new Exception('Invalid datatype: '.$pDataType); |
|
240 | 240 | |
241 | 241 | break; |
242 | 242 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | } |
276 | 276 | |
277 | 277 | throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception( |
278 | - $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage() |
|
278 | + $this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage() |
|
279 | 279 | ); |
280 | 280 | } |
281 | 281 |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | throw new Exception('Cell coordinate can not be zero-length string'); |
40 | 40 | } |
41 | 41 | |
42 | - throw new Exception('Invalid cell coordinate ' . $pCoordinateString); |
|
42 | + throw new Exception('Invalid cell coordinate '.$pCoordinateString); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | |
79 | 79 | // Create absolute coordinate |
80 | 80 | if (ctype_digit($pCoordinateString)) { |
81 | - return $worksheet . '$' . $pCoordinateString; |
|
81 | + return $worksheet.'$'.$pCoordinateString; |
|
82 | 82 | } elseif (ctype_alpha($pCoordinateString)) { |
83 | - return $worksheet . '$' . strtoupper($pCoordinateString); |
|
83 | + return $worksheet.'$'.strtoupper($pCoordinateString); |
|
84 | 84 | } |
85 | 85 | |
86 | - return $worksheet . self::absoluteCoordinate($pCoordinateString); |
|
86 | + return $worksheet.self::absoluteCoordinate($pCoordinateString); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $column = ltrim($column, '$'); |
113 | 113 | $row = ltrim($row, '$'); |
114 | 114 | |
115 | - return $worksheet . '$' . $column . '$' . $row; |
|
115 | + return $worksheet.'$'.$column.'$'.$row; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | } |
290 | 290 | } |
291 | 291 | |
292 | - throw new Exception('Column string index can not be ' . ((isset($pString[0])) ? 'longer than 3 characters' : 'empty')); |
|
292 | + throw new Exception('Column string index can not be '.((isset($pString[0])) ? 'longer than 3 characters' : 'empty')); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | do { |
310 | 310 | $characterValue = ($indexValue % 26) ?: 26; |
311 | 311 | $indexValue = ($indexValue - $characterValue) / 26; |
312 | - $base26 = chr($characterValue + 64) . ($base26 ?: ''); |
|
312 | + $base26 = chr($characterValue + 64).($base26 ?: ''); |
|
313 | 313 | } while ($indexValue > 0); |
314 | 314 | $indexCache[$columnIndex] = $base26; |
315 | 315 | } |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | // Loop cells |
393 | 393 | while ($currentColumnIndex < $endColumnIndex) { |
394 | 394 | while ($currentRow <= $endRow) { |
395 | - $returnValue[] = self::stringFromColumnIndex($currentColumnIndex) . $currentRow; |
|
395 | + $returnValue[] = self::stringFromColumnIndex($currentColumnIndex).$currentRow; |
|
396 | 396 | ++$currentRow; |
397 | 397 | } |
398 | 398 | ++$currentColumnIndex; |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | |
435 | 435 | [$column, $row] = self::coordinateFromString($coord); |
436 | 436 | $row = (int) (ltrim($row, '$')); |
437 | - $hashCode = $column . '-' . (is_object($value) ? $value->getHashCode() : $value); |
|
437 | + $hashCode = $column.'-'.(is_object($value) ? $value->getHashCode() : $value); |
|
438 | 438 | |
439 | 439 | if (!isset($hashedValues[$hashCode])) { |
440 | 440 | $hashedValues[$hashCode] = (object) [ |
@@ -463,9 +463,9 @@ discard block |
||
463 | 463 | $rowEnd = $row; |
464 | 464 | } else { |
465 | 465 | if ($rowStart == $rowEnd) { |
466 | - $ranges[] = $hashedValue->col . $rowStart; |
|
466 | + $ranges[] = $hashedValue->col.$rowStart; |
|
467 | 467 | } else { |
468 | - $ranges[] = $hashedValue->col . $rowStart . ':' . $hashedValue->col . $rowEnd; |
|
468 | + $ranges[] = $hashedValue->col.$rowStart.':'.$hashedValue->col.$rowEnd; |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | $rowStart = $row; |
@@ -475,9 +475,9 @@ discard block |
||
475 | 475 | |
476 | 476 | if ($rowStart !== null) { |
477 | 477 | if ($rowStart == $rowEnd) { |
478 | - $ranges[] = $hashedValue->col . $rowStart; |
|
478 | + $ranges[] = $hashedValue->col.$rowStart; |
|
479 | 479 | } else { |
480 | - $ranges[] = $hashedValue->col . $rowStart . ':' . $hashedValue->col . $rowEnd; |
|
480 | + $ranges[] = $hashedValue->col.$rowStart.':'.$hashedValue->col.$rowEnd; |
|
481 | 481 | } |
482 | 482 | } |
483 | 483 | |
@@ -514,7 +514,7 @@ discard block |
||
514 | 514 | private static function validateRange($cellBlock, $startColumnIndex, $endColumnIndex, $currentRow, $endRow) |
515 | 515 | { |
516 | 516 | if ($startColumnIndex >= $endColumnIndex || $currentRow > $endRow) { |
517 | - throw new Exception('Invalid range: "' . $cellBlock . '"'); |
|
517 | + throw new Exception('Invalid range: "'.$cellBlock.'"'); |
|
518 | 518 | } |
519 | 519 | } |
520 | 520 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | return in_array(strtolower($cellValue), explode(',', strtolower(trim($formula1, '"'))), true); |
60 | 60 | } elseif (strpos($formula1, ':') > 0) { |
61 | 61 | // values list cells |
62 | - $matchFormula = '=MATCH(' . $cell->getCoordinate() . ', ' . $formula1 . ', 0)'; |
|
62 | + $matchFormula = '=MATCH('.$cell->getCoordinate().', '.$formula1.', 0)'; |
|
63 | 63 | $calculation = Calculation::getInstance($cell->getWorksheet()->getParent()); |
64 | 64 | |
65 | 65 | try { |
@@ -447,19 +447,19 @@ |
||
447 | 447 | public function getHashCode() |
448 | 448 | { |
449 | 449 | return md5( |
450 | - $this->formula1 . |
|
451 | - $this->formula2 . |
|
452 | - $this->type . |
|
453 | - $this->errorStyle . |
|
454 | - $this->operator . |
|
455 | - ($this->allowBlank ? 't' : 'f') . |
|
456 | - ($this->showDropDown ? 't' : 'f') . |
|
457 | - ($this->showInputMessage ? 't' : 'f') . |
|
458 | - ($this->showErrorMessage ? 't' : 'f') . |
|
459 | - $this->errorTitle . |
|
460 | - $this->error . |
|
461 | - $this->promptTitle . |
|
462 | - $this->prompt . |
|
450 | + $this->formula1. |
|
451 | + $this->formula2. |
|
452 | + $this->type. |
|
453 | + $this->errorStyle. |
|
454 | + $this->operator. |
|
455 | + ($this->allowBlank ? 't' : 'f'). |
|
456 | + ($this->showDropDown ? 't' : 'f'). |
|
457 | + ($this->showInputMessage ? 't' : 'f'). |
|
458 | + ($this->showErrorMessage ? 't' : 'f'). |
|
459 | + $this->errorTitle. |
|
460 | + $this->error. |
|
461 | + $this->promptTitle. |
|
462 | + $this->prompt. |
|
463 | 463 | __CLASS__ |
464 | 464 | ); |
465 | 465 | } |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | $result .= "## {$categoryConstant}\n"; |
26 | 26 | $result .= "\n"; |
27 | 27 | $lengths = [20, 42]; |
28 | - $result .= self::tableRow($lengths, ['Excel Function', 'PhpSpreadsheet Function']) . "\n"; |
|
29 | - $result .= self::tableRow($lengths, null) . "\n"; |
|
28 | + $result .= self::tableRow($lengths, ['Excel Function', 'PhpSpreadsheet Function'])."\n"; |
|
29 | + $result .= self::tableRow($lengths, null)."\n"; |
|
30 | 30 | foreach ($phpSpreadsheetFunctions as $excelFunction => $functionInfo) { |
31 | 31 | if ($category === $functionInfo['category']) { |
32 | 32 | $phpFunction = self::getPhpSpreadsheetFunctionText($functionInfo['functionCall']); |
33 | - $result .= self::tableRow($lengths, [$excelFunction, $phpFunction]) . "\n"; |
|
33 | + $result .= self::tableRow($lengths, [$excelFunction, $phpFunction])."\n"; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | foreach (array_map(null, $lengths, $values ?? []) as $i => [$length, $value]) { |
55 | 55 | $pad = $value === null ? '-' : ' '; |
56 | 56 | if ($i > 0) { |
57 | - $result .= '|' . $pad; |
|
57 | + $result .= '|'.$pad; |
|
58 | 58 | } |
59 | 59 | $result .= str_pad($value ?? '', $length, $pad); |
60 | 60 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | throw new UnexpectedValueException( |
78 | - '$functionCall is of type ' . gettype($functionCall) . '. string or array expected' |
|
78 | + '$functionCall is of type '.gettype($functionCall).'. string or array expected' |
|
79 | 79 | ); |
80 | 80 | } |
81 | 81 | |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | $result .= "\n"; |
99 | 99 | $result .= "## {$lastAlphabet}\n"; |
100 | 100 | $result .= "\n"; |
101 | - $result .= self::tableRow($lengths, ['Excel Function', 'Category', 'PhpSpreadsheet Function']) . "\n"; |
|
102 | - $result .= self::tableRow($lengths, null) . "\n"; |
|
101 | + $result .= self::tableRow($lengths, ['Excel Function', 'Category', 'PhpSpreadsheet Function'])."\n"; |
|
102 | + $result .= self::tableRow($lengths, null)."\n"; |
|
103 | 103 | } |
104 | 104 | $category = $categoryConstants[$functionInfo['category']]; |
105 | 105 | $phpFunction = self::getPhpSpreadsheetFunctionText($functionInfo['functionCall']); |
106 | - $result .= self::tableRow($lengths, [$excelFunction, $category, $phpFunction]) . "\n"; |
|
106 | + $result .= self::tableRow($lengths, [$excelFunction, $category, $phpFunction])."\n"; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | return $result; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | { |
68 | 68 | for ($i = 0; $i <= 31; ++$i) { |
69 | 69 | if ($i != 9 && $i != 10 && $i != 13) { |
70 | - $find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_'; |
|
70 | + $find = '_x'.sprintf('%04s', strtoupper(dechex($i))).'_'; |
|
71 | 71 | $replace = chr($i); |
72 | 72 | self::$controlCharacters[$find] = $replace; |
73 | 73 | } |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | } |
266 | 266 | |
267 | 267 | // Deactivate iconv default options if they fail (as seen on IMB i) |
268 | - if (self::$isIconvEnabled && !@iconv('UTF-8', 'UTF-16LE' . self::$iconvOptions, 'x')) { |
|
268 | + if (self::$isIconvEnabled && !@iconv('UTF-8', 'UTF-16LE'.self::$iconvOptions, 'x')) { |
|
269 | 269 | self::$iconvOptions = ''; |
270 | 270 | } |
271 | 271 | |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | // characters |
431 | 431 | $chars = self::convertEncoding($value, 'UTF-16LE', 'UTF-8'); |
432 | 432 | |
433 | - return pack('vC', $ln, 0x0001) . $chars; |
|
433 | + return pack('vC', $ln, 0x0001).$chars; |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | /** |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | public static function convertEncoding($value, $to, $from) |
446 | 446 | { |
447 | 447 | if (self::getIsIconvEnabled()) { |
448 | - $result = iconv($from, $to . self::$iconvOptions, $value); |
|
448 | + $result = iconv($from, $to.self::$iconvOptions, $value); |
|
449 | 449 | if (false !== $result) { |
450 | 450 | return $result; |
451 | 451 | } |
@@ -562,9 +562,9 @@ discard block |
||
562 | 562 | */ |
563 | 563 | public static function convertToNumberIfFraction(&$operand) |
564 | 564 | { |
565 | - if (preg_match('/^' . self::STRING_REGEXP_FRACTION . '$/i', $operand, $match)) { |
|
565 | + if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) { |
|
566 | 566 | $sign = ($match[1] == '-') ? '-' : '+'; |
567 | - $fractionFormula = '=' . $sign . $match[2] . $sign . $match[3]; |
|
567 | + $fractionFormula = '='.$sign.$match[2].$sign.$match[3]; |
|
568 | 568 | $operand = Calculation::getInstance()->_calculateFormulaValue($fractionFormula); |
569 | 569 | |
570 | 570 | return true; |
@@ -69,7 +69,7 @@ |
||
69 | 69 | { |
70 | 70 | if ($timezone !== null) { |
71 | 71 | if (!self::validateTimezone($timezone)) { |
72 | - throw new PhpSpreadsheetException('Invalid timezone ' . $timezone); |
|
72 | + throw new PhpSpreadsheetException('Invalid timezone '.$timezone); |
|
73 | 73 | } |
74 | 74 | } else { |
75 | 75 | $timezone = self::$timezone; |
@@ -133,6 +133,6 @@ |
||
133 | 133 | return 'UTF-8'; // Unicode (UTF-8) |
134 | 134 | } |
135 | 135 | |
136 | - throw new PhpSpreadsheetException('Unknown codepage: ' . $codePage); |
|
136 | + throw new PhpSpreadsheetException('Unknown codepage: '.$codePage); |
|
137 | 137 | } |
138 | 138 | } |