File tree Expand file tree Collapse file tree 4 files changed +4
-8
lines changed Expand file tree Collapse file tree 4 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -1387,7 +1387,7 @@ public function getRequestFormat(?string $default = 'html')
1387
1387
$ this ->format = $ this ->attributes ->get ('_format ' );
1388
1388
}
1389
1389
1390
- return null === $ this ->format ? $ default : $ this -> format ;
1390
+ return $ this ->format ?? $ default ;
1391
1391
}
1392
1392
1393
1393
/**
Original file line number Diff line number Diff line change @@ -94,10 +94,6 @@ public function getParentRequest()
94
94
{
95
95
$ pos = \count ($ this ->requests ) - 2 ;
96
96
97
- if (!isset ($ this ->requests [$ pos ])) {
98
- return null ;
99
- }
100
-
101
- return $ this ->requests [$ pos ];
97
+ return $ this ->requests [$ pos ] ?? null ;
102
98
}
103
99
}
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ public function hasCacheControlDirective(string $key)
174
174
*/
175
175
public function getCacheControlDirective (string $ key )
176
176
{
177
- return \array_key_exists ( $ key , $ this ->computedCacheControl ) ? $ this -> computedCacheControl [$ key ] : null ;
177
+ return $ this ->computedCacheControl [$ key ] ?? null ;
178
178
}
179
179
180
180
public function setCookie (Cookie $ cookie )
Original file line number Diff line number Diff line change @@ -161,6 +161,6 @@ private function stampCreated(int $lifetime = null): void
161
161
{
162
162
$ timeStamp = time ();
163
163
$ this ->meta [self ::CREATED ] = $ this ->meta [self ::UPDATED ] = $ this ->lastUsed = $ timeStamp ;
164
- $ this ->meta [self ::LIFETIME ] = ( null === $ lifetime) ? ini_get ('session.cookie_lifetime ' ) : $ lifetime ;
164
+ $ this ->meta [self ::LIFETIME ] = $ lifetime ?? ini_get ('session.cookie_lifetime ' );
165
165
}
166
166
}
You can’t perform that action at this time.
0 commit comments