Skip to content

Commit

Permalink
more config testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Carsten committed Jun 29, 2015
1 parent b6fe4c1 commit 63aa58d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class Kernel extends HttpKernel {
'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
'Illuminate\Session\Middleware\StartSession',
'App\Http\Middleware\SetLanguage',
'anlutro\LaravelSettings\SaveMiddleware',
'Illuminate\View\Middleware\ShareErrorsFromSession',
'App\Http\Middleware\VerifyCsrfToken',
];
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"type": "project",
"require": {
"laravel/framework": "5.0.*",
"anlutro/l4-settings": "^0.4.0",
"caffeinated/flash": "~1.0",
"caffeinated/modules": "~1.0",
"caffeinated/plugins": "^1.0",
Expand All @@ -28,8 +29,7 @@
"barryvdh/laravel-httpcache": "0.2.*",
"illuminate/html": "^5.0",
"jbroadway/urlify": "~1.0",
"laravelrus/localized-carbon": "dev-master",
"anlutro/l4-settings": "^0.4.0"
"laravelrus/localized-carbon": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
/*
* Package Alias
*/
'Setting' => 'anlutro\LaravelSettings\Facade',
'Carbon' => 'Carbon\Carbon',
'Component' => 'Caffeinated\Themes\Facades\Component',
'Datatables' => 'yajra\Datatables\Datatables',
Expand All @@ -253,6 +252,7 @@
'NestedSet' => 'Kalnoy\Nestedset\NestedSet',
'Node' => 'Kalnoy\Nestedset\Node',
'Plugin' => 'Caffeinated\Plugins\Facades\Plugin',
'Setting' => 'anlutro\LaravelSettings\Facade',
'Socialize' => 'Laravel\Socialite\Facades\Socialite',
'Theme' => 'Caffeinated\Themes\Facades\Theme',
'Throttle' => 'GrahamCampbell\Throttle\Facades\Throttle',
Expand Down
4 changes: 2 additions & 2 deletions config/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
return array(
/**
* Which type of store to use.
*
*
* Valid options are 'json' and 'database'.
*/
'store' => 'json',
'store' => 'database',

/**
* If the json store is used, give the full path to the .json file
Expand Down

0 comments on commit 63aa58d

Please sign in to comment.