Use session() helper.

nonoesp · nonoesp · commit 0d508e237b8e · 2024-07-16T19:00:13.000+02:00
diff --git a/resources/views/layout/plain.blade.php b/resources/views/layout/plain.blade.php
@@ -101,7 +101,7 @@
 
 <body>
 
-	@if($notification = Request::session()->get('notification'))
+	@if($notification = session()->get('notification'))
 		{!! view('folio::partial.o-notification', ['notification' => $notification]) !!}
 	@endif
 
diff --git a/resources/views/legacy/layout.blade.php b/resources/views/legacy/layout.blade.php
@@ -160,7 +160,7 @@
 		]) !!}
 	@endif
 
-	@if($notification = Request::session()->get('notification'))
+	@if($notification = session()->get('notification'))
 		{!! view('folio::partial.o-notification', [
 			'notification' => $notification,
 			'classes' => ['o-notification--light'],
diff --git a/src/Controllers/FolioController.php b/src/Controllers/FolioController.php
@@ -222,7 +222,7 @@ public static function showItemBySlug($domain, Request $request, $slug) {
 						$notification = trans('folio::base.preview-of-unpublished-page');
 					}
 
-					$request->session()->flash('notification', $notification);
+					session()->flash('notification', $notification);
 				} else {
 					// private and hidden (no auth)
 					return response()->view('errors.404', [], 404);
diff --git a/src/Controllers/LoginController.php b/src/Controllers/LoginController.php
@@ -44,9 +44,9 @@ public function logout(Request $request)
         
         $this->guard()->logout();
 
-        $request->session()->invalidate();
+        session()->invalidate();
 
-        $request->session()->regenerateToken();
+        session()->regenerateToken();
 
         session(['email' => $email]); // Nono+
 

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public static function showItemBySlug($domain, Request $request, $slug) {`
`222`	`222`	`$notification = trans('folio::base.preview-of-unpublished-page');`
`223`	`223`	`}`
`224`	`224`
`225`		`- $request->session()->flash('notification', $notification);`
	`225`	`+ session()->flash('notification', $notification);`
`226`	`226`	`} else {`
`227`	`227`	`// private and hidden (no auth)`
`228`	`228`	`return response()->view('errors.404', [], 404);`