bug #47391 [LokaliseBridge] Fix push command --delete-missing options when there are no missing messages (rwionczek)

fabpot · fabpot · commit c2c522aa3e7f · 2022-08-26T07:58:28.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [LokaliseBridge] Fix push command --delete-missing options when there are no missing messages | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | When `translation:push lokalise --delete-missing` command is executed and the messages are the same locally as in Lokalise, then the command removes all messages from Lokalise. This happens because the `getKeysIds` method in `LokaliseProvider` return all key ids when receives an empty array (empty `filter_keys` param in request to Lokalise API). This code prevent execution of `getKeysIds` method when there are no messages to delete from Lokalise. Commits ------- c4f651e [LokaliseBridge] Fix push command --delete-missing options when there are no missing messages
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php
@@ -120,10 +120,12 @@ public function delete(TranslatorBagInterface $translatorBag): void
         $keysIds = [];
 
         foreach ($catalogue->getDomains() as $domain) {
-            $keysToDelete = [];
-            foreach (array_keys($catalogue->all($domain)) as $key) {
-                $keysToDelete[] = $key;
+            $keysToDelete = array_keys($catalogue->all($domain));
+
+            if (!$keysToDelete) {
+                continue;
             }
+
             $keysIds += $this->getKeysIds($keysToDelete, $domain);
         }
 
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php b/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php
@@ -699,10 +699,12 @@ public function testDeleteProcess()
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
             'messages' => ['a' => 'trans_en_a'],
             'validators' => ['post.num_comments' => '{count, plural, one {# comment} other {# comments}}'],
+            'domain_without_missing_messages' => [],
         ]));
         $translatorBag->addCatalogue(new MessageCatalogue('fr', [
             'messages' => ['a' => 'trans_fr_a'],
             'validators' => ['post.num_comments' => '{count, plural, one {# commentaire} other {# commentaires}}'],
+            'domain_without_missing_messages' => [],
         ]));
 
         $provider = $this->createProvider(

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,12 @@ public function delete(TranslatorBagInterface $translatorBag): void`
`120`	`120`	`$keysIds = [];`
`121`	`121`
`122`	`122`	`foreach ($catalogue->getDomains() as $domain) {`
`123`		`- $keysToDelete = [];`
`124`		`- foreach (array_keys($catalogue->all($domain)) as $key) {`
`125`		`- $keysToDelete[] = $key;`
	`123`	`+ $keysToDelete = array_keys($catalogue->all($domain));`
	`124`	`+`
	`125`	`+ if (!$keysToDelete) {`
	`126`	`+ continue;`
`126`	`127`	`}`
	`128`	`+`
`127`	`129`	`$keysIds += $this->getKeysIds($keysToDelete, $domain);`
`128`	`130`	`}`
`129`	`131`