Skip to content

Commit 0287787

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [CS] Replace easy occurences of ?: with ??
2 parents e06eca8 + 31f3944 commit 0287787

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Controller/ArgumentResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
3636

3737
public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [])
3838
{
39-
$this->argumentMetadataFactory = $argumentMetadataFactory ?: new ArgumentMetadataFactory();
39+
$this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory();
4040
$this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
4141
}
4242

HttpKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
6060
{
6161
$this->dispatcher = $dispatcher;
6262
$this->resolver = $resolver;
63-
$this->requestStack = $requestStack ?: new RequestStack();
63+
$this->requestStack = $requestStack ?? new RequestStack();
6464
$this->argumentResolver = $argumentResolver;
6565

6666
if (null === $this->argumentResolver) {

Tests/EventListener/TestSessionListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function testDoesNotThrowIfRequestDoesNotHaveASession()
158158
private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, Response $response = null)
159159
{
160160
$request->setSession($this->session);
161-
$response = $response ?: new Response();
161+
$response = $response ?? new Response();
162162
$kernel = $this->createMock(HttpKernelInterface::class);
163163
$event = new ResponseEvent($kernel, $request, $type, $response);
164164

0 commit comments

Comments
 (0)