Skip to content

Commit 859bce5

Browse files
committed
[CS] Replace easy occurences of ?: with ??
1 parent 6991999 commit 859bce5

8 files changed

+8
-8
lines changed

Router.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function __construct(LoaderInterface $loader, $resource, array $options =
107107
$this->loader = $loader;
108108
$this->resource = $resource;
109109
$this->logger = $logger;
110-
$this->context = $context ?: new RequestContext();
110+
$this->context = $context ?? new RequestContext();
111111
$this->setOptions($options);
112112
$this->defaultLocale = $defaultLocale;
113113
}

Tests/Matcher/CompiledRedirectableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
2525
$compiledRoutes = $dumper->getCompiledRoutes();
2626

2727
return $this->getMockBuilder(TestCompiledRedirectableUrlMatcher::class)
28-
->setConstructorArgs([$compiledRoutes, $context ?: new RequestContext()])
28+
->setConstructorArgs([$compiledRoutes, $context ?? new RequestContext()])
2929
->setMethods(['redirect'])
3030
->getMock();
3131
}

Tests/Matcher/CompiledUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
2222
{
2323
$dumper = new CompiledUrlMatcherDumper($routes);
2424

25-
return new CompiledUrlMatcher($dumper->getCompiledRoutes(), $context ?: new RequestContext());
25+
return new CompiledUrlMatcher($dumper->getCompiledRoutes(), $context ?? new RequestContext());
2626
}
2727
}

Tests/Matcher/DumpedRedirectableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
3131
eval('?>'.$dumper->dump(['class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher']));
3232

3333
return $this->getMockBuilder($class)
34-
->setConstructorArgs([$context ?: new RequestContext()])
34+
->setConstructorArgs([$context ?? new RequestContext()])
3535
->setMethods(['redirect'])
3636
->getMock();
3737
}

Tests/Matcher/DumpedUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
2828
$dumper = new PhpMatcherDumper($routes);
2929
eval('?>'.$dumper->dump(['class' => $class]));
3030

31-
return new $class($context ?: new RequestContext());
31+
return new $class($context ?? new RequestContext());
3232
}
3333
}

Tests/Matcher/RedirectableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,6 @@ public function testTrailingRequirementWithDefault_A()
211211

212212
protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
213213
{
214-
return $this->getMockForAbstractClass(RedirectableUrlMatcher::class, [$routes, $context ?: new RequestContext()]);
214+
return $this->getMockForAbstractClass(RedirectableUrlMatcher::class, [$routes, $context ?? new RequestContext()]);
215215
}
216216
}

Tests/Matcher/TraceableUrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,6 @@ public function testRoutesWithConditions()
121121

122122
protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
123123
{
124-
return new TraceableUrlMatcher($routes, $context ?: new RequestContext());
124+
return new TraceableUrlMatcher($routes, $context ?? new RequestContext());
125125
}
126126
}

Tests/Matcher/UrlMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,6 @@ public function testRestrictiveTrailingRequirementWithStaticRouteAfter()
943943

944944
protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
945945
{
946-
return new UrlMatcher($routes, $context ?: new RequestContext());
946+
return new UrlMatcher($routes, $context ?? new RequestContext());
947947
}
948948
}

0 commit comments

Comments
 (0)