Skip to content

Commit 353a221

Browse files
committed
Laravel 6.0 support
1 parent c7d5886 commit 353a221

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Add the following line to the `require` section of your Laravel webapp's `compos
4545

4646
```javascript
4747
"require": {
48-
"HighSolutions/laravel-lang-import-export": "5.4.*"
48+
"HighSolutions/laravel-lang-import-export": "^6.0"
4949
}
5050
```
5151

@@ -110,6 +110,9 @@ When you call command without parameters - it will try to read default file of e
110110
Changelog
111111
------------
112112

113+
6.0.0
114+
* Support Laravel 6.0
115+
113116
5.4.10
114117
* Laravel 5.7 support
115118

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"license": "MIT",
1616
"require": {
1717
"php": ">=5.6.4",
18-
"illuminate/support": "5.x"
18+
"illuminate/support": "5.*|6.*"
1919
},
2020
"autoload": {
2121
"psr-4": {
@@ -27,7 +27,7 @@
2727
},
2828
"extra": {
2929
"component": "package",
30-
"frameworks": ["Laravel 5.7"],
30+
"frameworks": ["Laravel 5.7", "Laravel 5.8", "Laravel 6.0"],
3131
"laravel": {
3232
"providers": [
3333
"HighSolutions\\LangImportExport\\LangImportExportServiceProvider"

src/LangListService.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Lang;
66
use File;
7+
use Illuminate\Support\Arr;
78

89
class LangListService
910
{
@@ -55,7 +56,7 @@ private function isOneGroup($group)
5556
private function getGroup($locale, $group)
5657
{
5758
$translations = Lang::getLoader()->load($locale, $group);
58-
return array_dot($translations);
59+
return Array::dot($translations);
5960
}
6061

6162
/**
@@ -134,11 +135,11 @@ private function getTranslations($locale, $group, $new_translations)
134135
{
135136
$translations = Lang::getLoader()->load($locale, $group);
136137
foreach($new_translations as $key => $value) {
137-
array_set($translations, $key, $value);
138+
Array::set($translations, $key, $value);
138139
}
139140

140141
if(in_array($group, $this->dotFiles)) {
141-
$translations = array_dot($translations);
142+
$translations = Array::dot($translations);
142143
}
143144

144145
return $translations;

0 commit comments

Comments
 (0)