Skip to content

Commit 8ada246

Browse files
Use ??= more
1 parent 7179515 commit 8ada246

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

Bundle/Bundle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ private function parseClassName()
136136
{
137137
$pos = strrpos(static::class, '\\');
138138
$this->namespace = false === $pos ? '' : substr(static::class, 0, $pos);
139-
if (null === $this->name) {
140-
$this->name = false === $pos ? static::class : substr(static::class, $pos + 1);
141-
}
139+
$this->name ??= false === $pos ? static::class : substr(static::class, $pos + 1);
142140
}
143141
}

Fragment/InlineFragmentRenderer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ protected function createSubRequest(string $uri, Request $request)
118118

119119
static $setSession;
120120

121-
if (null === $setSession) {
122-
$setSession = \Closure::bind(static function ($subRequest, $request) { $subRequest->session = $request->session; }, null, Request::class);
123-
}
121+
$setSession ??= \Closure::bind(static function ($subRequest, $request) { $subRequest->session = $request->session; }, null, Request::class);
124122
$setSession($subRequest, $request);
125123

126124
if ($request->get('_format')) {

HttpCache/HttpCache.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,10 +696,7 @@ private function getTraceKey(Request $request): string
696696
private function mayServeStaleWhileRevalidate(Response $entry): bool
697697
{
698698
$timeout = $entry->headers->getCacheControlDirective('stale-while-revalidate');
699-
700-
if (null === $timeout) {
701-
$timeout = $this->options['stale_while_revalidate'];
702-
}
699+
$timeout ??= $this->options['stale_while_revalidate'];
703700

704701
return abs($entry->getTtl() ?? 0) < $timeout;
705702
}

Tests/HttpCache/StoreTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ public function testPurgeHttpAndHttps()
319319

320320
protected function storeSimpleEntry($path = null, $headers = [])
321321
{
322-
if (null === $path) {
323-
$path = '/test';
324-
}
322+
$path ??= '/test';
325323

326324
$this->request = Request::create($path, 'get', [], [], [], $headers);
327325
$this->response = new Response('test', 200, ['Cache-Control' => 'max-age=420']);

Tests/HttpKernelTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,7 @@ public function testInconsistentClientIpsOnMainRequests()
479479

480480
private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = [], bool $handleAllThrowables = false)
481481
{
482-
if (null === $controller) {
483-
$controller = function () { return new Response('Hello'); };
484-
}
482+
$controller ??= function () { return new Response('Hello'); };
485483

486484
$controllerResolver = $this->createMock(ControllerResolverInterface::class);
487485
$controllerResolver

0 commit comments

Comments
 (0)