Merge with upstream

Author: mustafaaloko

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.5.9
   - 5.6
   - 7.0
+  - 7.1
 
 sudo: true
 

ISSUE_TEMPLATE.md

@@ -0,0 +1,8 @@
+- Laravel Version: #.#.#
+- PHP Version:
+- Database Driver & Version:
+
+### Description:
+
+
+### Steps to reproduce:

composer.json

@@ -13,14 +13,15 @@
     ],
     "require": {
         "php": "^5.5.9 || ^7.0",
-        "illuminate/support": "5.1.* || 5.2.*",
-        "illuminate/console": "5.1.* || 5.2.*",
-        "illuminate/filesystem": "5.1.* || 5.2.*",
+        "illuminate/support": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/console": "5.1.* || 5.2.* || 5.3.*",
+        "illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*",
         "phpoffice/phpexcel": "^1.8"
     },
     "require-dev": {
         "phpunit/phpunit" : "^4.8 || ^5.0",
-        "orchestra/testbench": "^3.2",
+        "orchestra/testbench": "3.3.x-dev",
+        "orchestra/database": "3.3.x-dev",
         "mockery/mockery": "~0.9.4"
     },
     "autoload": {

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

@@ -232,7 +232,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}',";
             }
@@ -315,8 +315,9 @@ public function getAllViewFilesWithTranslations()
         $functions = ['trans', 'trans_choice', 'Lang::get', 'Lang::choice', 'Lang::trans', 'Lang::transChoice', '@lang', '@choice'];
 
         $pattern =
-            // See https://regex101.com/r/jS5fX0/2
-            '[^\w|>]'. // Must not start with any alphanum or _ or >
+            // See https://regex101.com/r/jS5fX0/3
+            '[^\w]'. // Must not start with any alphanum or _
+            '(?<!->)'. // Must not start with ->
             '('.implode('|', $functions).')'.// Must start with one of the functions
             "\(".// Match opening parentheses
             "[\'\"]".// Match " or '
@@ -381,7 +382,7 @@ public function getKeysExistingInALanguageButNotTheOther($values)
             }
 
             foreach ($this->languages() as $languageName) {
-                if (! Arr::has($values, "{$fileName}.{$languageName}.{$key}")) {
+                if (! Arr::has($values, "{$fileName}.{$languageName}.{$key}") && ! array_key_exists("{$fileName}.{$languageName}.{$key}", $values)) {
                     $missing[] = "{$fileName}.{$key}:{$languageName}";
                 }
             }

tests/ManagerTest.php

@@ -91,6 +91,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.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.blade.php'));
+    }
 }