Small update / Improvement

.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

@@ -23,7 +23,7 @@
         "symfony/http-kernel": "^7.4|^8.0",
         "symfony/property-info": "^7.4|^8.0",
         "symfony/type-info": "^7.4|^8.0",
-        "phpdocumentor/reflection-docblock": "^5.6"
+        "phpdocumentor/reflection-docblock": "^5.6|^6.0"
     },
     "require-dev": {
         "doctrine/orm": "^3.5.8",
@@ -34,12 +34,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",
-        "symfony/cache": "^7.4.1",
-        "symfony/doctrine-bridge": "^7.4.1",
-        "symfony/validator": "^7.4.2",
-        "symfony/var-dumper": "^7.4"
+        "symfony/cache": "^7.4|^8.0",
+        "symfony/doctrine-bridge": "^7.4|^8.0",
+        "symfony/validator": "^7.4|^8.0",
+        "symfony/var-dumper": "^7.4|^8.0"
     },
     "suggest": {
         "a2lix/translation-form-bundle": "For translation form"

src/Form/Attribute/AutoTypeCustom.php

@@ -20,9 +20,9 @@
 final readonly class AutoTypeCustom
 {
     /**
-     * @param array<string, mixed> $options
-     * @param class-string|null    $type
-     * @param list<string>|null    $groups
+     * @param array<string, mixed>                                                $options
+     * @param class-string<\Symfony\Component\Form\FormTypeInterface<mixed>>|null $type
+     * @param list<string>|null                                                   $groups
      */
     public function __construct(
         private array $options = [],

src/Form/Builder/AutoTypeBuilder.php

@@ -23,7 +23,7 @@
 
 /**
  * @phpstan-type ChildOptions array{
- *    child_type?: class-string,
+ *    child_type?: class-string<\Symfony\Component\Form\FormTypeInterface<mixed>>,
  *    child_name?: string,
  *    child_excluded?: bool,
  *    child_embedded?: bool,
@@ -287,7 +287,7 @@ private function updateEmbeddedChildOptions(
         $innerType = $propTypeInfo instanceof TypeInfo\NullableType ? $propTypeInfo->getWrappedType() : $propTypeInfo;
 
         if (Collection::class === $innerType->getClassName()) {
-            throw new \RuntimeException(\sprintf('Unprecise PhpDoc Collection detected for "%s:%s". Fix it. For example: "@param Collection<int, Obj> $%s"', $refProperty->class, $refProperty->name, $refProperty->name));
+            throw new \RuntimeException(\sprintf('Unprecise PhpDoc Collection detected for "%s:%s". Fix it. For example: "@var Collection<array-key, Obj>"', $refProperty->class, $refProperty->name));
         }
 
         return [

tests/Fixtures/Dto/Product1.php

@@ -19,22 +19,20 @@
 
 class Product1
 {
-    /**
-     * @param list<string>            $tags
-     * @param Collection<int, Media1> $mediaColl
-     * @param list<ProductStatus>     $statusList
-     */
     public function __construct(
         #[AutoTypeCustom(excluded: true)]
         public readonly ?string $id = null,
         public readonly ?string $title = null,
         #[AutoTypeCustom(type: CoreType\TextareaType::class, name: 'desc', options: ['attr' => ['rows' => 2]])]
         private ?string $description = null,
         public readonly ?int $code = null,
+        /** @var list<string> */
         public readonly array $tags = [],
         public readonly ?Media1 $mediaMain = null,
+        /** @var Collection<array-key, Media1> */
         public ?Collection $mediaColl = null,
         public readonly ?ProductStatus $status = null,
+        /** @var list<ProductStatus> */
         public readonly ?array $statusList = null,
         #[AutoTypeCustom(groups: ['Default', 'validity'])]
         public readonly ?\DateTimeImmutable $validityStartAt = null,

tests/Fixtures/Entity/Product1.php

@@ -45,7 +45,7 @@ class Product1
     #[ORM\ManyToOne(targetEntity: Media1::class)]
     public ?Media1 $mediaMain = null;
 
-    /** @var Collection<int, Media1> */
+    /** @var Collection<array-key, Media1> */
     #[ORM\OneToMany(targetEntity: Media1::class, mappedBy: 'product', cascade: ['all'], orphanRemoval: true)]
     public Collection $mediaColl;
 

tests/Form/TestScenario.php

@@ -13,7 +13,7 @@
 
 /**
  * @phpstan-type ExpectedChildren = array<string, array{
- *   expected_type?: class-string,
+ *   expected_type?: class-string<\Symfony\Component\Form\FormTypeInterface<mixed>>,
  *   expected_children?: mixed,
  *   ...
  * }>

tests/Form/Type/AutoTypeTest.php

@@ -22,7 +22,6 @@
 use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProviderExternal;
-use Symfony\Component\Form\FormInterface;
 
 /**
  * @internal
@@ -49,8 +48,8 @@ public function testScenario(TestScenario $testScenario): void
     }
 
     /**
-     * @param ExpectedChildren                       $expectedForm
-     * @param array<array-key, FormInterface<mixed>> $formChildren
+     * @param ExpectedChildren                                               $expectedForm
+     * @param array<array-key, \Symfony\Component\Form\FormInterface<mixed>> $formChildren
      */
     private static function assertFormChildren(array $expectedForm, array $formChildren, string $parentPath = ''): void
     {