Merge branch '5.3' into 5.4

fabpot · fabpot · commit 7d5feac8ab61 · 2021-07-24T17:04:41.000+02:00
* 5.3:
  [Translation] [Lokalise] Fix `base_uri`
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php
@@ -54,7 +54,7 @@ public function create(Dsn $dsn): ProviderInterface
         $endpoint .= $dsn->getPort() ? ':'.$dsn->getPort() : '';
 
         $client = $this->client->withOptions([
-            'base_uri' => 'https://'.$endpoint.'/projects/'.$this->getUser($dsn).'/api2/',
+            'base_uri' => 'https://'.$endpoint.'/api2/projects/'.$this->getUser($dsn).'/',
             'headers' => [
                 'X-Api-Token' => $this->getPassword($dsn),
             ],
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderFactoryTest.php b/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderFactoryTest.php
@@ -2,7 +2,10 @@
 
 namespace Symfony\Component\Translation\Bridge\Lokalise\Tests;
 
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProviderFactory;
+use Symfony\Component\Translation\Provider\Dsn;
 use Symfony\Component\Translation\Provider\ProviderFactoryInterface;
 use Symfony\Component\Translation\Test\ProviderFactoryTestCase;
 
@@ -32,6 +35,19 @@ public function incompleteDsnProvider(): iterable
         yield ['lokalise://default'];
     }
 
+    public function testBaseUri()
+    {
+        $response = new MockResponse(json_encode(['files' => []]));
+        $httpClient = new MockHttpClient([$response]);
+        $factory = new LokaliseProviderFactory($httpClient, $this->getLogger(), $this->getDefaultLocale(), $this->getLoader());
+        $provider = $factory->create(new Dsn('lokalise://PROJECT_ID:API_KEY@default'));
+
+        // Make a real HTTP request.
+        $provider->read(['messages'], ['en']);
+
+        $this->assertMatchesRegularExpression('/https:\/\/api.lokalise.com\/api2\/projects\/PROJECT_ID\/*/', $response->getRequestUrl());
+    }
+
     public function createFactory(): ProviderFactoryInterface
     {
         return new LokaliseProviderFactory($this->getClient(), $this->getLogger(), $this->getDefaultLocale(), $this->getLoader());
