Upgrade to PHPStan v2

.github/workflows/phpcsfixer.yml

@@ -14,7 +14,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ["8.3"]
+                php-versions: ["8.2"]
 
         name: PHP ${{ matrix.php-versions }} CS-Fixer ${{ matrix.operating-system }}
 

.github/workflows/phpstan.yml

@@ -14,7 +14,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ["8.2", "8.3"]
+                php-versions: ["8.2", "8.3", "8.4"]
 
         name: PHP ${{ matrix.php-versions }} Static Analysis on ${{ matrix.operating-system }}
 

.php-cs-fixer.dist.php

@@ -22,7 +22,10 @@
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/src')
+            ->in([
+                __DIR__.'/src',
+                __DIR__.'/config',
+            ])
             ->append([__FILE__])
     )
 ;

composer.json

@@ -25,10 +25,10 @@
         "symfony/validator": "^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.65",
+        "friendsofphp/php-cs-fixer": "^3.89",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-symfony": "^1.4",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-symfony": "^2.0",
         "symfony/doctrine-bridge": "^7.0"
     },
     "extra": {

config/definition.php

@@ -3,7 +3,7 @@
 namespace Symfony\Component\Config\Definition\Configurator;
 
 return function (DefinitionConfigurator $definitionConfigurator): void {
-    $definitionConfigurator
+    $definitionConfigurator // @phpstan-ignore method.notFound
         ->rootNode()
             ->children()
                 ->arrayNode('cause_resolver')

phpstan.dist.neon

@@ -0,0 +1,10 @@
+parameters:
+    level: 9
+
+    paths:
+        - src/
+        - config/
+
+    ignoreErrors:
+        - message: '#generic interface Symfony\\Component\\Form\\FormInterface but does not specify its types: TData#'
+        - message: '#extends generic class Symfony\\Component\\Form\\AbstractType but does not specify its types: TData#'

src/Form/DataTransformer/BooleanTypeToBooleanDataTransformer.php

@@ -10,6 +10,10 @@
  */
 class BooleanTypeToBooleanDataTransformer implements DataTransformerInterface
 {
+    /**
+     * @param array<int|string|bool> $trueValues
+     * @param array<int|string|bool> $falseValues
+     */
     public function __construct(
         private readonly array $trueValues,
         private readonly array $falseValues,
@@ -27,7 +31,7 @@ public function transform(mixed $value): string
             return $this->default ? 'true' : 'false';
         }
 
-        if (!\is_bool($value)) {
+        if (!\is_bool($value)) { // @phpstan-ignore function.alreadyNarrowedType
             throw new TransformationFailedException(\sprintf('Expected type bool, found "%s".', \get_debug_type($value)));
         }
 
@@ -40,7 +44,7 @@ public function reverseTransform(mixed $value): ?bool
             return $this->default;
         }
 
-        if (\is_string($value)) {
+        if (\is_string($value)) { // @phpstan-ignore function.alreadyNarrowedType
             $value = \strtolower($value);
         }
 

src/Form/DataTransformer/CapitalizeStringDataTransformer.php

@@ -26,7 +26,7 @@ public function reverseTransform(mixed $value): ?string
             return $value;
         }
 
-        if (!\is_string($value)) {
+        if (!\is_string($value)) { // @phpstan-ignore function.alreadyNarrowedType
             throw new TransformationFailedException('Expected type string.');
         }
 

src/Form/DataTransformer/StringToUuidDataTransformer.php

@@ -32,7 +32,7 @@ public function reverseTransform(mixed $value): ?string
             return $value;
         }
 
-        if (!$value instanceof Uuid) {
+        if (!$value instanceof Uuid) { // @phpstan-ignore instanceof.alwaysTrue
             throw new TransformationFailedException('Expected type Uuid, found '.\get_debug_type($value));
         }
 

src/Form/DataTransformer/UuidToStringDataTransformer.php

@@ -25,7 +25,7 @@ public function transform(mixed $value): ?string
             return null;
         }
 
-        if (!$value instanceof Uuid) {
+        if (!$value instanceof Uuid) { // @phpstan-ignore instanceof.alwaysTrue
             throw new TransformationFailedException('Expected a Uuid.');
         }
 
@@ -44,7 +44,7 @@ public function reverseTransform(mixed $value): ?Uuid
             return null;
         }
 
-        if (!\is_string($value)) {
+        if (!\is_string($value)) { // @phpstan-ignore function.alreadyNarrowedType
             throw new TransformationFailedException('Expected a string.');
         }
 

src/Form/Extension/UuidTypeExtension.php

@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         }
 
         $builder
-            ->addViewTransformer(new UuidToStringDataTransformer($options['nil_to_null'])) // @phpstan-ignore-line
+            ->addViewTransformer(new UuidToStringDataTransformer($options['nil_to_null'])) // @phpstan-ignore argument.type
         ;
     }
 

src/Form/FormProcessor.php

@@ -32,6 +32,7 @@ public function processForm(FormInterface $form, object &$object, array $ignored
             $key = $propertyPath->getElement(0);
 
             if ($childForm->isSubmitted() && $childForm->isValid()) {
+                // @phpstan-ignore-next-line parameterByRef.type
                 $this->propertyAccessor->setValue($object, $key, $childForm->getData());
             }
         }

src/Form/Type/BooleanType.php

@@ -19,9 +19,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->addModelTransformer(new BooleanTypeToBooleanDataTransformer(
-                $options['true_values'], // @phpstan-ignore-line
-                $options['false_values'], // @phpstan-ignore-line
-                $options['default_value'] // @phpstan-ignore-line
+                $options['true_values'], // @phpstan-ignore argument.type
+                $options['false_values'], // @phpstan-ignore argument.type
+                $options['default_value'] // @phpstan-ignore argument.type
             ))
         ;
     }
@@ -37,5 +37,7 @@ public function configureOptions(OptionsResolver $resolver): void
         ]);
 
         $resolver->setAllowedTypes('default_value', ['bool', 'null']);
+        $resolver->setAllowedTypes('true_values', 'array');
+        $resolver->setAllowedTypes('false_values', 'array');
     }
 }

src/ParamResolver/DotEncodingParamResolver.php

@@ -35,8 +35,7 @@ public function resolveParam(FormError $formError): ?string
 
         $key = \implode('.', $keys);
 
-        // @phpstan-ignore-next-line
-        if ('' === $key) {
+        if ('' === $key) { // @phpstan-ignore identical.alwaysFalse
             return null;
         }
 

src/SBSEDVFormBundle.php

@@ -9,6 +9,9 @@
 
 class SBSEDVFormBundle extends AbstractBundle
 {
+    /**
+     * @param array<array-key, array<array-key, mixed>> $config
+     */
     public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
     {
         $container->import('../config/services/cause_resolver.php');

src/Serializer/Normalizer/FormErrorNormalizer.php

@@ -53,6 +53,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
             }
 
             $error = [
+                // @phpstan-ignore-next-line array.invalidKey
                 $messageKey => $this->messageResolver->resolveMessage($formError) ?? $formError->getMessage(),
                 $typeKey => $errorType,
             ];

src/Serializer/Normalizer/UnsubmittedFormNormalizer.php

@@ -25,6 +25,7 @@ public function __construct(
     public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
         return [[
+            // @phpstan-ignore-next-line array.invalidKey
             $context[self::CONTEXT_MESSAGE_KEY] ?? 'message' => $this->translator->trans('request_body_is_empty', domain: 'sbsedv_form'),
             'type' => $context[self::CONTEXT_ERROR_TYPE] ?? 'invalid_request_error',
         ]];