Error202
/
yii2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enable `non_printable_character` rule in php-cs-fixer config (#14667) 

* Use "\u{00a0}" as nbsp.

* Enable non_printable_character rule.

* Fix test for PHP 5.
tags/2.0.13
Robert Korulczyk 7 years ago committed by Carsten Brandt
parent
b99e955627
commit
9b118aafa0
3 changed files with 35 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cs/src/YiiConfig.php
  2. 2
      framework/messages/pt-BR/yii.php
  3. 65
      tests/framework/i18n/FormatterNumberTest.php

2
cs/src/YiiConfig.php
Unescape View File

@ -95,7 +95,7 @@ class YiiConfig extends Config
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
// 'non_printable_character' => true, // breaks Formatter::asCurrency() tests
'non_printable_character' => true,
'normalize_index_brace' => true,
'object_operator_without_whitespace' => true,
// 'ordered_class_elements' => [ // needs more discussion

2
framework/messages/pt-BR/yii.php
Unescape View File

@ -127,7 +127,7 @@ return [
'The verification code is incorrect.' => 'O código de verificação está incorreto.',
'Total <b>{count, number}</b> {count, plural, one{item} other{items}}.' => 'Total <b>{count, number}</b> {count, plural, one{item} other{itens}}.',
'Unable to verify your data submission.' => 'Não foi possível verificar o seu envio de dados.',
'Unknown alias: -{name}' => 'Alias ​​desconhecido: -{name}',
'Unknown alias: -{name}' => 'Alias desconhecido: -{name}',
'Unknown option: --{name}' => 'Opção desconhecida : --{name}',
'Update' => 'Alterar',
'View' => 'Exibir',

65
tests/framework/i18n/FormatterNumberTest.php
Unescape View File

@ -247,51 +247,52 @@ class FormatterNumberTest extends TestCase
//$value = '-123456.123';
//$this->assertSame("($123,456.12)", $this->formatter->asCurrency($value));
// "\xc2\xa0" is used as non-breaking space explicitly
$this->formatter->locale = 'de-DE';
$this->formatter->currencyCode = null;
$this->assertSame('123,00 €', $this->formatter->asCurrency('123'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123'));
$this->formatter->currencyCode = 'USD';
$this->assertSame('123,00 $', $this->formatter->asCurrency('123'));
$this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123'));
$this->formatter->currencyCode = 'EUR';
$this->assertSame('123,00 €', $this->formatter->asCurrency('123'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123'));
$this->formatter->locale = 'de-DE';
$this->formatter->currencyCode = null;
$this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
$this->formatter->currencyCode = 'USD';
$this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
$this->formatter->currencyCode = 'EUR';
$this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
// default russian currency symbol
$this->formatter->locale = 'ru-RU';
$this->formatter->currencyCode = null;
$this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
$this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
$this->formatter->currencyCode = 'RUB';
$this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
$this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
// custom currency symbol
$this->formatter->currencyCode = null;
$this->formatter->numberFormatterSymbols = [
NumberFormatter::CURRENCY_SYMBOL => '₽',
];
$this->assertSame('123,00 ₽', $this->formatter->asCurrency('123'));
$this->assertSame("123,00\xc2\xa0₽", $this->formatter->asCurrency('123'));
$this->formatter->numberFormatterSymbols = [
NumberFormatter::CURRENCY_SYMBOL => 'RUR',
];
$this->assertSame('123,00 RUR', $this->formatter->asCurrency('123'));
$this->assertSame("123,00\xc2\xa0RUR", $this->formatter->asCurrency('123'));
/* See https://github.com/yiisoft/yii2/issues/13629
// setting the currency code overrides the symbol
$this->formatter->currencyCode = 'RUB';
$this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
$this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
$this->formatter->numberFormatterSymbols = [NumberFormatter::CURRENCY_SYMBOL => '₽'];
$this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
$this->formatter->numberFormatterSymbols = [NumberFormatter::CURRENCY_SYMBOL => '₽'];
$this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
*/
// custom separators
@ -299,22 +300,22 @@ class FormatterNumberTest extends TestCase
$this->formatter->currencyCode = null;
$this->formatter->numberFormatterSymbols = [];
$this->formatter->thousandSeparator = ' ';
$this->assertSame('123 456,00 €', $this->formatter->asCurrency('123456', 'EUR'));
$this->assertSame("123 456,00\xc2\xa0€", $this->formatter->asCurrency('123456', 'EUR'));
// empty input
$this->formatter->locale = 'de-DE';
$this->formatter->currencyCode = null;
$this->formatter->numberFormatterSymbols = [];
$this->formatter->thousandSeparator = null;
$this->assertSame('0,00 €', $this->formatter->asCurrency(false));
$this->assertSame('0,00 €', $this->formatter->asCurrency(''));
$this->assertSame("0,00\xc2\xa0€", $this->formatter->asCurrency(false));
$this->assertSame("0,00\xc2\xa0€", $this->formatter->asCurrency(''));
// decimal formatting
$this->formatter->locale = 'de-DE';
$this->assertSame('100 $', \Yii::$app->formatter->asCurrency(100, 'USD', [
$this->assertSame("100\xc2\xa0$", \Yii::$app->formatter->asCurrency(100, 'USD', [
NumberFormatter::MAX_FRACTION_DIGITS => 0,
]));
$this->assertSame('100,00 $', $this->formatter->asCurrency(100, 'USD', [
$this->assertSame("100,00\xc2\xa0$", $this->formatter->asCurrency(100, 'USD', [
NumberFormatter::MAX_FRACTION_DIGITS => 2,
]));
@ -333,29 +334,29 @@ class FormatterNumberTest extends TestCase
];
$this->formatter->locale = 'de-DE';
$this->formatter->currencyCode = null;
$this->assertSame('123 €', $this->formatter->asCurrency('123'));
$this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123'));
$this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->formatter->currencyCode = 'USD';
$this->assertSame('123 $', $this->formatter->asCurrency('123'));
$this->assertSame('123 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123'));
$this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->formatter->currencyCode = 'EUR';
$this->assertSame('123 €', $this->formatter->asCurrency('123'));
$this->assertSame('123 $', $this->formatter->asCurrency('123', 'USD'));
$this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
$this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123'));
$this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
$this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
$this->formatter->locale = 'ru-RU';
$this->formatter->currencyCode = null;
$this->assertIsOneOf($this->formatter->asCurrency('123'), ['123 ₽', '123 руб.']);
$this->assertIsOneOf($this->formatter->asCurrency('123'), ["123\xc2\xa0₽", "123\xc2\xa0руб."]);
$this->formatter->numberFormatterSymbols = [
NumberFormatter::CURRENCY_SYMBOL => '&#8381;',
];
$this->assertSame('123 &#8381;', $this->formatter->asCurrency('123'));
$this->assertSame("123\xc2\xa0&#8381;", $this->formatter->asCurrency('123'));
$this->formatter->numberFormatterSymbols = [];
$this->formatter->currencyCode = 'RUB';
$this->assertIsOneOf($this->formatter->asCurrency('123'), ['123 ₽', '123 руб.']);
$this->assertIsOneOf($this->formatter->asCurrency('123'), ["123\xc2\xa0₽", "123\xc2\xa0руб."]);
}
/**

Write Preview
Loading…
Cancel
Save