Merge branch '4.4' into 5.2

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

Author: derrabus

Extension/Core/CoreExtension.php

@@ -35,7 +35,7 @@ class CoreExtension extends AbstractExtension
     public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null)
     {
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
-        $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor));
+        $this->choiceListFactory = $choiceListFactory ?? new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor));
         $this->translator = $translator;
     }
 

Extension/Core/DataTransformer/DateTimeToArrayTransformer.php

@@ -42,7 +42,7 @@ public function __construct(string $inputTimezone = null, string $outputTimezone
 
         $this->fields = $fields;
         $this->pad = $pad;
-        $this->referenceDate = $referenceDate ?: new \DateTimeImmutable('1970-01-01 00:00:00');
+        $this->referenceDate = $referenceDate ?? new \DateTimeImmutable('1970-01-01 00:00:00');
     }
 
     /**

Extension/Core/Type/ChoiceType.php

@@ -56,7 +56,7 @@ class ChoiceType extends AbstractType
      */
     public function __construct(ChoiceListFactoryInterface $choiceListFactory = null, $translator = null)
     {
-        $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(
+        $this->choiceListFactory = $choiceListFactory ?? new CachingFactoryDecorator(
             new PropertyAccessDecorator(
                 new DefaultChoiceListFactory()
             )

Extension/Csrf/EventListener/CsrfValidationListener.php

@@ -48,7 +48,7 @@ public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenM
         $this->errorMessage = $errorMessage;
         $this->translator = $translator;
         $this->translationDomain = $translationDomain;
-        $this->serverParams = $serverParams ?: new ServerParams();
+        $this->serverParams = $serverParams ?? new ServerParams();
     }
 
     public function preSubmit(FormEvent $event)

Extension/HttpFoundation/HttpFoundationRequestHandler.php

@@ -32,7 +32,7 @@ class HttpFoundationRequestHandler implements RequestHandlerInterface
 
     public function __construct(ServerParams $serverParams = null)
     {
-        $this->serverParams = $serverParams ?: new ServerParams();
+        $this->serverParams = $serverParams ?? new ServerParams();
     }
 
     /**

Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php

@@ -26,7 +26,7 @@ class FormTypeHttpFoundationExtension extends AbstractTypeExtension
 
     public function __construct(RequestHandlerInterface $requestHandler = null)
     {
-        $this->requestHandler = $requestHandler ?: new HttpFoundationRequestHandler();
+        $this->requestHandler = $requestHandler ?? new HttpFoundationRequestHandler();
     }
 
     /**

FormFactoryBuilder.php

@@ -180,7 +180,7 @@ public function getFormFactory()
             $extensions[] = new PreloadedExtension($this->types, $this->typeExtensions, $typeGuesser);
         }
 
-        $registry = new FormRegistry($extensions, $this->resolvedTypeFactory ?: new ResolvedFormTypeFactory());
+        $registry = new FormRegistry($extensions, $this->resolvedTypeFactory ?? new ResolvedFormTypeFactory());
 
         return new FormFactory($registry);
     }

NativeRequestHandler.php

@@ -36,7 +36,7 @@ class NativeRequestHandler implements RequestHandlerInterface
 
     public function __construct(ServerParams $params = null)
     {
-        $this->serverParams = $params ?: new ServerParams();
+        $this->serverParams = $params ?? new ServerParams();
     }
 
     /**