Remove WriteConfig

welcoMattic · welcoMattic · commit 49a59da7bea3 · 2023-09-20T17:12:59.000+02:00
diff --git a/src/Symfony/Component/Translation/Bridge/Phrase/PhraseProvider.php b/src/Symfony/Component/Translation/Bridge/Phrase/PhraseProvider.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Translation\Bridge\Phrase;
 
-use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\Multipart\FormDataPart;
-use Symfony\Component\Translation\Bridge\Phrase\Config\WriteConfig;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
 use Symfony\Component\Translation\Exception\ProviderException;
 use Symfony\Component\Translation\Loader\LoaderInterface;
@@ -42,8 +40,8 @@ public function __construct(
         private readonly string $defaultLocale,
         private readonly string $endpoint,
         private array $readConfig,
-        private WriteConfig $writeConfig,
-        private bool $isFallbackLocaleEnabled = false,
+        private array $writeConfig,
+        private readonly bool $isFallbackLocaleEnabled = false,
     ) {
     }
 
@@ -67,7 +65,9 @@ public function write(TranslatorBagInterface $translatorBag): void
                 $content = $this->xliffFileDumper->formatCatalogue($catalogue, $domain, ['default_locale' => $this->defaultLocale]);
                 $filename = sprintf('%d-%s-%s.xlf', date('YmdHis'), $domain, $catalogue->getLocale());
 
-                $fields = array_merge($this->writeConfig->setTag($domain)->setLocale($phraseLocale)->getOptions(), ['file' => new DataPart($content, $filename, 'application/xml')]);
+                $this->writeConfig['tags'] = $domain;
+                $this->writeConfig['locale_id'] = $phraseLocale;
+                $fields = array_merge($this->writeConfig, ['file' => new DataPart($content, $filename, 'application/xml')]);
 
                 $formData = new FormDataPart($fields);
 
diff --git a/src/Symfony/Component/Translation/Bridge/Phrase/PhraseProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Phrase/PhraseProviderFactory.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Translation\Bridge\Phrase\Config\WriteConfig;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
 use Symfony\Component\Translation\Exception\UnsupportedSchemeException;
 use Symfony\Component\Translation\Loader\LoaderInterface;
@@ -36,6 +35,10 @@ class PhraseProviderFactory extends AbstractProviderFactory
             'enclose_in_cdata' => '1',
         ],
     ];
+    private const WRITE_CONFIG_DEFAULT = [
+        'file_format' => 'symfony_xliff',
+        'update_translations' => '1',
+    ];
 
     public function __construct(
         private readonly HttpClientInterface $httpClient,
@@ -68,7 +71,7 @@ public function create(Dsn $dsn): ProviderInterface
         ]);
 
         $readConfig = $this->readConfigFromDsn($dsn);
-        $writeConfig = WriteConfig::fromDsn($dsn);
+        $writeConfig = $this->writeConfigFromDsn($dsn);
 
         return new PhraseProvider($client, $this->logger, $this->loader, $this->xliffFileDumper, $this->cache, $this->defaultLocale, $endpoint, $readConfig, $writeConfig, $this->isFallbackLocaleEnabled($dsn));
     }
@@ -100,4 +103,13 @@ private function readConfigFromDsn(Dsn $dsn): array
 
         return array_merge(self::READ_CONFIG_DEFAULT, $options);
     }
+
+    private function writeConfigFromDsn(Dsn $dsn): array
+    {
+        $options = $dsn->getOptions()['write'] ?? [];
+
+        unset($options['file_format'], $options['tags'], $options['locale_id'], $options['file']);
+
+        return array_merge(self::WRITE_CONFIG_DEFAULT, $options);
+    }
 }
diff --git a/src/Symfony/Component/Translation/Bridge/Phrase/Tests/Config/WriteConfigTest.php b/src/Symfony/Component/Translation/Bridge/Phrase/Tests/Config/WriteConfigTest.php
diff --git a/src/Symfony/Component/Translation/Bridge/Phrase/Tests/PhraseProviderTest.php b/src/Symfony/Component/Translation/Bridge/Phrase/Tests/PhraseProviderTest.php
@@ -19,12 +19,10 @@
 use Symfony\Component\HttpClient\HttpClientTrait;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
-use Symfony\Component\Translation\Bridge\Phrase\Config\WriteConfig;
 use Symfony\Component\Translation\Bridge\Phrase\PhraseProvider;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
 use Symfony\Component\Translation\Exception\ProviderExceptionInterface;
 use Symfony\Component\Translation\Loader\LoaderInterface;
-use Symfony\Component\Translation\LoggingTranslator;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Provider\ProviderInterface;
 use Symfony\Component\Translation\TranslatorBag;
@@ -47,7 +45,7 @@ class PhraseProviderTest extends TestCase
     private string $defaultLocale;
     private string $endpoint;
     private array $readConfig;
-    private MockObject&WriteConfig $writeConfig;
+    private array $writeConfig;
 
     /**
      * @dataProvider toStringProvider
@@ -670,7 +668,7 @@ public function testDeleteProviderExceptions(int $statusCode, string $expectedEx
      */
     public function testWrite(string $locale, string $localeId, string $domain, string $content, TranslatorBag $bag)
     {
-        $this->writeConfigWithDefaultValues($domain, $localeId);
+        $this->getWriteConfig($domain, $localeId);
 
         $responses = [
             'init locales' => $this->getInitLocaleResponseMock(),
@@ -1183,32 +1181,13 @@ private function getReadConfig(): array
         ];
     }
 
-    private function getWriteConfig(): WriteConfig&MockObject
+    private function getWriteConfig(string $domain = 'messages', string $phraseLocale = 'en_GB'): array
     {
-        return $this->writeConfig ??= $this->createMock(WriteConfig::class);
-    }
-
-    private function writeConfigWithDefaultValues(string $domain, string $phraseLocale): void
-    {
-        $this->getWriteConfig()
-            ->method('getOptions')
-            ->willReturn([
-                'file_format' => 'symfony_xliff',
-                'update_translations' => '1',
-                'tags' => $domain,
-                'locale_id' => $phraseLocale,
-            ]);
-
-        $this->getWriteConfig()
-            ->expects(self::once())
-            ->method('setTag')
-            ->with($domain)
-            ->willReturnSelf();
-
-        $this->getWriteConfig()
-            ->expects(self::once())
-            ->method('setLocale')
-            ->with($phraseLocale)
-            ->willReturnSelf();
+        return $this->writeConfig ??= [
+            'file_format' => 'symfony_xliff',
+            'update_translations' => '1',
+            'tags' => $domain,
+            'locale_id' => $phraseLocale,
+        ];
     }
 }
