doctrine · IonBazan · Jan 6, 2023 · Jan 6, 2023 · Jan 6, 2023
diff --git a/Loader/SymfonyFixturesLoader.php b/Loader/SymfonyFixturesLoader.php
@@ -135,7 +135,7 @@ private function addGroupsFixtureMapping(string $className, array $groups)
     }
 
     /**
-     * @param string[] $fixtures An array of fixtures with class names as keys
+     * @param array<class-string<FixtureInterface>, FixtureInterface> $fixtures An array of fixtures with class names as keys
      */
     private function validateDependencies(array $fixtures, FixtureInterface $fixture)
     {

diff --git a/...ion/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestCustomClassRepoRepository.php b/...ion/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestCustomClassRepoRepository.php
@@ -6,6 +6,7 @@
 
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 
+/** @template-extends DocumentRepository<object> */
 class TestCustomClassRepoRepository extends DocumentRepository
 {
 }
diff --git a/...es/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoDocumentRepository.php b/...es/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoDocumentRepository.php
@@ -8,6 +8,7 @@
 use Doctrine\Bundle\MongoDBBundle\Repository\ServiceDocumentRepository;
 use Doctrine\Bundle\MongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\RepositoryServiceBundle\Document\TestCustomServiceRepoDocument;
 
+/** @template-extends ServiceDocumentRepository<TestCustomServiceRepoDocument> */
 class TestCustomServiceRepoDocumentRepository extends ServiceDocumentRepository
 {
     public function __construct(ManagerRegistry $registry)

diff --git a/...ures/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoGridFSRepository.php b/...ures/Bundles/RepositoryServiceBundle/Repository/TestCustomServiceRepoGridFSRepository.php
@@ -8,6 +8,7 @@
 use Doctrine\Bundle\MongoDBBundle\Repository\ServiceDocumentRepository;
 use Doctrine\Bundle\MongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\RepositoryServiceBundle\Document\TestCustomServiceRepoFile;
 
+/** @template-extends ServiceDocumentRepository<TestCustomServiceRepoFile> */
 class TestCustomServiceRepoGridFSRepository extends ServiceDocumentRepository
 {
     public function __construct(ManagerRegistry $registry)

diff --git a/...on/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestUnmappedDocumentRepository.php b/...on/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestUnmappedDocumentRepository.php
@@ -8,6 +8,7 @@
 use Doctrine\Bundle\MongoDBBundle\Repository\ServiceDocumentRepository;
 use Doctrine\Bundle\MongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\RepositoryServiceBundle\Document\TestUnmappedDocument;
 
+/** @template-extends ServiceDocumentRepository<TestUnmappedDocument> */
 class TestUnmappedDocumentRepository extends ServiceDocumentRepository
 {
     public function __construct(ManagerRegistry $registry)

diff --git a/Tests/Fixtures/Cache/Collections.php b/Tests/Fixtures/Cache/Collections.php
@@ -40,10 +40,12 @@ class Collections
     public $another;
 }
 
+/** @template-extends ArrayCollection<array-key, mixed> */
 class SomeCollection extends ArrayCollection
 {
 }
 
+/** @template-extends ArrayCollection<array-key, mixed> */
 class AnotherCollection extends ArrayCollection
 {
 }
diff --git a/Tests/Fixtures/Repository/CustomGridFSRepository.php b/Tests/Fixtures/Repository/CustomGridFSRepository.php
@@ -6,6 +6,7 @@
 
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 
+/** @template-extends DocumentRepository<object> */
 final class CustomGridFSRepository extends DocumentRepository
 {
 }
diff --git a/Tests/Fixtures/Repository/CustomRepository.php b/Tests/Fixtures/Repository/CustomRepository.php
@@ -6,6 +6,7 @@
 
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 
+/** @template-extends DocumentRepository<object> */
 final class CustomRepository extends DocumentRepository
 {
 }
diff --git a/Tests/Repository/ContainerRepositoryFactoryTest.php b/Tests/Repository/ContainerRepositoryFactoryTest.php
@@ -171,10 +171,12 @@ private function createDocumentManager(array $documentRepositoryClasses)
     }
 }
 
+/** @template-extends DocumentRepository<object> */
 class StubRepository extends DocumentRepository
 {
 }
 
+/** @template-extends DocumentRepository<object> */
 class StubServiceRepository extends DocumentRepository implements ServiceDocumentRepositoryInterface
 {
 }

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "symfony/stopwatch": "^4.4|^5.3|^6.0",
         "symfony/validator": "^4.4|^5.3|^6.0",
         "symfony/yaml": "^4.3.3|^5.3|^6.0",
-        "vimeo/psalm": "^4.8"
+        "vimeo/psalm": "^4.30"
     },
     "suggest": {
         "doctrine/data-fixtures": "Load data fixtures"

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
+  <file src="Command/LoadDataFixturesDoctrineODMCommand.php">
+    <UndefinedInterfaceMethod occurrences="1">
+      <code>ask</code>
+    </UndefinedInterfaceMethod>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <plugins>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @param string[] $fixtures An array of fixtures with class names as keys
+         * @param array<class-string<FixtureInterface>, FixtureInterface> $fixtures An array of fixtures with class names as keys
          */
         private function validateDependencies(array $fixtures, FixtureInterface $fixture)
         {
@@ Expand Down @@