Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Commit a5ca805

Browse files
committed
Remove session access from controller constructor
Prevents sticking to bad practice and stages enhancement for L5.3 Discussion: laravel/framework#15072 (comment)
1 parent 8ab017d commit a5ca805

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

app/Http/Controllers/Controller.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ class Controller extends BaseController
1313

1414
public function __construct()
1515
{
16-
view()->share('isGuest', auth()->guest());
17-
view()->share('signedIn', auth()->check());
18-
view()->share('user', auth()->user());
16+
//
1917
}
2018
}

app/Http/Controllers/User/UserPreferencesController.php

+3-12
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,14 @@
88

99
class UserPreferencesController extends Controller
1010
{
11-
protected $user;
12-
13-
public function __construct()
14-
{
15-
parent::__construct();
16-
17-
$this->user = auth()->user();
18-
}
19-
2011
public function getPreferences()
2112
{
2213
logger()->info(__METHOD__);
2314

2415
// BEGIN
2516

2617
$parameters = config()->get('preferences.App\Models\User');
27-
$preferences = $this->user->preferences;
18+
$preferences = auth()->user()->preferences;
2819

2920
return view('user.preferences.edit', compact('preferences', 'parameters'));
3021
}
@@ -60,13 +51,13 @@ protected function setUserPreferences($preferences)
6051
foreach ($mergedPreferences as $key => $value) {
6152
logger()->info(sprintf(
6253
"set preference: UserId:%s key:%s='%s' type:%s",
63-
$this->user->id,
54+
auth()->user()->id,
6455
$key,
6556
$value,
6657
$parameters[$key]['type']
6758
));
6859

69-
$this->user->pref($key, $value, $parameters[$key]['type']);
60+
auth()->user()->pref($key, $value, $parameters[$key]['type']);
7061
}
7162
}
7263
}

app/Providers/ComposerServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function boot()
2222
);
2323

2424
view()->composer(
25-
['layouts.app', 'layouts.user'], \App\Http\ViewComposers\AuthComposer::class
25+
['*'], \App\Http\ViewComposers\AuthComposer::class
2626
);
2727

2828
view()->composer(

0 commit comments

Comments
 (0)