Laravel 6.0 support

krisboblea · Sep 4, 2019 · 7729223 · 7729223
1 parent 792e624
commit 7729223
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/console": "5.*",
-        "illuminate/support": "5.*",
+        "illuminate/console": "5.*|6.*",
+        "illuminate/support": "5.*|6.*",
         "symfony/finder": "*"
     },
     "autoload": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "component": "package",
-        "frameworks": ["Laravel 5.7"],
+        "frameworks": ["Laravel 5.7", "Laravel 5.8", "Laravel 6.0"],
         "laravel": {
             "providers": [
                 "HighSolutions\\TranslationManager\\ManagerServiceProvider",

diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ Add the following line to the `require` section of your Laravel webapp's `compos
 
 ```javascript
     "require": {
-        "highsolutions/laravel-translation-manager": "0.4.x"
+        "highsolutions/laravel-translation-manager": "^1.0"
     }
 ```
 
@@ -308,6 +308,9 @@ Do not use this inside of non-clickable elements (title attribute, alt attribute
 Changelog
 ---------
 
+1.0.0
+* Support Laravel 6.0
+
 0.6.0
 * No STRICT_MODE needed anymore
 

diff --git a/src/Manager.php b/src/Manager.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Symfony\Component\Finder\Finder;
+use Illuminate\Support\Arr;
 
 class Manager
 {
@@ -66,7 +67,7 @@ public function importTranslations($replace = false)
                 if (!$translations || !is_array($translations))
                     continue;
 
-                foreach(array_dot($translations) as $key => $value) {
+                foreach(Array::dot($translations) as $key => $value) {
                    if(is_array($value)) // process only string values
                         continue;
 
@@ -193,7 +194,7 @@ protected function makeTree($translations)
     {
         $array = array();
         foreach($translations as $translation) {
-            array_set(
+            Array::set(
                 $array[$translation->locale][$translation->group], 
                 $translation->key, 
                 $translation->value