Update / Improvement (#405)

Author: webda2l

.php-cs-fixer.dist.php

@@ -51,7 +51,6 @@
         'phpdoc_var_without_name' => true,
         'phpdoc_to_comment' => false,
         'single_line_throw' => true,
-        'string_implicit_backslashes' => false,   // Temporary?
         'statement_indentation' => true,
         'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays', 'parameters']],
         'use_arrow_functions' => true,

composer.json

@@ -51,12 +51,12 @@
         "phpstan/phpstan-phpunit": "^2.0.10",
         "phpstan/phpstan-strict-rules": "^2.0.7",
         "phpstan/phpstan-symfony": "^2.0.9",
-        "phpunit/phpunit": "^12.5.2",
+        "phpunit/phpunit": "^13.0.5",
         "rector/rector": "^2.2.14",
         "stof/doctrine-extensions-bundle": "^1.14",
-        "symfony/cache": "^7.4.1|^8.0.1",
-        "symfony/validator": "^7.4|^8.0.2",
-        "symfony/var-dumper": "^7.4"
+        "symfony/cache": "^7.4|^8.0",
+        "symfony/validator": "^7.4|^8.0",
+        "symfony/var-dumper": "^7.4|^8.0"
     },
     "suggest": {
         "knplabs/doctrine-behaviors": "For Knp strategy",

src/Form/Type/TranslationsFormsType.php

@@ -72,7 +72,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     }
 
                     $translation->locale = $locale; // @phpstan-ignore property.notFound
-                    $translationColl->add($translation);
+                    $translationColl->set($locale, $translation);
                 },
                 // LocaleExtension options process
                 'label' => $options['locale_labels'][$locale] ?? null,

src/Form/Type/TranslationsType.php

@@ -160,7 +160,7 @@ private function buildKnp(FormBuilderInterface $builder, array $options): void
 
             $localeFormBuilder = $builder->create($locale, FormType::class, [
                 'data_class' => $options['translation_class'],
-                'setter' => static fn (...$args) => self::knpLocaleSetter($locale, $required, ...$args), // @phpstan-ignore argument.unpackNonIterable, argument.type
+                'setter' => static fn (...$args) => self::knpLocaleSetter($locale, $required, ...$args), // @phpstan-ignore argument.type
                 // LocaleExtension options process
                 'label' => $options['locale_labels'][$locale] ?? null,
                 'required' => $required,
@@ -201,8 +201,8 @@ private function buildGedmo(FormBuilderInterface $builder, array $options): void
                     ? [
                         'inherit_data' => true,
                     ] : [
-                        'getter' => static fn (...$args) => self::gedmoLocaleGetter($locale, ...$args), // @phpstan-ignore argument.unpackNonIterable, argument.type
-                        'setter' => static fn (...$args) => self::gedmoLocaleSetter(...$args), // @phpstan-ignore argument.unpackNonIterable, argument.type
+                        'getter' => static fn (...$args) => self::gedmoLocaleGetter($locale, ...$args), // @phpstan-ignore argument.type
+                        'setter' => static fn (...$args) => self::gedmoLocaleSetter(...$args), // @phpstan-ignore argument.type
                     ]
                 ),
                 // LocaleExtension options process
@@ -222,7 +222,7 @@ private function buildGedmo(FormBuilderInterface $builder, array $options): void
                 $field = $builtChild->getName();
                 $localeFormBuilder->add($builtChild->getName(), $builtChild->getType()->getInnerType()::class, [
                     ...$builtChild->getFormConfig()->getOptions(),
-                    'getter' => static fn (...$args) => self::gedmoFieldGetter($field, ...$args), // @phpstan-ignore argument.unpackNonIterable, argument.type
+                    'getter' => static fn (...$args) => self::gedmoFieldGetter($field, ...$args), // @phpstan-ignore argument.type
                     'setter' => static fn (array &$translations, ?string $data) => self::gedmoFieldSetter($field, $locale, $translationClass, $translations, $data),  // @phpstan-ignore-line
                     // 'property_path' => sprintf('[%s?].content', $field),
                 ]);
@@ -233,8 +233,8 @@ private function buildGedmo(FormBuilderInterface $builder, array $options): void
     }
 
     /**
-     * @param Collection<int, \Stub\KnpTranslation> $translationColl
-     * @param ?\Stub\KnpTranslation                 $translation
+     * @param Collection<array-key, \Stub\KnpTranslation> $translationColl
+     * @param ?\Stub\KnpTranslation                       $translation
      */
     private static function knpLocaleSetter(string $locale, bool $required, Collection $translationColl, ?object $translation): void
     {
@@ -249,7 +249,7 @@ private static function knpLocaleSetter(string $locale, bool $required, Collecti
         }
 
         $translation->setLocale($locale);
-        $translationColl->add($translation);
+        $translationColl->set($locale, $translation);
     }
 
     /**

stubs/GedmoTranslatable.stub

@@ -7,7 +7,7 @@ use Doctrine\Common\Collections\Collection;
 interface GedmoTranslatable
 {
     /**
-     * @return Collection<int, GedmoTranslation>
+     * @return Collection<array-key, GedmoTranslation>
      */
     public function getTranslations(): Collection;
     public function addTranslation(GedmoTranslation $translation): self;

tests/Fixtures/Entity/Company.php

@@ -34,12 +34,12 @@ class Company implements TranslatableInterface
     #[AutoTypeCustom(options: ['priority' => 1])]
     protected $translations;
 
-    /** @var Collection<int, Category> */
+    /** @var Collection<array-key, Category> */
     #[ORM\OneToMany(targetEntity: Category::class, mappedBy: 'company', cascade: ['all'], orphanRemoval: true)]
     #[AutoTypeCustom(options: ['entry_options' => ['label' => false]], embedded: true)]
     public Collection $categories;
 
-    /** @var Collection<int, CompanyMediaLocale> */
+    /** @var Collection<array-key, CompanyMediaLocale> */
     #[ORM\OneToMany(targetEntity: CompanyMediaLocale::class, mappedBy: 'company', cascade: ['all'], orphanRemoval: true, indexBy: 'locale')]
     // #[AutoTypeCustom(embedded: true, options: ['entry_options' => ['label' => false, 'children_excluded' => ['id']]])]
     // #[AutoTypeCustom(options: ['form_type' => CompanyMediaType::class], type: TranslationsFormsType::class)]

tests/Fixtures/Entity/Product.php

@@ -40,7 +40,7 @@ class Product
     #[ORM\ManyToOne(targetEntity: Category::class, cascade: ['all'])]
     public ?Category $category = null;
 
-    /** @var Collection<int, ProductTranslation> */
+    /** @var Collection<array-key, ProductTranslation> */
     #[ORM\OneToMany(targetEntity: ProductTranslation::class, mappedBy: 'object', cascade: ['persist', 'remove'], orphanRemoval: true)]
     #[AutoTypeCustom(options: ['priority' => 1])]
     public Collection $translations;
@@ -51,7 +51,7 @@ public function __construct()
     }
 
     /**
-     * @return Collection<int, ProductTranslation>
+     * @return Collection<array-key, ProductTranslation>
      */
     public function getTranslations(): Collection
     {

tests/Form/TypeTestCase.php

@@ -69,7 +69,7 @@ public static function setUpBeforeClass(): void
     }
 
     /**
-     * @param array<array-key, FormInterface<mixed>> $formChildren
+     * @param array<array-key, \Symfony\Component\Form\FormInterface<mixed>> $formChildren
      */
     protected static function assertFormChildren(array $expectedForm, array $formChildren, string $parentPath = ''): void
     {