Mirrors/wiosna-dev_common-library
1
0
Fork 1
mirror of https://github.com/wiosna-dev/common-library.git synced 2026-03-12 01:31:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Utilities - Locale - setLocale() method - return result of setting new locale (instead of "true")

Browse Source 
Tests - Locale - fix incorrectly prepared tests
This commit is contained in:
Meritoo
2018-01-27 13:04:04 +01:00
parent 1e3e1d454e
commit af38c35a1b
2 changed files with 87 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Utilities/Locale.php
View File

@@ -23,7 +23,7 @@ class Locale
* setting. It's the same constant as required by setlocale() function.
* @param string $languageCode Language code, in ISO 639-1 format. Short form of the locale, e.g. "fr".
* @param string $countryCode (optional) Country code, in ISO 3166-1 alpha-2 format, e.g. "FR"
* @return bool
* @return false|string
*
* Available categories (values of $category argument):
* - LC_ALL for all of the below
@@ -57,9 +57,8 @@ class Locale
}
$localeLongForm = self::getLongForm($languageCode, $countryCode);
setlocale($category, $localeLongForm);
return true;
return setlocale($category, $localeLongForm);
}
/**

87
tests/Utilities/LocaleTest.php
View File

@@ -40,7 +40,7 @@ class LocaleTest extends BaseTestCase
* @param string $encoding Encoding of the final locale
* @param string $expected Expected long form of the locale
*
* @dataProvider provideLanguageAndCountryCode
* @dataProvider provideLanguageEncodingAndCountryCode
*/
public function testGetLongForm($languageCode, $countryCode, $encoding, $expected)
{
@@ -56,24 +56,31 @@ class LocaleTest extends BaseTestCase
self::assertFalse(Locale::setLocale($emptyValue, $emptyValue));
}
public function testSetLocaleIncorrectCategory()
{
self::assertFalse(Locale::setLocale(-1, 'en'));
}
/**
* @param int $category Named constant specifying the category of the functions affected by the locale
* setting. It's the same constant as required by setlocale() function.
* @param string $languageCode Language code, in ISO 639-1 format. Short form of the locale, e.g. "fr".
* @param string $countryCode Country code, in ISO 3166-1 alpha-2 format, e.g. "FR"
* @param string $expectedLocale Expected locale
*
* @dataProvider provideCategoryAndLanguageCode
* @dataProvider provideCategoryLanguageCodeAndExpectedLocale
*/
public function testSetLocale($category, $languageCode)
public function testSetLocale($category, $languageCode, $countryCode, $expectedLocale)
{
self::assertTrue(Locale::setLocale($category, $languageCode));
self::assertEquals($expectedLocale, Locale::setLocale($category, $languageCode, $countryCode));
}
/**
* Provides language and country code
* Provides language, encoding and country code
*
* @return Generator
*/
public function provideLanguageAndCountryCode()
public function provideLanguageEncodingAndCountryCode()
{
yield[
'fr',
@@ -102,33 +109,97 @@ class LocaleTest extends BaseTestCase
'UTF-8',
'fr_FR.UTF-8',
];
yield[
'en',
'US',
'',
'en_US',
];
yield[
'en',
'US',
'UTF-8',
'en_US.UTF-8',
];
yield[
'en',
'US',
'ISO-8859-1',
'en_US.ISO-8859-1',
];
}
/**
* Provides category and language
* Provides category
*
* @return Generator
*/
public function provideCategoryAndLanguageCode()
public function provideCategoryLanguageCodeAndExpectedLocale()
{
yield[
LC_ALL,
'fr',
'',
'fr_FR.UTF-8',
];
yield[
LC_COLLATE,
'fr',
'FR',
'fr_FR.UTF-8',
];
yield[
LC_CTYPE,
'en',
'US',
'en_US.UTF-8',
];
yield[
LC_NUMERIC,
'en',
'GB',
'en_GB.UTF-8',
];
yield[
LC_MONETARY,
'es',
'',
'es_ES.UTF-8',
];
yield[
LC_MONETARY,
'es',
'ES',
'es_ES.UTF-8',
];
yield[
LC_TIME,
'it',
'',
'it_IT.UTF-8',
];
yield[
LC_TIME,
'it',
'IT',
'it_IT.UTF-8',
];
yield[
LC_TIME,
'it',
'it',
'it_IT.UTF-8',
];
}
}