Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 04bc1ab

Browse files
[Translation] Fix merge
1 parent 656b43e commit 04bc1ab

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
712712
'headers' => [
713713
'Authorization' => 'Loco API_KEY',
714714
],
715-
]), $loader, new NullLogger(), 'en', 'localise.biz/api/', $this->getTranslatorBag());
715+
]), $loader, new NullLogger(), 'en', 'localise.biz/api/');
716716
$translatorBag = $provider->read([$domain], [$locale]);
717717
// We don't want to assert equality of metadata here, due to the ArrayLoader usage.
718718
foreach ($translatorBag->getCatalogues() as $catalogue) {
@@ -750,7 +750,7 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
750750
'headers' => [
751751
'Authorization' => 'Loco API_KEY',
752752
],
753-
]), $loader, $this->getLogger(), 'en', 'localise.biz/api/', $this->getTranslatorBag());
753+
]), $loader, $this->getLogger(), 'en', 'localise.biz/api/');
754754
$translatorBag = $provider->read($domains, $locales);
755755
// We don't want to assert equality of metadata here, due to the ArrayLoader usage.
756756
foreach ($translatorBag->getCatalogues() as $catalogue) {

src/Symfony/Component/Translation/Test/ProviderTestCase.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\Translation\Dumper\XliffFileDumper;
1818
use Symfony\Component\Translation\Loader\LoaderInterface;
1919
use Symfony\Component\Translation\Provider\ProviderInterface;
20-
use Symfony\Component\Translation\TranslatorBagInterface;
2120
use Symfony\Contracts\HttpClient\HttpClientInterface;
2221

2322
/**
@@ -35,7 +34,7 @@ abstract class ProviderTestCase extends TestCase
3534
protected $loader;
3635
protected $xliffFileDumper;
3736

38-
abstract public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface;
37+
abstract public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface;
3938

4039
/**
4140
* @return iterable<array{0: ProviderInterface, 1: string}>

0 commit comments

Comments
 (0)