Skip to content

Commit d71ff19

Browse files
authored
Laravel 6 (#8)
laravel 6 support
1 parent 34737d5 commit d71ff19

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
php:
4-
- 7.1
4+
- 7.2
55

66
before_script:
77
- travis_retry composer self-update

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

33
All notable changes to `qcod/laravel-settings` will be documented in this file
44

5+
## 1.0.7 - 2019-09-05
6+
- Laravel 6 support
7+
8+
## 1.0.6 - 2019-08-01
9+
10+
- Organize settings into groups support
11+
12+
## 1.0.5 - 2018-03-13
13+
14+
- added support for publishing migration folder
15+
16+
## 1.0.4 - 2018-12-20
17+
18+
- added support for publishing migration folder
19+
20+
## 1.0.3 - 2018-12-20
21+
22+
- added migration publishing support
23+
524
## 1.0.2 - 2018-10-10
625

726
- Changed helper function and facade name, made them plural

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=5.6.0",
22-
"laravel/framework": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0"
21+
"php": "^7.2",
22+
"laravel/framework": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": "~3.4",
25+
"orchestra/testbench": "~3.4|^4.0",
2626
"mockery/mockery": "^0.9.4 || ~1.0",
27-
"phpunit/phpunit": "~7.0"
27+
"phpunit/phpunit": "^8.0"
2828
},
2929
"autoload": {
3030
"classmap": [

src/helpers.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
*/
1212
function settings($key = null, $default = null)
1313
{
14+
$setting = app()->make('QCod\Settings\Setting\SettingStorage');
15+
1416
if (is_null($key)) {
15-
return app()->make('QCod\Settings\Setting\SettingStorage');
17+
return $setting;
1618
}
1719

1820
if (is_array($key)) {
19-
return app()->make('QCod\Settings\Setting\SettingStorage')->set($key);
21+
return $setting->set($key);
2022
}
2123

22-
return app()->make('QCod\Settings\Setting\SettingStorage')->get($key, value($default));
24+
return $setting->get($key, value($default));
2325
}
2426
}

0 commit comments

Comments
 (0)