[WIP] Make FormConfigBuilderInterface::getType() nullable

filiplikavcan · filiplikavcan · commit 5aad0a4aa5e8 · 2022-08-03T10:05:06.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,3 @@ composer.phar
 package.tar
 /packages.json
 /.phpunit
-
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -29,7 +29,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     protected $locked = false;
 
     private bool $disabled = false;
-    private ResolvedFormTypeInterface $type;
+    private ?ResolvedFormTypeInterface $type = null;
     private string $name;
     private array $attributes = [];
     private array $options;
@@ -458,7 +458,7 @@ public function getCompound(): bool
     /**
      * Returns the form type used to construct the button.
      */
-    public function getType(): ResolvedFormTypeInterface
+    public function getType(): ?ResolvedFormTypeInterface
     {
         return $this->type;
     }
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -41,7 +41,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
     private bool $byReference = true;
     private bool $inheritData = false;
     private bool $compound = false;
-    private ResolvedFormTypeInterface $type;
+    private ?ResolvedFormTypeInterface $type = null;
     private array $viewTransformers = [];
     private array $modelTransformers = [];
     private ?DataMapperInterface $dataMapper = null;
@@ -239,7 +239,7 @@ public function getCompound(): bool
     /**
      * {@inheritdoc}
      */
-    public function getType(): ResolvedFormTypeInterface
+    public function getType(): ?ResolvedFormTypeInterface
     {
         return $this->type;
     }
diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php
@@ -66,7 +66,7 @@ public function getCompound(): bool;
     /**
      * Returns the resolved form type used to construct the form.
      */
-    public function getType(): ResolvedFormTypeInterface;
+    public function getType(): ?ResolvedFormTypeInterface;
 
     /**
      * Returns the view transformers of the form.
diff --git a/src/Symfony/Component/Form/MissingDataHandler.php b/src/Symfony/Component/Form/MissingDataHandler.php
@@ -31,24 +31,16 @@ public function handle(FormInterface $form, mixed $data): mixed
 
     private function handleMissingData(FormInterface $form, mixed $data): mixed
     {
-        try {
-            if ($form->getConfig()->getType() instanceof ResolvedFormTypeInterface && $form->getConfig()->getType()->getInnerType() instanceof CheckboxType) {
-                $falseValues = $form->getConfig()->getOption('false_values');
+        if ($form->getConfig()->getType() instanceof ResolvedFormTypeInterface && $form->getConfig()->getType()->getInnerType() instanceof CheckboxType) {
+            $falseValues = $form->getConfig()->getOption('false_values');
 
-                if ($data === $this->missingData) {
-                    return $falseValues[0];
-                }
-
-                if (\in_array($data, $falseValues)) {
-                    return $data;
-                }
+            if ($data === $this->missingData) {
+                return $falseValues[0];
             }
-        } catch (\Error $error) {
-            if ('Typed property Symfony\Component\Form\FormConfigBuilder::$type must not be accessed before initialization' === $error->getMessage()) {
+
+            if (\in_array($data, $falseValues)) {
                 return $data;
             }
-
-            throw $error;
         }
 
         if (null === $data || $this->missingData === $data) {
