Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT Handle LogicExceptions when calling setI18nLocale() #11576

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"phpstan/extension-installer": "^1.3"
},
"conflict": {
"silverstripe/behat-extension": "<5.5",
"egulias/email-validator": "^2",
"oscarotero/html-parser": "<0.1.7",
"symfony/process": "<5.3.7"
Expand Down
24 changes: 21 additions & 3 deletions src/Dev/SapphireTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ abstract class SapphireTest extends TestCase implements TestOnly
*/
protected static $fixture_file = null;

/**
* Whether to set the i18n locale to en_US for supported modules before running the test.
* This should only be set to false if calling setI18nLocale() causes the test to
* throw an exception as part of calling setI18nLocale()
*/
protected bool $doSetSupportedModuleLocaleToUS = true;

/**
* @var Boolean If set to TRUE, this will force a test database to be generated
* in {@link setUp()}. Note that this flag is overruled by the presence of a
Expand Down Expand Up @@ -1239,6 +1246,10 @@ protected function mockSleep(int $seconds): DBDatetime
*/
private function setI18nLocale(): void
{
if (!$this->doSetSupportedModuleLocaleToUS) {
$this->setLocaleToDefault();
return;
}
$path = $this->getCurrentRelativePath();
$packagistName = '';
if (preg_match('#(^|/)vendor/([^/]+/[^/]+)/.+#', $path, $matches)) {
Expand All @@ -1261,9 +1272,16 @@ private function setI18nLocale(): void
i18n::config()->set('default_locale', 'en_US');
i18n::set_locale('en_US');
} else {
// Set the locale to the default_locale, which may have been set at project level to a
// non-en_US locale and the project unit tests expect that locale to be set
i18n::set_locale(i18n::config()->get('default_locale'));
$this->setLocaleToDefault();
}
}

/**
* Set the locale to the default_locale, which may have been set at project level to a
* non-en_US locale and the project unit tests expect that locale to be set
*/
private function setLocaleToDefault(): void
{
i18n::set_locale(i18n::config()->get('default_locale'));
}
}
57 changes: 57 additions & 0 deletions tests/php/Dev/SapphireTestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use SilverStripe\ORM\ArrayList;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\i18n\i18n;
use ReflectionMethod;

class SapphireTestTest extends SapphireTest
{
Expand Down Expand Up @@ -230,4 +232,59 @@ public function testAssertListEqualsFailsOnNonEqualLists($matches, $itemsForList

$this->assertListEquals($matches, $list);
}

public static function provideSetI18nLocale(): array
{
return [
'supported-true' => [
'doSet' => true,
'supported' => true,
'expected' => 'en_US',
],
'supported-false' => [
'doSet' => false,
'supported' => true,
'expected' => 'ab_CD',
],
'unsupported-true' => [
'doSet' => true,
'supported' => false,
'expected' => 'ab_CD',
],
'unsupported-false' => [
'doSet' => false,
'supported' => false,
'expected' => 'ab_CD',
],
];
}

/**
* @dataProvider provideSetI18nLocale
*/
public function testSetI18nLocale(bool $doSet, bool $supported, string $expected): void
{
i18n::set_locale('ab_CD');
i18n::config()->set('default_locale', 'ab_CD');
$method = new ReflectionMethod(SapphireTest::class, 'setI18nLocale');
$method->setAccessible(true);
$obj = new class($doSet, $supported) extends SapphireTest
{
private string $supported;
public function __construct(bool $doSet, bool $supported)
{
$this->doSetSupportedModuleLocaleToUS = $doSet;
$this->supported = $supported;
}
protected function getCurrentRelativePath()
{
return $this->supported
? '/vendor/silverstripe/framework/tests/php/FooBarTest.php'
: '/vendor/something/different/tests/php/FooBarTest.php';
}
};
$method->invoke($obj);
$this->assertEquals($expected, i18n::get_locale());
$this->assertEquals($expected, i18n::config()->get('default_locale'));
}
}
Loading