[Translation] [LocoProvider] Use rawurlencode and separate tag setting

danut007ro · nicolas-grekas · commit b69485887ca4 · 2021-12-28T15:15:18.000+01:00
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -140,7 +140,7 @@ public function delete(TranslatorBagInterface $translatorBag): void
 
         foreach (array_keys($catalogue->all()) as $domain) {
             foreach ($this->getAssetsIds($domain) as $id) {
-                $responses[$id] = $this->client->request('DELETE', sprintf('assets/%s.json', $id));
+                $responses[$id] = $this->client->request('DELETE', sprintf('assets/%s.json', rawurlencode($id)));
             }
         }
 
@@ -202,7 +202,7 @@ private function translateAssets(array $translations, string $locale): void
         $responses = [];
 
         foreach ($translations as $id => $message) {
-            $responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', $id, $locale), [
+            $responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', rawurlencode($id), rawurlencode($locale)), [
                 'body' => $message,
             ]);
         }
@@ -220,13 +220,35 @@ private function tagsAssets(array $ids, string $tag): void
             $this->createTag($tag);
         }
 
-        $response = $this->client->request('POST', sprintf('tags/%s.json', $tag), [
-            'body' => implode(',', $ids),
+        // Separate ids with and without comma.
+        $idsWithComma = $idsWithoutComma = [];
+        foreach ($ids as $id) {
+            if (false !== strpos($id, ',')) {
+                $idsWithComma[] = $id;
+            } else {
+                $idsWithoutComma[] = $id;
+            }
+        }
+
+        // Set tags for all ids without comma.
+        $response = $this->client->request('POST', sprintf('tags/%s.json', rawurlencode($tag)), [
+            'body' => implode(',', $idsWithoutComma),
         ]);
 
         if (200 !== $response->getStatusCode()) {
             $this->logger->error(sprintf('Unable to tag assets with "%s" on Loco: "%s".', $tag, $response->getContent(false)));
         }
+
+        // Set tags for each id with comma one by one.
+        foreach ($idsWithComma as $id) {
+            $response = $this->client->request('POST', sprintf('assets/%s/tags', rawurlencode($id)), [
+                'body' => ['name' => $tag],
+            ]);
+
+            if (200 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to tag asset "%s" with "%s" on Loco: "%s".', $id, $tag, $response->getContent(false)));
+            }
+        }
     }
 
     private function createTag(string $tag): void
