Skip to content

Commit 395b450

Browse files
fabpotfabpot
committed
minor symfony#53240 [Translation] [Bridges] Use CPP (OskarStark)
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [Translation] [Bridges] Use CPP | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | -- | License | MIT Commits ------- 4f822d9 [Translation] [Bridges] Use CPP
2 parents aeb2489 + 4f822d9 commit 395b450

File tree

9 files changed

+52
-89
lines changed

9 files changed

+52
-89
lines changed

‎src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,14 @@
3131
*/
3232
final class CrowdinProvider implements ProviderInterface
3333
{
34-
private HttpClientInterface $client;
35-
private LoaderInterface $loader;
36-
private LoggerInterface $logger;
37-
private XliffFileDumper $xliffFileDumper;
38-
private string $defaultLocale;
39-
private string $endpoint;
40-
41-
public function __construct(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, XliffFileDumper $xliffFileDumper, string $defaultLocale, string $endpoint)
42-
{
43-
$this->client = $client;
44-
$this->loader = $loader;
45-
$this->logger = $logger;
46-
$this->xliffFileDumper = $xliffFileDumper;
47-
$this->defaultLocale = $defaultLocale;
48-
$this->endpoint = $endpoint;
34+
public function __construct(
35+
private HttpClientInterface $client,
36+
private LoaderInterface $loader,
37+
private LoggerInterface $logger,
38+
private XliffFileDumper $xliffFileDumper,
39+
private string $defaultLocale,
40+
private string $endpoint,
41+
) {
4942
}
5043

5144
public function __toString(): string

‎src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,13 @@ final class CrowdinProviderFactory extends AbstractProviderFactory
2727
{
2828
private const HOST = 'api.crowdin.com';
2929

30-
private LoaderInterface $loader;
31-
private HttpClientInterface $client;
32-
private LoggerInterface $logger;
33-
private string $defaultLocale;
34-
private XliffFileDumper $xliffFileDumper;
35-
36-
public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader, XliffFileDumper $xliffFileDumper)
37-
{
38-
$this->client = $client;
39-
$this->logger = $logger;
40-
$this->defaultLocale = $defaultLocale;
41-
$this->loader = $loader;
42-
$this->xliffFileDumper = $xliffFileDumper;
30+
public function __construct(
31+
private HttpClientInterface $client,
32+
private LoggerInterface $logger,
33+
private string $defaultLocale,
34+
private LoaderInterface $loader,
35+
private XliffFileDumper $xliffFileDumper
36+
) {
4337
}
4438

4539
public function create(Dsn $dsn): CrowdinProvider

‎src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,14 @@
3131
*/
3232
final class LocoProvider implements ProviderInterface
3333
{
34-
private HttpClientInterface $client;
35-
private LoaderInterface $loader;
36-
private LoggerInterface $logger;
37-
private string $defaultLocale;
38-
private string $endpoint;
39-
private ?TranslatorBagInterface $translatorBag = null;
40-
41-
public function __construct(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null)
42-
{
43-
$this->client = $client;
44-
$this->loader = $loader;
45-
$this->logger = $logger;
46-
$this->defaultLocale = $defaultLocale;
47-
$this->endpoint = $endpoint;
48-
$this->translatorBag = $translatorBag;
34+
public function __construct(
35+
private HttpClientInterface $client,
36+
private LoaderInterface $loader,
37+
private LoggerInterface $logger,
38+
private string $defaultLocale,
39+
private string $endpoint,
40+
private ?TranslatorBagInterface $translatorBag = null,
41+
) {
4942
}
5043

5144
public function __toString(): string

‎src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@ final class LocoProviderFactory extends AbstractProviderFactory
2626
{
2727
private const HOST = 'localise.biz';
2828

29-
private HttpClientInterface $client;
30-
private LoggerInterface $logger;
31-
private string $defaultLocale;
32-
private LoaderInterface $loader;
33-
private ?TranslatorBagInterface $translatorBag = null;
34-
35-
public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader, TranslatorBagInterface $translatorBag = null)
36-
{
37-
$this->client = $client;
38-
$this->logger = $logger;
39-
$this->defaultLocale = $defaultLocale;
40-
$this->loader = $loader;
41-
$this->translatorBag = $translatorBag;
29+
public function __construct(
30+
private HttpClientInterface $client,
31+
private LoggerInterface $logger,
32+
private string $defaultLocale,
33+
private LoaderInterface $loader,
34+
private ?TranslatorBagInterface $translatorBag = null,
35+
) {
4236
}
4337

4438
public function create(Dsn $dsn): LocoProvider

‎src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,13 @@ final class LokaliseProvider implements ProviderInterface
3232
{
3333
private const LOKALISE_GET_KEYS_LIMIT = 5000;
3434

35-
private HttpClientInterface $client;
36-
private LoaderInterface $loader;
37-
private LoggerInterface $logger;
38-
private string $defaultLocale;
39-
private string $endpoint;
40-
41-
public function __construct(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint)
42-
{
43-
$this->client = $client;
44-
$this->loader = $loader;
45-
$this->logger = $logger;
46-
$this->defaultLocale = $defaultLocale;
47-
$this->endpoint = $endpoint;
35+
public function __construct(
36+
private HttpClientInterface $client,
37+
private LoaderInterface $loader,
38+
private LoggerInterface $logger,
39+
private string $defaultLocale,
40+
private string $endpoint,
41+
) {
4842
}
4943

5044
public function __toString(): string

‎src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,12 @@ final class LokaliseProviderFactory extends AbstractProviderFactory
2525
{
2626
private const HOST = 'api.lokalise.com';
2727

28-
private HttpClientInterface $client;
29-
private LoggerInterface $logger;
30-
private string $defaultLocale;
31-
private LoaderInterface $loader;
32-
33-
public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader)
34-
{
35-
$this->client = $client;
36-
$this->logger = $logger;
37-
$this->defaultLocale = $defaultLocale;
38-
$this->loader = $loader;
28+
public function __construct(
29+
private HttpClientInterface $client,
30+
private LoggerInterface $logger,
31+
private string $defaultLocale,
32+
private LoaderInterface $loader,
33+
) {
3934
}
4035

4136
public function create(Dsn $dsn): LokaliseProvider

‎src/Symfony/Component/Translation/Bridge/Phrase/PhraseProvider.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class PhraseProvider implements ProviderInterface
3232
private array $phraseLocales = [];
3333

3434
public function __construct(
35-
private readonly HttpClientInterface $httpClient,
35+
private readonly HttpClientInterface $client,
3636
private readonly LoggerInterface $logger,
3737
private readonly LoaderInterface $loader,
3838
private readonly XliffFileDumper $xliffFileDumper,
@@ -71,7 +71,7 @@ public function write(TranslatorBagInterface $translatorBag): void
7171

7272
$formData = new FormDataPart($fields);
7373

74-
$response = $this->httpClient->request('POST', 'uploads', [
74+
$response = $this->client->request('POST', 'uploads', [
7575
'body' => $formData->bodyToIterable(),
7676
'headers' => $formData->getPreparedHeaders()->toArray(),
7777
]);
@@ -109,7 +109,7 @@ public function read(array $domains, array $locales): TranslatorBag
109109
$headers = ['If-None-Match' => $cachedResponse['etag']];
110110
}
111111

112-
$response = $this->httpClient->request('GET', 'locales/'.$phraseLocale.'/download', [
112+
$response = $this->client->request('GET', 'locales/'.$phraseLocale.'/download', [
113113
'query' => $this->readConfig,
114114
'headers' => $headers,
115115
]);
@@ -149,7 +149,7 @@ public function delete(TranslatorBagInterface $translatorBag): void
149149
$names = array_map(static fn ($v): ?string => preg_replace('/([\s:,])/', '\\\\\\\\$1', $v), $keys);
150150

151151
foreach ($names as $name) {
152-
$response = $this->httpClient->request('DELETE', 'keys', [
152+
$response = $this->client->request('DELETE', 'keys', [
153153
'query' => [
154154
'q' => 'name:'.$name,
155155
],
@@ -194,7 +194,7 @@ private function getFallbackLocale(string $locale): ?string
194194

195195
private function createLocale(string $locale): void
196196
{
197-
$response = $this->httpClient->request('POST', 'locales', [
197+
$response = $this->client->request('POST', 'locales', [
198198
'body' => [
199199
'name' => $locale,
200200
'code' => $locale,
@@ -221,7 +221,7 @@ private function initLocales(): void
221221
$page = 1;
222222

223223
do {
224-
$response = $this->httpClient->request('GET', 'locales', [
224+
$response = $this->client->request('GET', 'locales', [
225225
'query' => [
226226
'per_page' => 100,
227227
'page' => $page,

‎src/Symfony/Component/Translation/Bridge/Phrase/PhraseProviderFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class PhraseProviderFactory extends AbstractProviderFactory
4141
];
4242

4343
public function __construct(
44-
private readonly HttpClientInterface $httpClient,
44+
private readonly HttpClientInterface $client,
4545
private readonly LoggerInterface $logger,
4646
private readonly LoaderInterface $loader,
4747
private readonly XliffFileDumper $xliffFileDumper,
@@ -62,7 +62,7 @@ public function create(Dsn $dsn): ProviderInterface
6262
$endpoint .= ':'.$port;
6363
}
6464

65-
$client = $this->httpClient->withOptions([
65+
$client = $this->client->withOptions([
6666
'base_uri' => 'https://'.$endpoint.'/v2/projects/'.$this->getUser($dsn).'/',
6767
'headers' => [
6868
'Authorization' => 'token '.$this->getPassword($dsn),

‎src/Symfony/Component/Translation/Util/ArrayConverter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ArrayConverter
2727
{
2828
/**
2929
* Converts linear messages array to tree-like array.
30-
* For example this array('foo.bar' => 'value') will be converted to ['foo' => ['bar' => 'value']].
30+
* For example: ['foo.bar' => 'value'] will be converted to ['foo' => ['bar' => 'value']].
3131
*
3232
* @param array $messages Linear messages array
3333
*/

0 commit comments

Comments
 (0)