Skip to content

Fix the implementation of the default dialect for the keywords provider #404

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.

Sign up for GitHub

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

Merged
acoulton merged 1 commit into from
Dec 5, 2025
+18 −3
Merged

Fix the implementation of the default dialect for the keywords provider #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/Dialect/KeywordsDialectProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@
*/
final class KeywordsDialectProvider implements DialectProviderInterface
{
private readonly string $defaultLanguage;

public function __construct(
private readonly KeywordsInterface $keywords,
) {
// Assume a default dialect of `en` as the KeywordsInterface does not allow reading its language but returns the current data
$this->defaultLanguage = $this->keywords instanceof ArrayKeywords ? $this->keywords->getLanguage() : 'en';
}

public function getDialect(string $language): GherkinDialect
Expand All @@ -40,10 +44,9 @@ public function getDialect(string $language): GherkinDialect

public function getDefaultDialect(): GherkinDialect
{
// Assume a default dialect of `en` as the KeywordsInterface does not allow reading its language but returns the current data
$language = $this->keywords instanceof ArrayKeywords ? $this->keywords->getLanguage() : 'en';
$this->keywords->setLanguage($this->defaultLanguage);

return $this->buildDialect($language);
return $this->buildDialect($this->defaultLanguage);
}

private function buildDialect(string $language): GherkinDialect
Expand Down
12 changes: 12 additions & 0 deletions tests/Dialect/KeywordsDialectProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use Behat\Gherkin\Dialect\KeywordsDialectProvider;
use Behat\Gherkin\Keywords\ArrayKeywords;
use Behat\Gherkin\Keywords\CachedArrayKeywords;
use PHPUnit\Framework\TestCase;

class KeywordsDialectProviderTest extends TestCase
Expand Down Expand Up @@ -40,4 +41,15 @@ public function testFailsForEmptyKeywordString(): void
$this->expectExceptionMessage('A keyword string must contain at least one keyword.');
$dialectProvider->getDialect('en');
}

public function testDefaultDialectAfterExplicitDialect(): void
{
$dialectProvider = new KeywordsDialectProvider(CachedArrayKeywords::withDefaultKeywords());

$ruDialect = $dialectProvider->getDialect('ru');
$defaultDialect = $dialectProvider->getDefaultDialect();

$this->assertSame('ru', $ruDialect->getLanguage());
$this->assertSame('en', $defaultDialect->getLanguage());
}
}