Merge branch '5.2' into 5.x

* 5.2:
  [CS] Replace easy occurences of ?: with ??

Author: derrabus

Router.php

@@ -102,7 +102,7 @@ public function __construct(LoaderInterface $loader, $resource, array $options =
         $this->loader = $loader;
         $this->resource = $resource;
         $this->logger = $logger;
-        $this->context = $context ?: new RequestContext();
+        $this->context = $context ?? new RequestContext();
         $this->setOptions($options);
         $this->defaultLocale = $defaultLocale;
     }

Tests/Matcher/CompiledRedirectableUrlMatcherTest.php

@@ -25,7 +25,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
         $compiledRoutes = $dumper->getCompiledRoutes();
 
         return $this->getMockBuilder(TestCompiledRedirectableUrlMatcher::class)
-            ->setConstructorArgs([$compiledRoutes, $context ?: new RequestContext()])
+            ->setConstructorArgs([$compiledRoutes, $context ?? new RequestContext()])
             ->setMethods(['redirect'])
             ->getMock();
     }

Tests/Matcher/CompiledUrlMatcherTest.php

@@ -22,6 +22,6 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
     {
         $dumper = new CompiledUrlMatcherDumper($routes);
 
-        return new CompiledUrlMatcher($dumper->getCompiledRoutes(), $context ?: new RequestContext());
+        return new CompiledUrlMatcher($dumper->getCompiledRoutes(), $context ?? new RequestContext());
     }
 }

Tests/Matcher/RedirectableUrlMatcherTest.php

@@ -211,6 +211,6 @@ public function testTrailingRequirementWithDefault_A()
 
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
-        return $this->getMockForAbstractClass(RedirectableUrlMatcher::class, [$routes, $context ?: new RequestContext()]);
+        return $this->getMockForAbstractClass(RedirectableUrlMatcher::class, [$routes, $context ?? new RequestContext()]);
     }
 }

Tests/Matcher/TraceableUrlMatcherTest.php

@@ -121,6 +121,6 @@ public function testRoutesWithConditions()
 
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
-        return new TraceableUrlMatcher($routes, $context ?: new RequestContext());
+        return new TraceableUrlMatcher($routes, $context ?? new RequestContext());
     }
 }

Tests/Matcher/UrlMatcherTest.php

@@ -943,6 +943,6 @@ public function testRestrictiveTrailingRequirementWithStaticRouteAfter()
 
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
-        return new UrlMatcher($routes, $context ?: new RequestContext());
+        return new UrlMatcher($routes, $context ?? new RequestContext());
     }
 }