← All changes
|
libraries/vendor/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
+2
-4
3.3.3
→
3.4
View file →
| @@ -57,12 +57,10 @@ | ||
| 57 | 57 | $blockValue = sprintf("%0{$size}d", fmod($numberFloat, $divisor)); |
| 58 | 58 | $number = floor($numberFloat / $divisor); |
| 59 | 59 | $mask = substr_replace($mask, $blockValue, $offset, $size); |
| 60 | 60 | } |
| 61 | - /** @var string $numberString */ | |
| 62 | - $numberString = $number; | |
| 63 | 61 | if ($number > 0) { |
| 64 | - $mask = substr_replace($mask, $numberString, $offset, 0); | |
| 62 | + $mask = substr_replace($mask, "$number", $offset, 0); | |
| 65 | 63 | } |
| 66 | 64 | $result = $mask; |
| 67 | 65 | } |
| 68 | 66 | |
| @@ -176,9 +174,9 @@ | ||
| 176 | 174 | return sprintf("%{$size}.{$decimals}E", $valueFloat); |
| 177 | 175 | } |
| 178 | 176 | if (preg_match('/0([^\d\.]+)0/', $format) || substr_count($format, '.') > 1) { |
| 179 | 177 | if ($valueFloat == floor($valueFloat) && substr_count($format, '.') === 1) { |
| 180 | - $value *= 10 ** strlen(explode('.', $format)[1]); //* @phpstan-ignore-line | |
| 178 | + $value *= 10 ** strlen(explode('.', $format)[1]); //* @phpstan-ignore assignOp.invalid ($value may be mixed) | |
| 181 | 179 | } |
| 182 | 180 | |
| 183 | 181 | $result = self::complexNumberFormatMask($value, $format); |
| 184 | 182 | if (str_contains($result, 'E')) { |