Fix #28: Fix saving strings with quote

darkdef · web-flow · commit 77a467c7db40 · 2021-06-21T11:31:27.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,8 @@
 
 ## 1.0.1 under development
 
-- no changes in this release.
+- Bug #28: Fix saving strings with quote (darkdef)
 
 ## 1.0.0 May 13, 2021
 
-- Initial release.
+- Initial release.
diff --git a/src/MessageSource.php b/src/MessageSource.php
@@ -137,9 +137,9 @@ private function messagesToCode(array $messages): string
             }
 
             $code .= "\n" . '    ';
-            $code .= "'{$messageId}'";
+            $code .= var_export($messageId, true);
             $code .= ' => ';
-            $code .= "'{$messageData['message']}'";
+            $code .= var_export($messageData['message'], true);
             $code .= ',';
         }
         $code .= "\n" . ']';
diff --git a/tests/MessageSourceTest.php b/tests/MessageSourceTest.php
@@ -79,6 +79,32 @@ public function generateFailTranslationsData(): array
         ];
     }
 
+    public function generateTranslationsDataWithQuotes(): array
+    {
+        return [
+            [
+                'app',
+                'de',
+                [
+                    'test\'.id1' => [
+                        'message' => 'app: \'Test 1\' on the (de)',
+                        'comment' => 'Translate \'wisely!',
+                    ],
+                    'test.\'id2\'' => [
+                        'message' => 'app: Test 1\' on the (de)',
+                        'comment' => 'Translate \'wisely!',
+                    ],
+                    'test."id3' => [
+                        'message' => 'app: "Test 2" on the (de)',
+                    ],
+                    'test."id4"' => [
+                        'message' => 'app: Test 3" on the (de)',
+                    ],
+                ],
+            ],
+        ];
+    }
+
     protected function tearDown(): void
     {
         $this->cleanFiles();
@@ -246,4 +272,18 @@ public function testReadMessages(string $category, string $locale, array $data):
         $messages = $messageSource->getMessages($category, $locale);
         $this->assertEquals($messages, $referenceMessages);
     }
+
+    /**
+     * @dataProvider generateTranslationsDataWithQuotes
+     */
+    public function testWriteQuotedString(string $category, string $locale, array $data): void
+    {
+        $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'translate_tests' . uniqid();
+
+        $messageSource = new MessageSource($this->path);
+        $messageSource->write($category, $locale, $data);
+        foreach ($data as $id => $value) {
+            $this->assertEquals($messageSource->getMessage($id, $category, $locale), $value['message']);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,9 @@ private function messagesToCode(array $messages): string`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$code .= "\n" . ' ';`
`140`		`- $code .= "'{$messageId}'";`
	`140`	`+ $code .= var_export($messageId, true);`
`141`	`141`	`$code .= ' => ';`
`142`		`- $code .= "'{$messageData['message']}'";`
	`142`	`+ $code .= var_export($messageData['message'], true);`
`143`	`143`	`$code .= ',';`
`144`	`144`	`}`
`145`	`145`	`$code .= "\n" . ']';`