Merge branch 'master' into 5.3-initial

Author: themsaid

src/Commands/SyncCommand.php

@@ -79,6 +79,12 @@ private function syncKeysFromFiles($translationFiles)
                 if (isset($allKeysInFiles[$fileName])) {
                     $missingKeys = array_diff($allKeysInFiles[$fileName], array_keys(array_dot($fileContent)));
 
+                    foreach ($missingKeys as $i => $missingKey) {
+                        if (Arr::has($fileContent, $missingKey)) {
+                            unset($missingKeys[$i]);
+                        }
+                    }
+
                     $this->fillMissingKeys($fileName, $missingKeys, $languageKey);
                 }
             }

src/Manager.php

@@ -226,7 +226,7 @@ private function stringLineMaker($array, $prepend = '')
 
                 $output .= "\n{$prepend}    '{$key}' => [{$value}\n{$prepend}    ],";
             } else {
-                $value = addslashes($value);
+                $value = str_replace('\"', '"', addslashes($value));
 
                 $output .= "\n{$prepend}    '{$key}' => '{$value}',";
             }

tests/ManagerTest.php

@@ -83,6 +83,8 @@ public function testWriteFile()
         $values = [
             'name' => ['first' => 'first', 'last' => ['last1' => '1', 'last2' => 2]],
             'age' => 'age',
+            'double_quotes' => '"with quotes"',
+            'quotes' => "With some ' quotes",
         ];
 
         $manager->writeFile($filePath, $values);

tests/SyncCommandTest.php

@@ -69,4 +69,23 @@ public function testCommandOutputForMissingSubKey()
         array_map('rmdir', glob(__DIR__.'/views_temp/user'));
         array_map('unlink', glob(__DIR__.'/views_temp/user.blade.php'));
     }
+
+    public function testItDoesntOverrideParentKey()
+    {
+        array_map('unlink', glob(__DIR__.'/views_temp/user/index.blade.php'));
+
+        file_put_contents(__DIR__.'/views_temp/user.blade.php', '{{ trans(\'user.name\') }}');
+
+        $this->createTempFiles([
+            'en' => ['user' => "<?php\n return ['name' => ['middle' => 'middle']];"],
+        ]);
+
+        $this->artisan('langman:sync');
+
+        $userENFile = (array) include $this->app['config']['langman.path'].'/en/user.php';
+
+        $this->assertEquals(['middle' => 'middle'], $userENFile['name']);
+
+        array_map('unlink', glob(__DIR__.'/views_temp/user/index.blade.php'));
+    }
 }