@@ -140,9 +140,7 @@ public function toolbarAction(Request $request, $token)
140140 throw new NotFoundHttpException ('The profiler must be enabled. ' );
141141 }
142142
143- $ session = $ request ->getSession ();
144-
145- if (null !== $ session && $ session ->isStarted () && $ session ->getFlashBag () instanceof AutoExpireFlashBag) {
143+ if ($ request ->hasSession () && ($ session = $ request ->getSession ()) && $ session ->isStarted () && $ session ->getFlashBag () instanceof AutoExpireFlashBag) {
146144 // keep current flashes for one more request if using AutoExpireFlashBag
147145 $ session ->getFlashBag ()->setAll ($ session ->getFlashBag ()->peekAll ());
148146 }
@@ -199,7 +197,7 @@ public function searchBarAction(Request $request)
199197 $ this ->cspHandler ->disableCsp ();
200198 }
201199
202- if (null === $ session = $ request ->getSession ()) {
200+ if (! $ request ->hasSession ()) {
203201 $ ip =
204202 $ method =
205203 $ statusCode =
@@ -209,6 +207,8 @@ public function searchBarAction(Request $request)
209207 $ limit =
210208 $ token = null ;
211209 } else {
210+ $ session = $ request ->getSession ();
211+
212212 $ ip = $ request ->query ->get ('ip ' , $ session ->get ('_profiler_search_ip ' ));
213213 $ method = $ request ->query ->get ('method ' , $ session ->get ('_profiler_search_method ' ));
214214 $ statusCode = $ request ->query ->get ('status_code ' , $ session ->get ('_profiler_search_status_code ' ));
@@ -308,7 +308,9 @@ public function searchAction(Request $request)
308308 $ limit = $ request ->query ->get ('limit ' );
309309 $ token = $ request ->query ->get ('token ' );
310310
311- if (null !== $ session = $ request ->getSession ()) {
311+ if ($ request ->hasSession ()) {
312+ $ session = $ request ->getSession ();
313+
312314 $ session ->set ('_profiler_search_ip ' , $ ip );
313315 $ session ->set ('_profiler_search_method ' , $ method );
314316 $ session ->set ('_profiler_search_status_code ' , $ statusCode );
0 commit comments