Merge branch '4.4' into 5.2

* 4.4:
  [Form] Backport type fixes
  [Finder] Fix iterator return types
  [DependencyInjection] Support for intersection types

Author: derrabus

AbstractExtension.php

@@ -22,14 +22,14 @@ abstract class AbstractExtension implements FormExtensionInterface
     /**
      * The types provided by this extension.
      *
-     * @var FormTypeInterface[] An array of FormTypeInterface
+     * @var FormTypeInterface[]
      */
     private $types;
 
     /**
      * The type extensions provided by this extension.
      *
-     * @var FormTypeExtensionInterface[] An array of FormTypeExtensionInterface
+     * @var FormTypeExtensionInterface[][]
      */
     private $typeExtensions;
 
@@ -153,7 +153,7 @@ private function initTypes()
 
         foreach ($this->loadTypes() as $type) {
             if (!$type instanceof FormTypeInterface) {
-                throw new UnexpectedTypeException($type, 'Symfony\Component\Form\FormTypeInterface');
+                throw new UnexpectedTypeException($type, FormTypeInterface::class);
             }
 
             $this->types[\get_class($type)] = $type;
@@ -172,7 +172,7 @@ private function initTypeExtensions()
 
         foreach ($this->loadTypeExtensions() as $extension) {
             if (!$extension instanceof FormTypeExtensionInterface) {
-                throw new UnexpectedTypeException($extension, 'Symfony\Component\Form\FormTypeExtensionInterface');
+                throw new UnexpectedTypeException($extension, FormTypeExtensionInterface::class);
             }
 
             foreach ($extension::getExtendedTypes() as $extendedType) {
@@ -192,7 +192,7 @@ private function initTypeGuesser()
 
         $this->typeGuesser = $this->loadTypeGuesser();
         if (null !== $this->typeGuesser && !$this->typeGuesser instanceof FormTypeGuesserInterface) {
-            throw new UnexpectedTypeException($this->typeGuesser, 'Symfony\Component\Form\FormTypeGuesserInterface');
+            throw new UnexpectedTypeException($this->typeGuesser, FormTypeGuesserInterface::class);
         }
     }
 }

AbstractRendererEngine.php

@@ -23,11 +23,29 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
      */
     public const CACHE_KEY_VAR = 'cache_key';
 
+    /**
+     * @var array
+     */
     protected $defaultThemes;
+
+    /**
+     * @var array[]
+     */
     protected $themes = [];
+
+    /**
+     * @var bool[]
+     */
     protected $useDefaultThemes = [];
+
+    /**
+     * @var array[]
+     */
     protected $resources = [];
 
+    /**
+     * @var array<array<int|false>>
+     */
     private $resourceHierarchyLevels = [];
 
     /**

Button.php

@@ -22,7 +22,7 @@
 class Button implements \IteratorAggregate, FormInterface
 {
     /**
-     * @var FormInterface
+     * @var FormInterface|null
      */
     private $parent;
 

Extension/Core/DataTransformer/BaseDateTimeTransformer.php

@@ -29,8 +29,8 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface
     protected $outputTimezone;
 
     /**
-     * @param string $inputTimezone  The name of the input timezone
-     * @param string $outputTimezone The name of the output timezone
+     * @param string|null $inputTimezone  The name of the input timezone
+     * @param string|null $outputTimezone The name of the output timezone
      *
      * @throws InvalidArgumentException if a timezone is not valid
      */

Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php

@@ -43,15 +43,12 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
     private $pad;
 
     /**
-     * @param string[] $fields The date fields
-     * @param bool     $pad    Whether to use padding
+     * @param string[]|null $fields The date fields
+     * @param bool          $pad    Whether to use padding
      */
     public function __construct(array $fields = null, bool $pad = false)
     {
-        if (null === $fields) {
-            $fields = ['years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert'];
-        }
-        $this->fields = $fields;
+        $this->fields = $fields ?? ['years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert'];
         $this->pad = $pad;
     }
 

Extension/Core/DataTransformer/DateTimeToArrayTransformer.php

@@ -22,25 +22,20 @@
 class DateTimeToArrayTransformer extends BaseDateTimeTransformer
 {
     private $pad;
-
     private $fields;
     private $referenceDate;
 
     /**
-     * @param string $inputTimezone  The input timezone
-     * @param string $outputTimezone The output timezone
-     * @param array  $fields         The date fields
-     * @param bool   $pad            Whether to use padding
+     * @param string|null   $inputTimezone  The input timezone
+     * @param string|null   $outputTimezone The output timezone
+     * @param string[]|null $fields         The date fields
+     * @param bool          $pad            Whether to use padding
      */
     public function __construct(string $inputTimezone = null, string $outputTimezone = null, array $fields = null, bool $pad = false, \DateTimeInterface $referenceDate = null)
     {
         parent::__construct($inputTimezone, $outputTimezone);
 
-        if (null === $fields) {
-            $fields = ['year', 'month', 'day', 'hour', 'minute', 'second'];
-        }
-
-        $this->fields = $fields;
+        $this->fields = $fields ?? ['year', 'month', 'day', 'hour', 'minute', 'second'];
         $this->pad = $pad;
         $this->referenceDate = $referenceDate ?? new \DateTimeImmutable('1970-01-01 00:00:00');
     }

Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

@@ -30,12 +30,12 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
     /**
      * @see BaseDateTimeTransformer::formats for available format options
      *
-     * @param string $inputTimezone  The name of the input timezone
-     * @param string $outputTimezone The name of the output timezone
-     * @param int    $dateFormat     The date format
-     * @param int    $timeFormat     The time format
-     * @param int    $calendar       One of the \IntlDateFormatter calendar constants
-     * @param string $pattern        A pattern to pass to \IntlDateFormatter
+     * @param string|null $inputTimezone  The name of the input timezone
+     * @param string|null $outputTimezone The name of the output timezone
+     * @param int|null    $dateFormat     The date format
+     * @param int|null    $timeFormat     The time format
+     * @param int         $calendar       One of the \IntlDateFormatter calendar constants
+     * @param string|null $pattern        A pattern to pass to \IntlDateFormatter
      *
      * @throws UnexpectedTypeException If a format is not supported or if a timezone is not a string
      */
@@ -70,7 +70,7 @@ public function __construct(string $inputTimezone = null, string $outputTimezone
      *
      * @param \DateTimeInterface $dateTime A DateTimeInterface object
      *
-     * @return string|array Localized date string/array
+     * @return string Localized date string
      *
      * @throws TransformationFailedException if the given value is not a \DateTimeInterface
      *                                       or if the date could not be transformed

Extension/Core/DataTransformer/DateTimeToStringTransformer.php

@@ -44,9 +44,9 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
      *
      * @see \DateTime::format() for supported formats
      *
-     * @param string $inputTimezone  The name of the input timezone
-     * @param string $outputTimezone The name of the output timezone
-     * @param string $format         The date format
+     * @param string|null $inputTimezone  The name of the input timezone
+     * @param string|null $outputTimezone The name of the output timezone
+     * @param string      $format         The date format
      */
     public function __construct(string $inputTimezone = null, string $outputTimezone = null, string $format = 'Y-m-d H:i:s')
     {

Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php

@@ -25,21 +25,9 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform
 
     public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, ?int $divisor = 1, string $locale = null)
     {
-        if (null === $grouping) {
-            $grouping = true;
-        }
-
-        if (null === $scale) {
-            $scale = 2;
-        }
-
-        parent::__construct($scale, $grouping, $roundingMode, $locale);
-
-        if (null === $divisor) {
-            $divisor = 1;
-        }
+        parent::__construct($scale ?? 2, $grouping ?? true, $roundingMode, $locale);
 
-        $this->divisor = $divisor;
+        $this->divisor = $divisor ?? 1;
     }
 
     /**

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

@@ -67,17 +67,9 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
 
     public function __construct(int $scale = null, ?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_HALFUP, string $locale = null)
     {
-        if (null === $grouping) {
-            $grouping = false;
-        }
-
-        if (null === $roundingMode) {
-            $roundingMode = \NumberFormatter::ROUND_HALFUP;
-        }
-
         $this->scale = $scale;
-        $this->grouping = $grouping;
-        $this->roundingMode = $roundingMode;
+        $this->grouping = $grouping ?? false;
+        $this->roundingMode = $roundingMode ?? \NumberFormatter::ROUND_HALFUP;
         $this->locale = $locale;
     }