Added phpstan symfony.

phpstan.neon

@@ -31,17 +31,10 @@ parameters:
         -
             message: '#no value type specified#'
             identifier: missingType.iterableValue
-        -
-            message: '#@extends contains generic type#'
-            identifier: generics.notGeneric
-            path: src/Form/Extension/*
         -
             message: '#Call to static method .* will always evaluate to true.#'
             path: tests/*
-
         -
             message: '#@extends contains generic type#'
             identifier: generics.notGeneric
-            paths:
-                 - src/Form/*
-                 - tests/Fixture/*
+            path: src/Form/Extension/*

src/Controller/AbstractController.php

@@ -322,7 +322,7 @@ protected function getParameterString(string $name): string
      *
      * @template T
      *
-     * @psalm-param FormInterface<T> $form    the form to validate
+     * @psalm-param FormInterface<T> $form the form to validate
      *
      * @see FormInterface::handleRequest()
      * @see FormInterface::isSubmitted()

src/Controller/AbstractEntityController.php

@@ -183,11 +183,17 @@ protected function getDefaultRoute(): string
     /**
      * Gets the form type class name used to edit an entity.
      *
+     * @phpstan-return class-string<FormTypeInterface<mixed>>
+     *
      * @return class-string<FormTypeInterface>
      */
     protected function getEditFormType(): string
     {
-        /** @psalm-var class-string<FormTypeInterface>  */
+        /**
+         * @phpstan-var class-string<FormTypeInterface<mixed>>
+         *
+         * @psalm-var class-string<FormTypeInterface>
+         */
         return \sprintf('App\\Form\\%1$s\\%1$sType', $this->shortName);
     }
 

src/Controller/ProfileController.php

@@ -15,6 +15,7 @@
 
 use App\Attribute\GetPost;
 use App\Entity\User;
+use App\Form\AbstractEntityType;
 use App\Form\User\ProfileEditType;
 use App\Form\User\ProfilePasswordType;
 use App\Interfaces\RoleInterface;
@@ -71,6 +72,8 @@ public function password(#[CurrentUser] User $user, Request $request, PasswordTo
     }
 
     /**
+     * @phpstan-param class-string<AbstractEntityType<User>> $type
+     *
      * @psalm-param class-string $type
      */
     private function handleForm(

src/Controller/TestController.php

@@ -698,9 +698,9 @@ private function getStates(EntityManagerInterface $manager): array
      * @template T of AbstractProperty
      *
      * @psalm-param AbstractParameters<T> $parameters
-     * @psalm-param class-string<FormTypeInterface<mixed>> $type
+     * @psalm-param class-string<FormTypeInterface> $type
      *
-     * @phpstan-param class-string<FormTypeInterface> $type
+     * @phpstan-param class-string<FormTypeInterface<array>> $type
      */
     private function renderParameters(
         Request $request,

src/Form/Extension/AbstractFileTypeExtension.php

@@ -23,7 +23,7 @@
 /**
  * Base extension for FileType.
  *
- * @psalm-template T of \Symfony\Component\Form\FormTypeInterface
+ * @template T of \Symfony\Component\Form\FormTypeInterface
  *
  * @extends AbstractTypeExtension<T>
  */

src/Form/Extension/FileTypeExtension.php

@@ -36,6 +36,10 @@ public static function getExtendedTypes(): iterable
     }
 
     /**
+     * @phpstan-param FormInterface<array> $form
+     *
+     * @psalm-param FormInterface $form
+     *
      * @psalm-return array<array-key, mixed>
      */
     protected function updateOptions(FormInterface $form, array $options): array

src/Form/Parameters/AbstractParameterType.php

@@ -90,6 +90,10 @@ private function convertValue(mixed $value): mixed
     }
 
     /**
+     * @phpstan-param FormInterface<array> $form
+     *
+     * @psalm-param FormInterface $form
+     *
      * @psalm-return  array<string, mixed>
      */
     private function getDefaultValues(FormInterface $form): array

src/Form/Task/TaskListType.php

@@ -51,6 +51,10 @@ public function configureOptions(OptionsResolver $resolver): void
     }
 
     /**
+     * @phpstan-param Options<array> $options
+     *
+     * @psalm-param Options $options
+     *
      * @throws \Doctrine\ORM\Exception\NotSupported
      */
     private function getSortedBuilder(Options $options): QueryBuilder

src/Form/Type/CountryFlagType.php

@@ -56,11 +56,21 @@ public function getParent(): string
         return CountryType::class;
     }
 
+    /**
+     * @phpstan-param Options<array> $options
+     *
+     * @psalm-param Options $options
+     */
     private function getChoiceLoader(Options $options): ChoiceLoaderInterface
     {
         return ChoiceList::lazy($this, fn (): array => $this->loadChoices($options));
     }
 
+    /**
+     * @phpstan-param Options<array> $options
+     *
+     * @psalm-param Options $options
+     */
     private function loadChoices(Options $options): array
     {
         /** @psalm-var string|null $locale */

src/Form/Type/ReCaptchaType.php

@@ -134,6 +134,11 @@ public function onPostSubmit(PostSubmitEvent $event): void
         }
     }
 
+    /**
+     * @phpstan-param FormConfigInterface<array> $config
+     *
+     * @psalm-param FormConfigInterface $config
+     */
     private function updateService(FormConfigInterface $config): void
     {
         if ($config->hasOption('expectedAction')) {

src/Form/User/AbstractChangePasswordType.php

@@ -89,6 +89,11 @@ private function validate(ExecutionContextInterface $context): void
         }
     }
 
+    /**
+     * @phpstan-param FormInterface<array> $target
+     *
+     * @psalm-param FormInterface $target
+     */
     private function validateConstraint(
         ExecutionContextInterface $context,
         Constraint $constraint,

src/Repository/UserRepository.php

@@ -35,6 +35,7 @@
  * @template-extends AbstractRepository<User>
  *
  * @implements UserProviderInterface<User>
+ * @implements PasswordUpgraderInterface<User>
  */
 class UserRepository extends AbstractRepository implements PasswordUpgraderInterface, ResetPasswordRequestRepositoryInterface, UserProviderInterface
 {

tests/Form/Admin/ApplicationParametersTypeTest.php

@@ -92,6 +92,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/EntityTypeTestCase.php

@@ -70,6 +70,14 @@ protected function getPreloadedExtensions(): array
         return [];
     }
 
+    /**
+     * @return array{
+     *     FileTypeExtension,
+     *     TextTypeExtension,
+     *     UrlTypeExtension,
+     *     VichImageTypeExtension
+     * }
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/Extension/FileTypeExtensionTest.php

@@ -193,6 +193,9 @@ protected function createView(array $options = []): FormView
             ->createView();
     }
 
+    /**
+     * @return FileTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/Extension/TextTypeExtensionTest.php

@@ -52,6 +52,9 @@ public function testFormViewWithNoValue(): void
         self::assertArrayNotHasKey('append_class', $attr);
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/Extension/UrlTypeExtensionTest.php

@@ -41,6 +41,9 @@ public function testFormViewWithFtpProtocol(): void
         self::assertSame('ftp', $attr['data-protocol']);
     }
 
+    /**
+     * @return UrlTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/Extension/VichImageTypeExtensionTest.php

@@ -52,6 +52,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return VichImageTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/FormHelperTest.php

@@ -673,6 +673,14 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return array{
+     *     FileTypeExtension,
+     *     TextTypeExtension,
+     *     UrlTypeExtension,
+     *     VichImageTypeExtension
+     * }
+     */
     protected function getTypeExtensions(): array
     {
         return [
@@ -690,6 +698,9 @@ private function getFormHelper(?string $labelPrefix = null): FormHelper
         return new FormHelper($builder, $labelPrefix);
     }
 
+    /**
+     * @phpstan-param FormConfigInterface<mixed> $config
+     */
     private static function validateAttribute(FormConfigInterface $config, string $option, string $name, mixed $expected): void
     {
         self::assertTrue($config->hasOption($option));

tests/Form/Type/ReCaptchaTypeTest.php

@@ -84,7 +84,7 @@ public function testSubmitError(): void
 
         self::assertCount(1, $form->getErrors());
         $errorForm = $form->getErrors()[0];
-        self::assertSame($error, $errorForm->getMessage()); // @phpstan-ignore method.notFound
+        self::assertSame($error, $errorForm->getMessage());
     }
 
     public function testSubmitNoRequest(): void
@@ -103,7 +103,7 @@ public function testSubmitNoRequest(): void
 
         self::assertCount(1, $form->getErrors());
         $errorForm = $form->getErrors()[0];
-        self::assertSame('no-request', $errorForm->getMessage()); // @phpstan-ignore method.notFound
+        self::assertSame('no-request', $errorForm->getMessage());
     }
 
     public function testSubmitSuccess(): void

tests/Form/User/RequestChangePasswordTypeTest.php

@@ -79,6 +79,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/User/UserCommentTypeTest.php

@@ -56,6 +56,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return FileTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/User/UserLoginTypeTest.php

@@ -64,6 +64,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/User/UserParametersTypeTest.php

@@ -74,6 +74,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [

tests/Form/User/UserRegistrationTypeTest.php

@@ -102,6 +102,9 @@ protected function getPreloadedExtensions(): array
         ];
     }
 
+    /**
+     * @return TextTypeExtension[]
+     */
     protected function getTypeExtensions(): array
     {
         return [