Skip to content

Commit b475163

Browse files
authored
Merge pull request #473 from gsteel/translator-v2
Permit installation of `laminas/laminas-translator@2.0.0`
2 parents b6459ac + 7461267 commit b475163

3 files changed

Lines changed: 22 additions & 13 deletions

File tree

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"ext-intl": "*",
3939
"laminas/laminas-servicemanager": "^4.4.0",
4040
"laminas/laminas-stdlib": "^3.19",
41-
"laminas/laminas-translator": "^1.0",
41+
"laminas/laminas-translator": "^1.0 || ^2.0",
4242
"psr/container": "^1.1 || ^2.0",
4343
"psr/http-client": "^1.0.3",
4444
"psr/http-factory": "^1.1.0",
@@ -47,6 +47,7 @@
4747
"require-dev": {
4848
"laminas/laminas-coding-standard": "^3.1.0",
4949
"laminas/laminas-diactoros": "^3.8.0",
50+
"laminas/laminas-translator": "^2.0",
5051
"phpunit/phpunit": "^11.5.55",
5152
"psalm/plugin-phpunit": "^0.19.7",
5253
"vimeo/psalm": "^6.16.1"

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/TestAsset/Translator.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,22 @@ public function __construct(public array $translations)
1414
}
1515

1616
/** @inheritDoc */
17-
public function translate($message, $textDomain = 'default', $locale = null)
18-
{
17+
public function translate(
18+
string $message,
19+
string $textDomain = self::DEFAULT_TEXT_DOMAIN,
20+
?string $locale = null,
21+
): string {
1922
return $this->translations[$message] ?? $message;
2023
}
2124

2225
/** @inheritDoc */
23-
public function translatePlural($singular, $plural, $number, $textDomain = 'default', $locale = null)
24-
{
26+
public function translatePlural(
27+
string $singular,
28+
string $plural,
29+
int $number,
30+
string $textDomain = self::DEFAULT_TEXT_DOMAIN,
31+
?string $locale = null
32+
): string {
2533
return $number === 1 ? $singular : $plural;
2634
}
2735
}

0 commit comments

Comments
 (0)