geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-08-30 03:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct Some Scrutinizer Messages (#3354)

Browse Source 
They have crept in recently.
This commit is contained in:
oleibman
2023-02-09 23:12:22 -08:00
committed by GitHub
parent cc3ae628ae
commit b1c754f04b
10 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
+2 -1
View File
@@ -51,7 +51,8 @@ class Accounting extends Currency
throw new Exception('The Intl extension does not support Accounting Formats without ICU 53');
}
$formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY_ACCOUNTING); // @phpstan-ignore-line
// Scrutinizer does not recognize CURRENCY_ACCOUNTING
$formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY_ACCOUNTING);
return str_replace('¤', $this->formatCurrencyCode(), $formatter->format());
}
src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
+1 -1
View File
@@ -69,7 +69,7 @@ class Currency extends Number
protected function getLocaleFormat(): string
{
$formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY); // @phpstan-ignore-line
$formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY);
return str_replace('¤', $this->formatCurrencyCode(), $formatter->format());
}
src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
+2 -2
View File
@@ -17,13 +17,13 @@ final class Locale
private NumberFormatter $formatter;
public function __construct(string $locale, int $style)
public function __construct(?string $locale, int $style)
{
if (class_exists(NumberFormatter::class) === false) {
throw new Exception();
}
$formatterLocale = str_replace('-', '_', $locale);
$formatterLocale = str_replace('-', '_', $locale ?? '');
$this->formatter = new NumberFormatter($formatterLocale, $style);
if ($this->formatter->getLocale() !== $formatterLocale) {
throw new Exception("Unable to read locale data for '{$locale}'");
src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
+1 -1
View File
@@ -18,7 +18,7 @@ abstract class NumberBase
protected ?string $localeFormat = null;
public function setDecimals(int $decimals = 2, ?string $locale = null): void
public function setDecimals(int $decimals = 2): void
{
$this->decimals = ($decimals > self::MAX_DECIMALS) ? self::MAX_DECIMALS : max($decimals, 0);
}
src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
+1 -1
View File
@@ -22,7 +22,7 @@ class Percentage extends NumberBase implements Wizard
protected function getLocaleFormat(): string
{
$formatter = new Locale($this->fullLocale, NumberFormatter::PERCENT); // @phpstan-ignore-line
$formatter = new Locale($this->fullLocale, NumberFormatter::PERCENT);
return $this->decimals > 0
? str_replace('0', '0.' . str_repeat('0', $this->decimals), $formatter->format())
tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/AccountingTest.php
+4 -4
View File
@@ -78,8 +78,8 @@ class AccountingTest extends TestCase
$locale = 'en-usa';
self::expectException(Exception::class);
self::expectExceptionMessage("Invalid locale code '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Invalid locale code '{$locale}'");
$wizard = new Accounting('€');
$wizard->setLocale($locale);
@@ -93,8 +93,8 @@ class AccountingTest extends TestCase
$locale = 'nl-GB';
self::expectException(Exception::class);
self::expectExceptionMessage("Unable to read locale data for '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Unable to read locale data for '{$locale}'");
$wizard = new Accounting('€');
$wizard->setLocale($locale);
tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/CurrencyTest.php
+4 -4
View File
@@ -77,8 +77,8 @@ class CurrencyTest extends TestCase
$locale = 'en-usa';
self::expectException(Exception::class);
self::expectExceptionMessage("Invalid locale code '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Invalid locale code '{$locale}'");
$wizard = new Currency('€');
$wizard->setLocale($locale);
@@ -92,8 +92,8 @@ class CurrencyTest extends TestCase
$locale = 'nl-GB';
self::expectException(Exception::class);
self::expectExceptionMessage("Unable to read locale data for '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Unable to read locale data for '{$locale}'");
$wizard = new Currency('€');
$wizard->setLocale($locale);
tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/NumberTest.php
+2 -2
View File
@@ -61,8 +61,8 @@ class NumberTest extends TestCase
$locale = 'en-usa';
self::expectException(Exception::class);
self::expectExceptionMessage("Invalid locale code '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Invalid locale code '{$locale}'");
$wizard = new Number(2);
$wizard->setLocale($locale);
tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/PercentageTest.php
+4 -4
View File
@@ -67,8 +67,8 @@ class PercentageTest extends TestCase
$locale = 'en-usa';
self::expectException(Exception::class);
self::expectExceptionMessage("Invalid locale code '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Invalid locale code '{$locale}'");
$wizard = new Percentage(2);
$wizard->setLocale($locale);
@@ -82,8 +82,8 @@ class PercentageTest extends TestCase
$locale = 'nl-GB';
self::expectException(Exception::class);
self::expectExceptionMessage("Unable to read locale data for '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Unable to read locale data for '{$locale}'");
$wizard = new Percentage(2);
$wizard->setLocale($locale);
tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/ScientificTest.php
+2 -2
View File
@@ -66,8 +66,8 @@ class ScientificTest extends TestCase
$locale = 'en-usa';
self::expectException(Exception::class);
self::expectExceptionMessage("Invalid locale code '{$locale}'");
$this->expectException(Exception::class);
$this->expectExceptionMessage("Invalid locale code '{$locale}'");
$wizard = new Scientific(2);
$wizard->setLocale($locale);