Add types to public and protected properties

Author: nicolas-grekas

AbstractRendererEngine.php

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

ButtonBuilder.php

@@ -25,7 +25,7 @@
  */
 class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
 {
-    protected $locked = false;
+    protected bool $locked = false;
 
     private bool $disabled = false;
     private ResolvedFormTypeInterface $type;

ChoiceList/ArrayChoiceList.php

@@ -24,27 +24,18 @@
  */
 class ArrayChoiceList implements ChoiceListInterface
 {
-    /**
-     * The choices in the list.
-     *
-     * @var array
-     */
-    protected $choices;
+    protected array $choices;
 
     /**
      * The values indexed by the original keys.
-     *
-     * @var array
      */
-    protected $structuredValues;
+    protected array $structuredValues;
 
     /**
      * The original keys of the choices array.
-     *
-     * @var int[]|string[]
      */
-    protected $originalKeys;
-    protected $valueCallback;
+    protected array $originalKeys;
+    protected ?\Closure $valueCallback = null;
 
     /**
      * Creates a list with the given choices and values.

ChoiceList/View/ChoiceGroupView.php

@@ -20,8 +20,8 @@
  */
 class ChoiceGroupView implements \IteratorAggregate
 {
-    public $label;
-    public $choices;
+    public string $label;
+    public array $choices;
 
     /**
      * Creates a new choice group view.

ChoiceList/View/ChoiceListView.php

@@ -22,8 +22,8 @@
  */
 class ChoiceListView
 {
-    public $choices;
-    public $preferredChoices;
+    public array $choices;
+    public array $preferredChoices;
 
     /**
      * Creates a new choice list view.

ChoiceList/View/ChoiceView.php

@@ -20,19 +20,19 @@
  */
 class ChoiceView
 {
-    public $label;
-    public $value;
-    public $data;
+    public string|TranslatableInterface|false $label;
+    public string $value;
+    public mixed $data;
 
     /**
      * Additional attributes for the HTML tag.
      */
-    public $attr;
+    public array $attr;
 
     /**
      * Additional parameters used to translate the label.
      */
-    public $labelTranslationParameters;
+    public array $labelTranslationParameters;
 
     /**
      * Creates a new choice view.

Extension/Core/DataTransformer/BaseDateTimeTransformer.php

@@ -21,17 +21,16 @@
  */
 abstract class BaseDateTimeTransformer implements DataTransformerInterface
 {
-    protected static $formats = [
+    protected static array $formats = [
         \IntlDateFormatter::NONE,
         \IntlDateFormatter::FULL,
         \IntlDateFormatter::LONG,
         \IntlDateFormatter::MEDIUM,
         \IntlDateFormatter::SHORT,
     ];
 
-    protected $inputTimezone;
-
-    protected $outputTimezone;
+    protected string $inputTimezone;
+    protected string $outputTimezone;
 
     /**
      * @param string|null $inputTimezone  The name of the input timezone

Extension/Core/DataTransformer/DataTransformerChain.php

@@ -21,7 +21,7 @@
  */
 class DataTransformerChain implements DataTransformerInterface
 {
-    protected $transformers;
+    protected array $transformers;
 
     /**
      * Uses the given value transformers to transform values.

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

@@ -25,9 +25,8 @@
  */
 class NumberToLocalizedStringTransformer implements DataTransformerInterface
 {
-    protected $grouping;
-
-    protected $roundingMode;
+    protected bool $grouping;
+    protected int $roundingMode;
 
     private ?int $scale;
     private ?string $locale;

Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php

@@ -28,7 +28,7 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
     public const FRACTIONAL = 'fractional';
     public const INTEGER = 'integer';
 
-    protected static $types = [
+    protected static array $types = [
         self::FRACTIONAL,
         self::INTEGER,
     ];