[Filesystem][Finder][Form] Use CPP

Author: OskarStark

AbstractRendererEngine.php

@@ -25,8 +25,6 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface, Re
      */
     public const CACHE_KEY_VAR = 'cache_key';
 
-    protected array $defaultThemes;
-
     /**
      * @var array[]
      */
@@ -53,9 +51,9 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface, Re
      * @param array $defaultThemes The default themes. The type of these
      *                             themes is open to the implementation.
      */
-    public function __construct(array $defaultThemes = [])
-    {
-        $this->defaultThemes = $defaultThemes;
+    public function __construct(
+        protected array $defaultThemes = [],
+    ) {
     }
 
     public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true): void

Button.php

@@ -26,15 +26,14 @@
 class Button implements \IteratorAggregate, FormInterface
 {
     private ?FormInterface $parent = null;
-    private FormConfigInterface $config;
     private bool $submitted = false;
 
     /**
      * Creates a new button from a form configuration.
      */
-    public function __construct(FormConfigInterface $config)
-    {
-        $this->config = $config;
+    public function __construct(
+        private FormConfigInterface $config,
+    ) {
     }
 
     /**

ButtonBuilder.php

@@ -31,19 +31,19 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     private ResolvedFormTypeInterface $type;
     private string $name;
     private array $attributes = [];
-    private array $options;
 
     /**
      * @throws InvalidArgumentException if the name is empty
      */
-    public function __construct(?string $name, array $options = [])
-    {
+    public function __construct(
+        ?string $name,
+        private array $options = [],
+    ) {
         if ('' === $name || null === $name) {
             throw new InvalidArgumentException('Buttons cannot have empty names.');
         }
 
         $this->name = $name;
-        $this->options = $options;
 
         FormConfigBuilder::validateName($name);
     }

ChoiceList/LazyChoiceList.php

@@ -27,8 +27,6 @@
  */
 class LazyChoiceList implements ChoiceListInterface
 {
-    private ChoiceLoaderInterface $loader;
-
     /**
      * The callable creating string values for each choice.
      *
@@ -43,11 +41,13 @@ class LazyChoiceList implements ChoiceListInterface
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param callable|null $value The callable generating the choice values
+     * @param callable|null $value The callable creating string values for each choice.
+     *                             If null, choices are cast to strings.
      */
-    public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
-    {
-        $this->loader = $loader;
+    public function __construct(
+        private ChoiceLoaderInterface $loader,
+        callable $value = null,
+    ) {
         $this->value = null === $value ? null : $value(...);
     }
 

ChoiceList/View/ChoiceGroupView.php

@@ -20,18 +20,15 @@
  */
 class ChoiceGroupView implements \IteratorAggregate
 {
-    public string $label;
-    public array $choices;
-
     /**
      * Creates a new choice group view.
      *
      * @param array<ChoiceGroupView|ChoiceView> $choices the choice views in the group
      */
-    public function __construct(string $label, array $choices = [])
-    {
-        $this->label = $label;
-        $this->choices = $choices;
+    public function __construct(
+        public string $label,
+        public array $choices = [],
+    ) {
     }
 
     /**

ChoiceList/View/ChoiceListView.php

@@ -22,19 +22,16 @@
  */
 class ChoiceListView
 {
-    public array $choices;
-    public array $preferredChoices;
-
     /**
      * Creates a new choice list view.
      *
      * @param array<ChoiceGroupView|ChoiceView> $choices          The choice views
      * @param array<ChoiceGroupView|ChoiceView> $preferredChoices the preferred choice views
      */
-    public function __construct(array $choices = [], array $preferredChoices = [])
-    {
-        $this->choices = $choices;
-        $this->preferredChoices = $preferredChoices;
+    public function __construct(
+        public array $choices = [],
+        public array $preferredChoices = [],
+    ) {
     }
 
     /**

ChoiceList/View/ChoiceView.php

@@ -20,20 +20,6 @@
  */
 class ChoiceView
 {
-    public string|TranslatableInterface|false $label;
-    public string $value;
-    public mixed $data;
-
-    /**
-     * Additional attributes for the HTML tag.
-     */
-    public array $attr;
-
-    /**
-     * Additional parameters used to translate the label.
-     */
-    public array $labelTranslationParameters;
-
     /**
      * Creates a new choice view.
      *
@@ -43,12 +29,12 @@ class ChoiceView
      * @param array                              $attr                       Additional attributes for the HTML tag
      * @param array                              $labelTranslationParameters Additional parameters used to translate the label
      */
-    public function __construct(mixed $data, string $value, string|TranslatableInterface|false $label, array $attr = [], array $labelTranslationParameters = [])
-    {
-        $this->data = $data;
-        $this->value = $value;
-        $this->label = $label;
-        $this->attr = $attr;
-        $this->labelTranslationParameters = $labelTranslationParameters;
+    public function __construct(
+        public mixed $data,
+        public string $value,
+        public string|TranslatableInterface|false $label,
+        public array $attr = [],
+        public array $labelTranslationParameters = [],
+    ) {
     }
 }

Command/DebugCommand.php

@@ -35,23 +35,15 @@
 #[AsCommand(name: 'debug:form', description: 'Display form type information')]
 class DebugCommand extends Command
 {
-    private FormRegistryInterface $formRegistry;
-    private array $namespaces;
-    private array $types;
-    private array $extensions;
-    private array $guessers;
-    private ?FileLinkFormatter $fileLinkFormatter;
-
-    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null)
-    {
+    public function __construct(
+        private FormRegistryInterface $formRegistry,
+        private array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'],
+        private array $types = [],
+        private array $extensions = [],
+        private array $guessers = [],
+        private ?FileLinkFormatter $fileLinkFormatter = null,
+    ) {
         parent::__construct();
-
-        $this->formRegistry = $formRegistry;
-        $this->namespaces = $namespaces;
-        $this->types = $types;
-        $this->extensions = $extensions;
-        $this->guessers = $guessers;
-        $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
     protected function configure(): void

Extension/Core/CoreExtension.php

@@ -30,13 +30,14 @@ class CoreExtension extends AbstractExtension
 {
     private PropertyAccessorInterface $propertyAccessor;
     private ChoiceListFactoryInterface $choiceListFactory;
-    private ?TranslatorInterface $translator;
 
-    public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null)
-    {
+    public function __construct(
+        PropertyAccessorInterface $propertyAccessor = null,
+        ChoiceListFactoryInterface $choiceListFactory = null,
+        private ?TranslatorInterface $translator = null,
+    ) {
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
         $this->choiceListFactory = $choiceListFactory ?? new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor));
-        $this->translator = $translator;
     }
 
     protected function loadTypes(): array

Extension/Core/DataAccessor/ChainAccessor.php

@@ -20,14 +20,12 @@
  */
 class ChainAccessor implements DataAccessorInterface
 {
-    private iterable $accessors;
-
     /**
      * @param DataAccessorInterface[]|iterable $accessors
      */
-    public function __construct(iterable $accessors)
-    {
-        $this->accessors = $accessors;
+    public function __construct(
+        private iterable $accessors,
+    ) {
     }
 
     public function getValue(object|array $data, FormInterface $form): mixed