Infer type for builder getData

Author: VincentLanglet

extension.neon

@@ -14,6 +14,9 @@ parameters:
 	featureToggles:
 		skipCheckGenericClasses:
 			- Symfony\Component\Form\AbstractType
+			- Symfony\Component\Form\FormBuilderInterface
+			- Symfony\Component\Form\FormConfigBuilderInterface
+			- Symfony\Component\Form\FormConfigInterface
 			- Symfony\Component\Form\FormInterface
 			- Symfony\Component\Form\FormTypeExtensionInterface
 			- Symfony\Component\Form\FormTypeInterface
@@ -47,6 +50,8 @@ parameters:
 		- stubs/Symfony/Component/Form/Exception/TransformationFailedException.stub
 		- stubs/Symfony/Component/Form/DataTransformerInterface.stub
 		- stubs/Symfony/Component/Form/FormBuilderInterface.stub
+		- stubs/Symfony/Component/Form/FormConfigBuilderInterface.stub
+		- stubs/Symfony/Component/Form/FormConfigInterface.stub
 		- stubs/Symfony/Component/Form/FormInterface.stub
 		- stubs/Symfony/Component/Form/FormFactoryInterface.stub
 		- stubs/Symfony/Component/Form/FormTypeExtensionInterface.stub

stubs/Symfony/Component/Form/AbstractType.stub

@@ -11,6 +11,7 @@ abstract class AbstractType implements FormTypeInterface
 {
 
 	/**
+	 * @param FormBuilderInterface<TData|null> $builder
 	 * @param array<string, mixed> $options
 	 */
 	public function buildForm(FormBuilderInterface $builder, array $options): void;

stubs/Symfony/Component/Form/FormBuilderInterface.stub

@@ -3,9 +3,17 @@
 namespace Symfony\Component\Form;
 
 /**
- * @extends \Traversable<int, \Symfony\Component\Form\FormBuilderInterface>
+ * @template TData
+ *
+ * @extends \Traversable<int, \Symfony\Component\Form\FormBuilderInterface<mixed>>
+ * @extends FormConfigBuilderInterface<TData>
  */
-interface FormBuilderInterface extends \Traversable
+interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuilderInterface
 {
 
+    /**
+     * @return FormInterface<TData|null>
+     */
+    public function getForm(): FormInterface;
+
 }

stubs/Symfony/Component/Form/FormConfigBuilderInterface.stub

@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Form;
+
+/**
+ * @template TData
+ *
+ * @extends FormConfigInterface<TData>
+ */
+interface FormConfigBuilderInterface extends FormConfigInterface
+{
+
+}

stubs/Symfony/Component/Form/FormConfigInterface.stub

@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Component\Form;
+
+/**
+ * @template TData
+ */
+interface FormConfigInterface
+{
+
+    /**
+     * @return TData
+     */
+    public function getData(): mixed;
+
+}

stubs/Symfony/Component/Form/FormTypeExtensionInterface.stub

@@ -8,6 +8,7 @@ namespace Symfony\Component\Form;
 interface FormTypeExtensionInterface
 {
     /**
+     * @param FormBuilderInterface<TData|null> $builder
      * @param array<string, mixed> $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void;

stubs/Symfony/Component/Form/FormTypeInterface.stub

@@ -8,6 +8,7 @@ namespace Symfony\Component\Form;
 interface FormTypeInterface
 {
     /**
+     * @param FormBuilderInterface<TData|null> $builder
      * @param array<string, mixed> $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void;

tests/Type/Symfony/data/form_data_type.php

@@ -29,6 +29,9 @@ class DataClassType extends AbstractType
 
 	public function buildForm(FormBuilderInterface $builder, array $options): void
 	{
+		assertType('GenericFormDataType\DataClass|null', $builder->getData());
+		assertType('GenericFormDataType\DataClass|null', $builder->getForm()->getData());
+
 		$builder
 			->add('foo', NumberType::class)
 			->add('bar', TextType::class)