Merge branch '5.2' into 5.x

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

Author: derrabus

Container.php

@@ -64,7 +64,7 @@ class Container implements ContainerInterface, ResetInterface
 
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
-        $this->parameterBag = $parameterBag ?: new EnvPlaceholderParameterBag();
+        $this->parameterBag = $parameterBag ?? new EnvPlaceholderParameterBag();
     }
 
     /**

ContainerBuilder.php

@@ -363,7 +363,7 @@ public function getReflectionClass(?string $class, bool $throw = true): ?\Reflec
 
         if ($this->trackResources) {
             if (!$classReflector) {
-                $this->addResource($resource ?: new ClassExistenceResource($class, false));
+                $this->addResource($resource ?? new ClassExistenceResource($class, false));
             } elseif (!$classReflector->isInternal()) {
                 $path = $classReflector->getFileName();
 

Tests/Compiler/IntegrationTest.php

@@ -176,7 +176,7 @@ public function testCanDecorateServiceLocator()
     public function testYamlContainerCompiles($directory, $actualServiceId, $expectedServiceId, ContainerBuilder $mainContainer = null)
     {
         // allow a container to be passed in, which might have autoconfigure settings
-        $container = $mainContainer ?: new ContainerBuilder();
+        $container = $mainContainer ?? new ContainerBuilder();
         $container->setResourceTracking(false);
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Fixtures/yaml/integration/'.$directory));
         $loader->load('main.yml');