@@ -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 | } |
@@ -174,10 +174,10 @@ discard block |
||
174 | 174 | $header_parts = str_split($header, 2); |
175 | 175 | |
176 | 176 | // Get the width 4 bytes |
177 | - $width = hexdec($header_parts[19] . $header_parts[18]); |
|
177 | + $width = hexdec($header_parts[19].$header_parts[18]); |
|
178 | 178 | |
179 | 179 | // Get the height 4 bytes |
180 | - $height = hexdec($header_parts[23] . $header_parts[22]); |
|
180 | + $height = hexdec($header_parts[23].$header_parts[22]); |
|
181 | 181 | |
182 | 182 | // Unset the header params |
183 | 183 | unset($header_parts); |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | // Calculation of the RGB-pixel (defined as BGR in image-data) |
229 | 229 | // Define $i_pos as absolute position in the body |
230 | 230 | $i_pos = $i * 2; |
231 | - $r = hexdec($body[$i_pos + 4] . $body[$i_pos + 5]); |
|
232 | - $g = hexdec($body[$i_pos + 2] . $body[$i_pos + 3]); |
|
233 | - $b = hexdec($body[$i_pos] . $body[$i_pos + 1]); |
|
231 | + $r = hexdec($body[$i_pos + 4].$body[$i_pos + 5]); |
|
232 | + $g = hexdec($body[$i_pos + 2].$body[$i_pos + 3]); |
|
233 | + $b = hexdec($body[$i_pos].$body[$i_pos + 1]); |
|
234 | 234 | |
235 | 235 | // Calculate and draw the pixel |
236 | 236 | $color = imagecolorallocate($image, $r, $g, $b); |
@@ -187,9 +187,9 @@ discard block |
||
187 | 187 | $seconds = round($partDay * 60); |
188 | 188 | |
189 | 189 | if ($days >= 0) { |
190 | - $days = '+' . $days; |
|
190 | + $days = '+'.$days; |
|
191 | 191 | } |
192 | - $interval = $days . ' days'; |
|
192 | + $interval = $days.' days'; |
|
193 | 193 | |
194 | 194 | return $baseDate->modify($interval) |
195 | 195 | ->setTime((int) $hours, (int) $minutes, (int) $seconds); |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | return false; |
267 | 267 | } |
268 | 268 | |
269 | - return self::dateTimeToExcel(new \DateTime('@' . $dateValue)); |
|
269 | + return self::dateTimeToExcel(new \DateTime('@'.$dateValue)); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | /** |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | return false; |
399 | 399 | } |
400 | 400 | // Try checking for any of the date formatting characters that don't appear within square braces |
401 | - if (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $pFormatCode)) { |
|
401 | + if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $pFormatCode)) { |
|
402 | 402 | // We might also have a format mask containing quoted strings... |
403 | 403 | // we don't want to test for any of our characters within the quoted blocks |
404 | 404 | if (strpos($pFormatCode, '"') !== false) { |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | foreach (explode('"', $pFormatCode) as $subVal) { |
407 | 407 | // Only test in alternate array entries (the non-quoted blocks) |
408 | 408 | if (($segMatcher = !$segMatcher) && |
409 | - (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))) { |
|
409 | + (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $subVal))) { |
|
410 | 410 | return true; |
411 | 411 | } |
412 | 412 | } |
@@ -134,11 +134,11 @@ |
||
134 | 134 | public static function assertFile($filename) |
135 | 135 | { |
136 | 136 | if (!is_file($filename)) { |
137 | - throw new InvalidArgumentException('File "' . $filename . '" does not exist.'); |
|
137 | + throw new InvalidArgumentException('File "'.$filename.'" does not exist.'); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | if (!is_readable($filename)) { |
141 | - throw new InvalidArgumentException('Could not open "' . $filename . '" for reading.'); |
|
141 | + throw new InvalidArgumentException('Could not open "'.$filename.'" for reading.'); |
|
142 | 142 | } |
143 | 143 | } |
144 | 144 | } |