diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index cf9b106063..bc54f2b01a 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -105,8 +105,6 @@ jobs:
         if: "${{ matrix.symfony-version == '7' }}"
         run: |
           composer config minimum-stability dev
-          # not yet ready for v7
-          composer remove --no-update --dev vimeo/psalm
           # update symfony deps
           composer require --no-update symfony/console:^7@dev
           composer require --no-update symfony/var-dumper:^7@dev
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 5cd5ac4e31..bcd44649cf 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -59,36 +59,3 @@ jobs:
 
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan analyse --error-format=github"
-
-  static-analysis-psalm:
-    name: "Static Analysis with Psalm"
-    runs-on: "ubuntu-22.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.2"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v4"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          extensions: "mongodb"
-          php-version: "${{ matrix.php-version }}"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
-
-      - name: "Upload composer.lock as build artifact"
-        uses: actions/upload-artifact@v4
-        with:
-          name: "composer-lock-static-analysis-psalm"
-          path: composer.lock
-          overwrite: true
-
-      - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc)"
diff --git a/.gitignore b/.gitignore
index ef4553f5df..68a3971619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,3 @@ vendor/
 .phpunit.cache
 .phpunit.result.cache
 phpcs.xml
-psalm.xml
diff --git a/composer.json b/composer.json
index fdcf7c9a2d..1bdaf6c08d 100644
--- a/composer.json
+++ b/composer.json
@@ -47,8 +47,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^10.4",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/cache": "^5.4 || ^6.0 || ^7.0",
-        "vimeo/psalm": "~5.24.0"
+        "symfony/cache": "^5.4 || ^6.0 || ^7.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.12 || >=3.0"
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php
index 06a5fc90ce..cf722aa86a 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php
@@ -18,13 +18,13 @@
 use function array_merge;
 use function assert;
 
-/** @psalm-import-type PipelineExpression from Builder */
+/** @phpstan-import-type PipelineExpression from Builder */
 final class Aggregation implements IteratorAggregate
 {
     /**
      * @param array<string, mixed> $pipeline
      * @param array<string, mixed> $options
-     * @psalm-param PipelineExpression $pipeline
+     * @phpstan-param PipelineExpression $pipeline
      */
     public function __construct(private DocumentManager $dm, private ?ClassMetadata $classMetadata, private Collection $collection, private array $pipeline, private array $options = [], private bool $rewindable = true)
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php
index 4631ae633a..8ec6ad5cb0 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php
@@ -28,9 +28,9 @@
 /**
  * Fluent interface for building aggregation pipelines.
  *
- * @psalm-import-type SortShape from Sort
- * @psalm-import-type StageExpression from Stage
- * @psalm-type PipelineExpression = list<StageExpression>
+ * @phpstan-import-type SortShape from Sort
+ * @phpstan-type StageExpression array<string, mixed>
+ * @phpstan-type PipelineExpression list<StageExpression>
  */
 class Builder
 {
@@ -44,7 +44,7 @@ class Builder
      */
     private ClassMetadata $class;
 
-    /** @psalm-var class-string */
+    /** @var class-string */
     private ?string $hydrationClass = null;
 
     /**
@@ -60,7 +60,7 @@ class Builder
     /**
      * Create a new aggregation builder.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      */
     public function __construct(DocumentManager $dm, string $documentName)
     {
@@ -270,8 +270,8 @@ public function getAggregation(array $options = []): Aggregation
      * you should not apply filters as this may cause wrong results to be
      * given.
      *
-     * @return array<array<string, mixed>>
-     * @psalm-return PipelineExpression
+     * @return list<array<string, mixed>>
+     * @phpstan-return PipelineExpression
      */
     // phpcs:enable Squiz.Commenting.FunctionComment.ExtraParamComment
     public function getPipeline(/* bool $applyFilters = true */): array
@@ -609,7 +609,7 @@ public function skip(int $skip): Stage\Skip
      *
      * @param array<string, int|string|array<string, string>>|string $fieldName Field name or array of field/order pairs
      * @param int|string|null                                        $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string $fieldName Field name or array of field/order pairs
+     * @phpstan-param SortShape|string $fieldName Field name or array of field/order pairs
      */
     public function sort($fieldName, $order = null): Stage\Sort
     {
@@ -699,7 +699,7 @@ public function addStage(Stage $stage): Stage
      */
     private function applyFilters(array $query): array
     {
-        $documentPersister = $this->dm->getUnitOfWork()->getDocumentPersister($this->class->name);
+        $documentPersister = $this->getDocumentPersister();
 
         $query = $documentPersister->addDiscriminatorToPreparedQuery($query);
         $query = $documentPersister->addFilterToPreparedQuery($query);
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php
index 732c583c1a..fe84d3107e 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php
@@ -45,7 +45,7 @@
 /**
  * Fluent interface for building aggregation pipelines.
  *
- * @psalm-type OperatorExpression = array<string, mixed>|object
+ * @phpstan-type OperatorExpression array<string, mixed>|object
  */
 class Expr implements
     AccumulatorOperators,
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php
index 15395cf52b..9de942e1b6 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php
@@ -14,8 +14,8 @@
  *
  * @internal
  *
- * @psalm-import-type PipelineExpression from Builder
- * @psalm-type StageExpression = array<non-empty-string, mixed>
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-import-type StageExpression from Builder
  */
 abstract class Stage
 {
@@ -31,7 +31,7 @@ public function __construct(Builder $builder)
      * Assembles the aggregation stage
      *
      * @return array<string, mixed>
-     * @psalm-return StageExpression
+     * @phpstan-return StageExpression
      */
     abstract public function getExpression(): array;
 
@@ -189,8 +189,8 @@ public function geoNear($x, $y = null): Stage\GeoNear
     /**
      * Returns the assembled aggregation pipeline
      *
-     * @return array<array<string, mixed>>
-     * @psalm-return PipelineExpression
+     * @return list<array<string, mixed>>
+     * @phpstan-return PipelineExpression
      */
     public function getPipeline(): array
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/AddFields.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/AddFields.php
index b658656bb9..3315c9ee46 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/AddFields.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/AddFields.php
@@ -9,8 +9,8 @@
 /**
  * Fluent interface for adding a $addFields stage to an aggregation pipeline.
  *
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type AddFieldsStageExpression = array{'$addFields': array<string, OperatorExpression|mixed>}
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type AddFieldsStageExpression array{'$addFields': array<string, OperatorExpression|mixed>}
  */
 final class AddFields extends Operator
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php
index 67e9c80d3f..47328371f6 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php
@@ -63,7 +63,6 @@ public function output(): Bucket\BucketOutput
     /** @return array{boundaries: mixed[], default: mixed} */
     protected function getExtraPipelineFields(): array
     {
-        /** @psalm-suppress RedundantPropertyInitializationCheck because the property might not be set yet */
         $fields = ['boundaries' => $this->boundaries ?? null];
         if ($this->default !== null) {
             $fields['default'] = $this->default;
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/CollStats.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/CollStats.php
index 688e40c612..881c067215 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/CollStats.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/CollStats.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $collStats stage to an aggregation pipeline.
  *
- * @psalm-type CollStatsStageExpression = array{
+ * @phpstan-type CollStatsStageExpression array{
  *     '$collStats': array{
  *         latencyStats?: array{histograms?: bool},
  *         storageStats?: array{},
@@ -52,7 +52,7 @@ public function showStorageStats(): static
         return $this;
     }
 
-    /** @psalm-return CollStatsStageExpression */
+    /** @phpstan-return CollStatsStageExpression */
     public function getExpression(): array
     {
         $collStats = [];
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Count.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Count.php
index 7a9e55e3f5..008e6a52fb 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Count.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Count.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $count stage to an aggregation pipeline.
  *
- * @psalm-type CountStageExpression = array{'$count': string}
+ * @phpstan-type CountStageExpression array{'$count': string}
  */
 class Count extends Stage
 {
@@ -19,7 +19,7 @@ public function __construct(Builder $builder, private string $fieldName)
         parent::__construct($builder);
     }
 
-    /** @psalm-return CountStageExpression */
+    /** @phpstan-return CountStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Densify.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Densify.php
index 0e054433d2..50f01ac755 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Densify.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Densify.php
@@ -13,9 +13,9 @@
 /**
  * Fluent interface for adding a $densify stage to an aggregation pipeline.
  *
- * @psalm-type BoundsType = 'full'|'partition'|array{0: int|float|UTCDateTime, 1: int|float|UTCDateTime}
- * @psalm-type UnitType = 'year'|'month'|'week'|'day'|'hour'|'minute'|'second'|'millisecond'
- * @psalm-type DensifyStageExpression = array{
+ * @phpstan-type BoundsType 'full'|'partition'|array{0: int|float|UTCDateTime, 1: int|float|UTCDateTime}
+ * @phpstan-type UnitType 'year'|'month'|'week'|'day'|'hour'|'minute'|'second'|'millisecond'
+ * @phpstan-type DensifyStageExpression array{
  *     '$densify': object{
  *         field: string,
  *         partitionByFields?: list<string>,
@@ -54,8 +54,8 @@ public function partitionByFields(string ...$fields): static
     /**
      * @param array|string $bounds
      * @param int|float    $step
-     * @psalm-param BoundsType  $bounds
-     * @psalm-param ''|UnitType $unit
+     * @phpstan-param BoundsType  $bounds
+     * @phpstan-param ''|UnitType $unit
      */
     public function range($bounds, $step, string $unit = ''): static
     {
@@ -71,7 +71,7 @@ public function range($bounds, $step, string $unit = ''): static
         return $this;
     }
 
-    /** @psalm-return DensifyStageExpression */
+    /** @phpstan-return DensifyStageExpression */
     public function getExpression(): array
     {
         $params = (object) [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Facet.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Facet.php
index 1096f0d040..a8a963ab0a 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Facet.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Facet.php
@@ -14,8 +14,8 @@
 /**
  * Fluent interface for adding a $facet stage to an aggregation pipeline.
  *
- * @psalm-import-type PipelineExpression from Builder
- * @psalm-type FacetStageExpression = array{'$facet': array<string, PipelineExpression>}
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-type FacetStageExpression array{'$facet': array<string, PipelineExpression>}
  */
 class Facet extends Stage
 {
@@ -48,7 +48,6 @@ public function field(string $field): static
      */
     public function pipeline($builder): static
     {
-        /** @psalm-suppress RedundantPropertyInitializationCheck because the property might not be set yet */
         if (! isset($this->field)) {
             throw new LogicException(__METHOD__ . ' requires setting a current field using field().');
         }
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill.php
index df1069166c..211a5b9a48 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill.php
@@ -17,11 +17,11 @@
 /**
  * Fluent interface for adding a $fill stage to an aggregation pipeline.
  *
- * @psalm-import-type SortDirectionKeywords from Sort
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type SortDirection = int|SortDirectionKeywords
- * @psalm-type SortShape = array<string, SortDirection>
- * @psalm-type FillStageExpression = array{
+ * @phpstan-import-type SortDirectionKeywords from Sort
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type SortDirection int|SortDirectionKeywords
+ * @phpstan-type SortShape array<string, SortDirection>
+ * @phpstan-type FillStageExpression array{
  *     '$fill': array{
  *         partitionBy?: string|OperatorExpression,
  *         partitionByFields?: list<string>,
@@ -67,8 +67,8 @@ public function partitionByFields(string ...$fields): static
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string           $fieldName
-     * @psalm-param SortDirection|null         $order
+     * @phpstan-param SortShape|string           $fieldName
+     * @phpstan-param SortDirection|null         $order
      */
     public function sortBy($fieldName, $order = null): static
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill/Output.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill/Output.php
index f12ce9f62c..4e28d6015e 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill/Output.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Fill/Output.php
@@ -16,7 +16,7 @@
 /**
  * Fluent builder for output param of $fill stage
  *
- * @psalm-import-type SortShape from Fill
+ * @phpstan-import-type SortShape from Fill
  */
 class Output extends Stage
 {
@@ -44,7 +44,7 @@ public function partitionByFields(string ...$fields): Fill
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string           $fieldName
+     * @phpstan-param SortShape|string           $fieldName
      */
     public function sortBy($fieldName, $order = null): Fill
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php
index 962da0b50a..e58809f2a0 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php
@@ -20,7 +20,7 @@
 use function is_string;
 use function substr;
 
-/** @psalm-import-type FieldMapping from ClassMetadata */
+/** @phpstan-import-type FieldMapping from ClassMetadata */
 class GraphLookup extends Stage
 {
     private ?string $from;
@@ -130,7 +130,7 @@ public function depthField(string $depthField): static
      * Target collection for the $graphLookup operation to search, recursively
      * matching the connectFromField to the connectToField.
      *
-     * @psalm-param class-string|string $from
+     * @param class-string|string $from
      */
     public function from(string $from): static
     {
@@ -281,7 +281,7 @@ private function getDocumentPersister(ClassMetadata $class): DocumentPersister
         return $this->dm->getUnitOfWork()->getDocumentPersister($class->name);
     }
 
-    /** @psalm-param FieldMapping $mapping */
+    /** @phpstan-param FieldMapping $mapping */
     private function getReferencedFieldName(string $fieldName, array $mapping): string
     {
         if (! $this->targetClass) {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Group.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Group.php
index f57ef9a32b..b6bc71a5f5 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Group.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Group.php
@@ -12,7 +12,7 @@
 /**
  * Fluent interface for adding a $group stage to an aggregation pipeline.
  *
- * @psalm-type GroupStageExpression = array{'$group': array<string, mixed>}
+ * @phpstan-type GroupStageExpression array{'$group': array<string, mixed>}
  */
 class Group extends Operator implements GroupAccumulatorOperators
 {
@@ -28,7 +28,7 @@ public function __construct(Builder $builder)
         $this->expr = $builder->expr();
     }
 
-    /** @psalm-return GroupStageExpression */
+    /** @phpstan-return GroupStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/IndexStats.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/IndexStats.php
index f59e7732fb..f253ee462a 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/IndexStats.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/IndexStats.php
@@ -10,11 +10,11 @@
 /**
  * Fluent interface for adding a $indexStats stage to an aggregation pipeline.
  *
- * @psalm-type IndexStatsStageExpression = array{'$indexStats': object}
+ * @phpstan-type IndexStatsStageExpression array{'$indexStats': object}
  */
 class IndexStats extends Stage
 {
-    /** @psalm-return IndexStatsStageExpression */
+    /** @phpstan-return IndexStatsStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Limit.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Limit.php
index 7081749470..61df12b398 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Limit.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Limit.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $limit stage to an aggregation pipeline.
  *
- * @psalm-type LimitStageExpression = array{'$limit': int}
+ * @phpstan-type LimitStageExpression array{'$limit': int}
  */
 class Limit extends Stage
 {
@@ -19,7 +19,7 @@ public function __construct(Builder $builder, private int $limit)
         parent::__construct($builder);
     }
 
-    /** @psalm-return LimitStageExpression */
+    /** @phpstan-return LimitStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php
index 7b6fcde709..49a93c0fb7 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php
@@ -16,10 +16,10 @@
 /**
  * Fluent interface for building aggregation pipelines.
  *
- * @psalm-import-type PipelineExpression from Builder
- * @psalm-type PipelineParamType = Builder|Stage|PipelineExpression
- * @psalm-type LookupStageExpression = array{
- *     $lookup: array{
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-type PipelineParamType Builder|Stage|PipelineExpression
+ * @phpstan-type LookupStageExpression array{
+ *     '$lookup': array{
  *         from: string,
  *         'as'?: string,
  *         localField?: string,
@@ -46,7 +46,7 @@ class Lookup extends Stage
 
     /**
      * @var Builder|array<array<string, mixed>>|null
-     * @psalm-var Builder|PipelineExpression|null
+     * @phpstan-var Builder|PipelineExpression|null
      */
     private Builder|array|null $pipeline = null;
 
@@ -101,7 +101,7 @@ public function from(string $from): static
         return $this;
     }
 
-    /** @psalm-return LookupStageExpression */
+    /** @phpstan-return LookupStageExpression */
     public function getExpression(): array
     {
         $lookup = [
@@ -193,7 +193,7 @@ public function let(array $let): static
      * and then reference the variables in the pipeline stages.
      *
      * @param Builder|Stage|array<array<string, mixed>> $pipeline
-     * @psalm-param PipelineParamType $pipeline
+     * @phpstan-param PipelineParamType $pipeline
      */
     public function pipeline($pipeline): static
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Merge.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Merge.php
index 356efa3eb9..36b4a0616a 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Merge.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Merge.php
@@ -16,12 +16,12 @@
 use function is_array;
 
 /**
- * @psalm-import-type PipelineExpression from Builder
- * @psalm-type OutputCollection = string|array{db: string, coll: string}
- * @psalm-type WhenMatchedType = 'replace'|'keepExisting'|'merge'|'fail'|PipelineExpression
- * @psalm-type WhenMatchedParamType = Builder|Stage|WhenMatchedType
- * @psalm-type WhenNotMatchedType = 'insert'|'discard'|'fail'
- * @psalm-type MergeStageExpression = array{
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-type OutputCollection string|array{db: string, coll: string}
+ * @phpstan-type WhenMatchedType 'replace'|'keepExisting'|'merge'|'fail'|PipelineExpression
+ * @phpstan-type WhenMatchedParamType Builder|Stage|WhenMatchedType
+ * @phpstan-type WhenNotMatchedType 'insert'|'discard'|'fail'
+ * @phpstan-type MergeStageExpression array{
  *     '$merge': object{
  *         into: OutputCollection,
  *         on?: string|list<string>,
@@ -33,7 +33,7 @@
  */
 class Merge extends Stage
 {
-    /** @psalm-var OutputCollection */
+    /** @phpstan-var OutputCollection */
     private string|array $into;
 
     /** @var list<string> */
@@ -42,7 +42,7 @@ class Merge extends Stage
     /** @var array<string, mixed|Expr> */
     private array $let = [];
 
-    /** @psalm-var WhenMatchedParamType */
+    /** @phpstan-var WhenMatchedParamType */
     private string|array|Builder|Stage|null $whenMatched = null;
 
     private ?string $whenNotMatched = null;
@@ -52,7 +52,7 @@ public function __construct(Builder $builder, private DocumentManager $dm)
         parent::__construct($builder);
     }
 
-    /** @psalm-return MergeStageExpression */
+    /** @phpstan-return MergeStageExpression */
     public function getExpression(): array
     {
         $params = (object) [
@@ -82,7 +82,7 @@ public function getExpression(): array
 
     /**
      * @param string|array $collection
-     * @psalm-param OutputCollection $collection
+     * @phpstan-param OutputCollection $collection
      */
     public function into($collection): static
     {
@@ -126,7 +126,7 @@ public function on(string ...$fields): static
 
     /**
      * @param string|array|Builder|Stage $whenMatched
-     * @psalm-param WhenMatchedParamType $whenMatched
+     * @phpstan-param WhenMatchedParamType $whenMatched
      */
     public function whenMatched($whenMatched): static
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Out.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Out.php
index aa6a335012..2021e6d1e6 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Out.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Out.php
@@ -14,12 +14,12 @@
 use function is_array;
 
 /**
- * @psalm-import-type OutputCollection from Merge
- * @psalm-type OutStageExpression = array{'$out': OutputCollection}
+ * @phpstan-import-type OutputCollection from Merge
+ * @phpstan-type OutStageExpression array{'$out': OutputCollection}
  */
 class Out extends Stage
 {
-    /** @psalm-var OutputCollection */
+    /** @phpstan-var OutputCollection */
     private array|string $out;
 
     public function __construct(Builder $builder, string $collection, private DocumentManager $dm)
@@ -38,7 +38,7 @@ public function getExpression(): array
 
     /**
      * @param string|array $collection
-     * @psalm-param OutputCollection $collection
+     * @phpstan-param OutputCollection $collection
      */
     public function out($collection): Stage\Out
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Project.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Project.php
index c108e5f3e4..8b77ec68e4 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Project.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Project.php
@@ -9,12 +9,12 @@
 /**
  * Fluent interface for adding a $project stage to an aggregation pipeline.
  *
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type ProjectStageExpression = array{'$project': array<string, OperatorExpression|mixed>}
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type ProjectStageExpression array{'$project': array<string, OperatorExpression|mixed>}
  */
 class Project extends Operator
 {
-    /** @psalm-return ProjectStageExpression */
+    /** @phpstan-return ProjectStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Redact.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Redact.php
index 2ac792bdba..c8b0614072 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Redact.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Redact.php
@@ -9,8 +9,8 @@
 /**
  * Fluent interface for adding a $redact stage to an aggregation pipeline.
  *
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type SetStageExpression = array{'$redact': array<string, OperatorExpression|mixed>}
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type SetStageExpression array{'$redact': array<string, OperatorExpression|mixed>}
  */
 class Redact extends Operator
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php
index 3d25a2a74a..4ffa90f1f1 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php
@@ -7,8 +7,8 @@
 use Doctrine\ODM\MongoDB\Aggregation\Expr;
 
 /**
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type ReplaceRootStageExpression = array{
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type ReplaceRootStageExpression array{
  *     '$replaceRoot': array{
  *         newRoot: OperatorExpression|string,
  *     }
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceWith.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceWith.php
index 317cde3c28..c1341eed40 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceWith.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceWith.php
@@ -7,8 +7,8 @@
 use Doctrine\ODM\MongoDB\Aggregation\Expr;
 
 /**
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type ReplaceWithStageExpression = array{'$replaceWith': OperatorExpression|string}
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type ReplaceWithStageExpression array{'$replaceWith': OperatorExpression|string}
  */
 class ReplaceWith extends AbstractReplace
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sample.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sample.php
index 24c8d6b275..7d87bb1eca 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sample.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sample.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $sample stage to an aggregation pipeline.
  *
- * @psalm-type SampleStageExpression = array{'$sample': array{size: int}}
+ * @phpstan-type SampleStageExpression array{'$sample': array{size: int}}
  */
 class Sample extends Stage
 {
@@ -19,7 +19,7 @@ public function __construct(Builder $builder, private int $size)
         parent::__construct($builder);
     }
 
-    /** @psalm-return SampleStageExpression */
+    /** @phpstan-return SampleStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search.php
index 86cf1dc6b6..e1eea694c5 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search.php
@@ -16,12 +16,12 @@
 use function strtolower;
 
 /**
- * @psalm-import-type SortDirectionKeywords from Sort
- * @psalm-type CountType = 'lowerBound'|'total'
- * @psalm-type SortMetaKeywords = 'searchScore'
- * @psalm-type SortMeta = array{'$meta': SortMetaKeywords}
- * @psalm-type SortShape = array<string, int|SortMeta|SortDirectionKeywords>
- * @psalm-type SearchStageExpression = array{
+ * @phpstan-import-type SortDirectionKeywords from Sort
+ * @phpstan-type CountType 'lowerBound'|'total'
+ * @phpstan-type SortMetaKeywords 'searchScore'
+ * @phpstan-type SortMeta array{'$meta': SortMetaKeywords}
+ * @phpstan-type SortShape array<string, int|SortMeta|SortDirectionKeywords>
+ * @phpstan-type SearchStageExpression array{
  *     '$search': object{
  *         index?: string,
  *         count?: object{
@@ -71,7 +71,7 @@ public function __construct(Builder $builder)
         parent::__construct($builder);
     }
 
-    /** @psalm-return SearchStageExpression */
+    /** @phpstan-return SearchStageExpression */
     public function getExpression(): array
     {
         $params = (object) [];
@@ -111,7 +111,7 @@ public function index(string $name): static
         return $this;
     }
 
-    /** @psalm-param CountType $type */
+    /** @phpstan-param CountType $type */
     public function countDocuments(string $type, ?int $threshold = null): static
     {
         $this->count = (object) ['type' => $type];
@@ -148,8 +148,8 @@ public function returnStoredSource(bool $returnStoredSource = true): static
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string $fieldName
-     * @psalm-param int|SortMeta|SortDirectionKeywords|null $order
+     * @phpstan-param SortShape|string $fieldName
+     * @phpstan-param int|SortMeta|SortDirectionKeywords|null $order
      */
     public function sort($fieldName, $order = null): static
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/AbstractSearchOperator.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/AbstractSearchOperator.php
index eb115ab9cc..c7dede7c4c 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/AbstractSearchOperator.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/AbstractSearchOperator.php
@@ -11,10 +11,10 @@
 /**
  * @internal
  *
- * @psalm-import-type SortDirectionKeywords from Sort
- * @psalm-import-type SortMetaKeywords from Search
- * @psalm-import-type SortMeta from Search
- * @psalm-import-type SortShape from Search
+ * @phpstan-import-type SortDirectionKeywords from Sort
+ * @phpstan-import-type SortMetaKeywords from Search
+ * @phpstan-import-type SortMeta from Search
+ * @phpstan-import-type SortShape from Search
  */
 abstract class AbstractSearchOperator extends Stage implements SearchOperator
 {
@@ -46,18 +46,15 @@ public function returnStoredSource(bool $returnStoredSource): Search
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string $fieldName
-     * @psalm-param int|SortMeta|SortDirectionKeywords|null $order
+     * @phpstan-param SortShape|string $fieldName
+     * @phpstan-param int|SortMeta|SortDirectionKeywords|null $order
      */
     public function sort($fieldName, $order = null): Search
     {
         return $this->search->sort($fieldName, $order);
     }
 
-    /**
-     * @return array<string, object>
-     * @psalm-return non-empty-array<non-empty-string, object>
-     */
+    /** @return non-empty-array<non-empty-string, object> */
     final public function getExpression(): array
     {
         return [$this->getOperatorName() => $this->getOperatorParams()];
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Set.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Set.php
index cca5aed345..09c1fe85b8 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Set.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Set.php
@@ -9,12 +9,12 @@
 /**
  * Fluent interface for adding a $set stage to an aggregation pipeline.
  *
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type SetStageExpression = array{'$set': array<string, OperatorExpression|mixed>}
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type SetStageExpression array{'$set': array<string, OperatorExpression|mixed>}
  */
 final class Set extends Operator
 {
-    /** @psalm-return SetStageExpression */
+    /** @phpstan-return SetStageExpression */
     public function getExpression(): array
     {
         return ['$set' => $this->expr->getExpression()];
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields.php
index 9d8b436568..0d36a7eaa8 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields.php
@@ -14,11 +14,11 @@
 use function strtolower;
 
 /**
- * @psalm-import-type SortDirectionKeywords from Sort
- * @psalm-import-type OperatorExpression from Expr
- * @psalm-type SortDirection = int|SortDirectionKeywords
- * @psalm-type SortShape = array<string, SortDirection>
- * @psalm-type SetWindowFieldsStageExpression = array{
+ * @phpstan-import-type SortDirectionKeywords from Sort
+ * @phpstan-import-type OperatorExpression from Expr
+ * @phpstan-type SortDirection int|SortDirectionKeywords
+ * @phpstan-type SortShape array<string, SortDirection>
+ * @phpstan-type SetWindowFieldsStageExpression array{
  *     '$setWindowFields': object{
  *         partitionBy?: string|OperatorExpression,
  *         sortBy?: SortShape,
@@ -53,8 +53,8 @@ public function partitionBy($expression): static
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string           $fieldName
-     * @psalm-param SortDirection|null         $order
+     * @phpstan-param SortShape|string           $fieldName
+     * @phpstan-param SortDirection|null         $order
      */
     public function sortBy($fieldName, $order = null): static
     {
@@ -76,7 +76,7 @@ public function output(): Output
         return $this->output;
     }
 
-    /** @psalm-return SetWindowFieldsStageExpression */
+    /** @phpstan-return SetWindowFieldsStageExpression */
     public function getExpression(): array
     {
         $params = (object) [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields/Output.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields/Output.php
index 386d9ff30e..640610ad1f 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields/Output.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields/Output.php
@@ -21,11 +21,11 @@
 /**
  * Fluent builder for output param of $setWindowFields stage
  *
- * @psalm-import-type SortShape from SetWindowFields
- * @psalm-type WindowBound = 'current'|'unbounded'|int
- * @psalm-type WindowBounds = array{0: WindowBound, 1: WindowBound}
- * @psalm-type WindowUnit = 'year'|'quarter'|'month'|'week'|'day'|'hour'|'minute'|'second'|'millisecond'
- * @psalm-type Window = object{
+ * @phpstan-import-type SortShape from SetWindowFields
+ * @phpstan-type WindowBound 'current'|'unbounded'|int
+ * @phpstan-type WindowBounds array{0: WindowBound, 1: WindowBound}
+ * @phpstan-type WindowUnit 'year'|'quarter'|'month'|'week'|'day'|'hour'|'minute'|'second'|'millisecond'
+ * @phpstan-type Window object{
  *     document?: WindowBounds,
  *     range?: WindowBounds,
  *     unit?: WindowUnit,
@@ -37,7 +37,7 @@ class Output extends Operator implements WindowOperators
 
     private string $currentField = '';
 
-    /** @psalm-var array<string, Window> */
+    /** @phpstan-var array<string, Window> */
     private array $windows = [];
 
     public function __construct(Builder $builder, private SetWindowFields $setWindowFields)
@@ -54,7 +54,7 @@ public function partitionBy($expression): SetWindowFields
     /**
      * @param array<string, int|string>|string $fieldName Field name or array of field/order pairs
      * @param int|string                       $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string           $fieldName
+     * @phpstan-param SortShape|string           $fieldName
      */
     public function sortBy($fieldName, $order = null): SetWindowFields
     {
@@ -75,9 +75,9 @@ public function field(string $fieldName): static
     /**
      * Specifies the window boundaries and parameters.
      *
-     * @psalm-param WindowBounds|null $documents
-     * @psalm-param WindowBounds|null $range
-     * @psalm-param WindowUnit|null $unit
+     * @phpstan-param WindowBounds|null $documents
+     * @phpstan-param WindowBounds|null $range
+     * @phpstan-param WindowUnit|null $unit
      */
     public function window(?array $documents = null, ?array $range = null, ?string $unit = null): static
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Skip.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Skip.php
index a08fd1167c..440b04ed90 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Skip.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Skip.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $skip stage to an aggregation pipeline.
  *
- * @psalm-type SkipStageExpression = array{'$skip': int}
+ * @phpstan-type SkipStageExpression array{'$skip': int}
  */
 class Skip extends Stage
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sort.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sort.php
index 235d753a6a..952597b07b 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sort.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Sort.php
@@ -15,11 +15,11 @@
 /**
  * Fluent interface for adding a $sort stage to an aggregation pipeline.
  *
- * @psalm-type SortMetaKeywords = 'textScore'|'indexKey'
- * @psalm-type SortDirectionKeywords = 'asc'|'desc'
- * @psalm-type SortMeta = array{'$meta': SortMetaKeywords}
- * @psalm-type SortShape = array<string, int|SortMeta|SortDirectionKeywords>
- * @psalm-type SortStageExpression = array{
+ * @phpstan-type SortMetaKeywords 'textScore'|'indexKey'
+ * @phpstan-type SortDirectionKeywords 'asc'|'desc'
+ * @phpstan-type SortMeta array{'$meta': SortMetaKeywords}
+ * @phpstan-type SortShape array<string, int|SortMeta|SortDirectionKeywords>
+ * @phpstan-type SortStageExpression array{
  *     '$sort': array<string, int|SortMeta>
  * }
  */
@@ -31,8 +31,8 @@ class Sort extends Stage
     /**
      * @param array<string, int|string|array<string, string>>|string $fieldName Field name or array of field/order pairs
      * @param int|string                                             $order     Field order (if one field is specified)
-     * @psalm-param SortShape|string                        $fieldName
-     * @psalm-param int|SortMeta|SortDirectionKeywords|null $order
+     * @phpstan-param SortShape|string                        $fieldName
+     * @phpstan-param int|SortMeta|SortDirectionKeywords|null $order
      */
     public function __construct(Builder $builder, $fieldName, $order = null)
     {
@@ -55,7 +55,7 @@ public function __construct(Builder $builder, $fieldName, $order = null)
         }
     }
 
-    /** @psalm-return SortStageExpression */
+    /** @phpstan-return SortStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SortByCount.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SortByCount.php
index e37fd46689..76f1347deb 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SortByCount.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SortByCount.php
@@ -11,7 +11,7 @@
 
 use function substr;
 
-/** @psalm-type SortByCountStageExpression = array{'$sortByCount': string} */
+/** @phpstan-type SortByCountStageExpression array{'$sortByCount': string} */
 class SortByCount extends Stage
 {
     private string $fieldName;
@@ -29,7 +29,7 @@ public function __construct(Builder $builder, string $fieldName, DocumentManager
         $this->fieldName   = '$' . $documentPersister->prepareFieldName(substr($fieldName, 1));
     }
 
-    /** @psalm-return SortByCountStageExpression */
+    /** @phpstan-return SortByCountStageExpression */
     public function getExpression(): array
     {
         return [
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnionWith.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnionWith.php
index 6c468c9427..0f388a8f43 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnionWith.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnionWith.php
@@ -13,9 +13,9 @@
 /**
  * Fluent interface for adding a $unionWith stage to an aggregation pipeline.
  *
- * @psalm-import-type PipelineExpression from Builder
- * @psalm-type PipelineParamType = array|Builder|Stage|PipelineExpression
- * @psalm-type UnionWithStageExpression = array{
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-type PipelineParamType array|Builder|Stage|PipelineExpression
+ * @phpstan-type UnionWithStageExpression array{
  *     '$unionWith': object{
  *         coll: string,
  *         pipeline?: PipelineExpression,
@@ -24,7 +24,7 @@
  */
 class UnionWith extends Stage
 {
-    /** @psalm-var ?PipelineParamType */
+    /** @phpstan-var ?PipelineParamType */
     private array|Builder|Stage|null $pipeline = null;
 
     public function __construct(Builder $builder, private DocumentManager $dm, private string $collection)
@@ -40,7 +40,7 @@ public function __construct(Builder $builder, private DocumentManager $dm, priva
 
     /**
      * @param array|Builder|Stage $pipeline
-     * @psalm-param PipelineParamType $pipeline
+     * @phpstan-param PipelineParamType $pipeline
      */
     public function pipeline($pipeline): static
     {
@@ -57,7 +57,7 @@ public function pipeline($pipeline): static
         return $this;
     }
 
-    /** @psalm-return UnionWithStageExpression */
+    /** @phpstan-return UnionWithStageExpression */
     public function getExpression(): array
     {
         $params = (object) ['coll' => $this->collection];
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnsetStage.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnsetStage.php
index c6e6bd7acb..8e02c90596 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnsetStage.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/UnsetStage.php
@@ -14,7 +14,7 @@
 /**
  * Fluent interface for adding an $unset stage to an aggregation pipeline.
  *
- * @psalm-type UnsetStageExpression = array{'$unset': list<string>}
+ * @phpstan-type UnsetStageExpression array{'$unset': list<string>}
  */
 class UnsetStage extends Stage
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Unwind.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Unwind.php
index 66596d398f..060ab558e6 100644
--- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Unwind.php
+++ b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Unwind.php
@@ -10,7 +10,7 @@
 /**
  * Fluent interface for adding a $unwind stage to an aggregation pipeline.
  *
- * @psalm-type UnwindStageExpression = array{
+ * @phpstan-type UnwindStageExpression array{
  *     '$unwind': string|array{
  *         path: string,
  *         includeArrayIndex?: string,
@@ -29,7 +29,7 @@ public function __construct(Builder $builder, private string $fieldName)
         parent::__construct($builder);
     }
 
-    /** @psalm-return UnwindStageExpression */
+    /** @phpstan-return UnwindStageExpression */
     public function getExpression(): array
     {
         // Fallback behavior for MongoDB < 3.2
diff --git a/lib/Doctrine/ODM/MongoDB/Configuration.php b/lib/Doctrine/ODM/MongoDB/Configuration.php
index aef7fa05b7..adc486991f 100644
--- a/lib/Doctrine/ODM/MongoDB/Configuration.php
+++ b/lib/Doctrine/ODM/MongoDB/Configuration.php
@@ -47,7 +47,7 @@
  *     $config = new Configuration();
  *     $dm = DocumentManager::create(new Connection(), $config);
  *
- * @psalm-import-type CommitOptions from UnitOfWork
+ * @phpstan-import-type CommitOptions from UnitOfWork
  */
 class Configuration
 {
@@ -85,7 +85,7 @@ class Configuration
     /**
      * Array of attributes for this configuration instance.
      *
-     * @psalm-var array{
+     * @phpstan-var array{
      *      autoGenerateHydratorClasses?: self::AUTOGENERATE_*,
      *      autoGeneratePersistentCollectionClasses?: self::AUTOGENERATE_*,
      *      classMetadataFactoryName?: class-string<ClassMetadataFactoryInterface>,
@@ -326,7 +326,7 @@ public function getHydratorDir(): ?string
      * Gets an int flag that indicates whether hydrator classes should always be regenerated
      * during each script execution.
      *
-     * @psalm-return self::AUTOGENERATE_*
+     * @return self::AUTOGENERATE_*
      */
     public function getAutoGenerateHydratorClasses(): int
     {
@@ -337,7 +337,7 @@ public function getAutoGenerateHydratorClasses(): int
      * Sets an int flag that indicates whether hydrator classes should always be regenerated
      * during each script execution.
      *
-     * @psalm-param self::AUTOGENERATE_* $mode
+     * @param self::AUTOGENERATE_* $mode
      */
     public function setAutoGenerateHydratorClasses(int $mode): void
     {
@@ -368,7 +368,7 @@ public function getPersistentCollectionDir(): ?string
      * Gets a integer flag that indicates how and when persistent collection
      * classes should be generated.
      *
-     * @psalm-return self::AUTOGENERATE_*
+     * @return self::AUTOGENERATE_*
      */
     public function getAutoGeneratePersistentCollectionClasses(): int
     {
@@ -379,7 +379,7 @@ public function getAutoGeneratePersistentCollectionClasses(): int
      * Sets a integer flag that indicates how and when persistent collection
      * classes should be generated.
      *
-     * @psalm-param self::AUTOGENERATE_* $mode
+     * @param self::AUTOGENERATE_* $mode
      */
     public function setAutoGeneratePersistentCollectionClasses(int $mode): void
     {
@@ -414,7 +414,7 @@ public function getDefaultDB(): ?string
     }
 
     /**
-     * @psalm-param class-string<ClassMetadataFactoryInterface> $cmfName
+     * @param class-string<ClassMetadataFactoryInterface> $cmfName
      *
      * @throws MongoDBException If is not a ClassMetadataFactoryInterface.
      */
@@ -429,7 +429,7 @@ public function setClassMetadataFactoryName(string $cmfName): void
         $this->attributes['classMetadataFactoryName'] = $cmfName;
     }
 
-    /** @psalm-return class-string<ClassMetadataFactoryInterface> */
+    /** @return class-string<ClassMetadataFactoryInterface> */
     public function getClassMetadataFactoryName(): string
     {
         if (! isset($this->attributes['classMetadataFactoryName'])) {
@@ -439,7 +439,7 @@ public function getClassMetadataFactoryName(): string
         return $this->attributes['classMetadataFactoryName'];
     }
 
-    /** @psalm-return CommitOptions */
+    /** @phpstan-return CommitOptions */
     public function getDefaultCommitOptions(): array
     {
         if (! isset($this->attributes['defaultCommitOptions'])) {
@@ -449,7 +449,7 @@ public function getDefaultCommitOptions(): array
         return $this->attributes['defaultCommitOptions'];
     }
 
-    /** @psalm-param CommitOptions $defaultCommitOptions */
+    /** @phpstan-param CommitOptions $defaultCommitOptions */
     public function setDefaultCommitOptions(array $defaultCommitOptions): void
     {
         foreach (UnitOfWork::DEPRECATED_WRITE_OPTIONS as $deprecatedOption) {
@@ -470,7 +470,7 @@ public function setDefaultCommitOptions(array $defaultCommitOptions): void
      * Add a filter to the list of possible filters.
      *
      * @param array<string, mixed> $parameters
-     * @psalm-param class-string $className
+     * @param class-string         $className
      */
     public function addFilter(string $name, string $className, array $parameters = []): void
     {
@@ -480,7 +480,7 @@ public function addFilter(string $name, string $className, array $parameters = [
         ];
     }
 
-    /** @psalm-return class-string|null */
+    /** @return class-string|null */
     public function getFilterClassName(string $name): ?string
     {
         return isset($this->attributes['filters'][$name])
@@ -497,7 +497,7 @@ public function getFilterParameters(string $name): array
     }
 
     /**
-     * @psalm-param class-string<ObjectRepository<object>> $className
+     * @param class-string<ObjectRepository<object>> $className
      *
      * @throws MongoDBException If is not an ObjectRepository.
      */
@@ -512,14 +512,14 @@ public function setDefaultDocumentRepositoryClassName(string $className): void
         $this->attributes['defaultDocumentRepositoryClassName'] = $className;
     }
 
-    /** @psalm-return class-string<ObjectRepository<object>> */
+    /** @return class-string<ObjectRepository<object>> */
     public function getDefaultDocumentRepositoryClassName(): string
     {
         return $this->attributes['defaultDocumentRepositoryClassName'] ?? DocumentRepository::class;
     }
 
     /**
-     * @psalm-param class-string<GridFSRepository<object>> $className
+     * @param class-string<GridFSRepository<object>> $className
      *
      * @throws MongoDBException If the class does not implement the GridFSRepository interface.
      */
@@ -534,7 +534,7 @@ public function setDefaultGridFSRepositoryClassName(string $className): void
         $this->attributes['defaultGridFSRepositoryClassName'] = $className;
     }
 
-    /** @psalm-return class-string<GridFSRepository<object>> */
+    /** @return class-string<GridFSRepository<object>> */
     public function getDefaultGridFSRepositoryClassName(): string
     {
         return $this->attributes['defaultGridFSRepositoryClassName'] ?? DefaultGridFSRepository::class;
diff --git a/lib/Doctrine/ODM/MongoDB/DocumentManager.php b/lib/Doctrine/ODM/MongoDB/DocumentManager.php
index 706b23ed86..b8c40aea3b 100644
--- a/lib/Doctrine/ODM/MongoDB/DocumentManager.php
+++ b/lib/Doctrine/ODM/MongoDB/DocumentManager.php
@@ -49,8 +49,8 @@
  *     $config = new Configuration();
  *     $dm = DocumentManager::create(new Connection(), $config);
  *
- * @psalm-import-type CommitOptions from UnitOfWork
- * @psalm-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type CommitOptions from UnitOfWork
+ * @phpstan-import-type FieldMapping from ClassMetadata
  */
 class DocumentManager implements ObjectManager
 {
@@ -286,14 +286,11 @@ public function getClassNameResolver(): ClassNameResolver
     /**
      * Returns the metadata for a class.
      *
-     * @param string $className The class name.
-     * @psalm-param class-string<T> $className
+     * @param class-string<T> $className The class name.
      *
-     * @psalm-return ClassMetadata<T>
+     * @return ClassMetadata<T>
      *
      * @template T of object
-     *
-     * @psalm-suppress InvalidReturnType, InvalidReturnStatement see https://github.com/vimeo/psalm/issues/5788
      */
     public function getClassMetadata($className): ClassMetadata
     {
@@ -303,7 +300,7 @@ public function getClassMetadata($className): ClassMetadata
     /**
      * Returns the MongoDB instance for a class.
      *
-     * @psalm-param class-string $className
+     * @param class-string $className
      */
     public function getDocumentDatabase(string $className): Database
     {
@@ -553,11 +550,9 @@ public function unlock(object $document): void
     /**
      * Gets the repository for a document class.
      *
-     * @param string $className The name of the Document.
-     * @psalm-param class-string<T> $className
+     * @param class-string<T> $className The name of the Document.
      *
-     * @return DocumentRepository|GridFSRepository|ViewRepository  The repository.
-     * @psalm-return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>
+     * @return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>  The repository.
      *
      * @template T of object
      */
@@ -572,7 +567,7 @@ public function getRepository($className)
      * database.
      *
      * @param array $options Array of options to be used with batchInsert(), update() and remove()
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      *
      * @throws MongoDBException
      * @throws Throwable From event listeners.
@@ -591,19 +586,19 @@ public function flush(array $options = [])
      * has its identifier populated. Otherwise a proxy is returned that automatically
      * loads itself on first access.
      *
-     * @param mixed $identifier
-     * @psalm-param class-string<T> $documentName
+     * @param mixed           $identifier
+     * @param class-string<T> $documentName
      *
-     * @psalm-return T|(T&GhostObjectInterface<T>)
+     * @return T|(T&GhostObjectInterface<T>)
      *
      * @template T of object
      */
     public function getReference(string $documentName, $identifier): object
     {
-        /** @psalm-var ClassMetadata<T> $class */
+        /** @var ClassMetadata<T> $class */
         $class = $this->metadataFactory->getMetadataFor(ltrim($documentName, '\\'));
         assert($class instanceof ClassMetadata);
-        /** @psalm-var T|false $document */
+        /** @phpstan-var T|false $document */
         $document = $this->unitOfWork->tryGetById($identifier, $class);
 
         // Check identity map first, if its already in there just return it.
@@ -611,7 +606,7 @@ public function getReference(string $documentName, $identifier): object
             return $document;
         }
 
-        /** @psalm-var T&GhostObjectInterface<T> $document */
+        /** @var T&GhostObjectInterface<T> $document */
         $document = $this->proxyFactory->getProxy($class, $identifier);
         $this->unitOfWork->registerManaged($document, $identifier, []);
 
@@ -658,13 +653,12 @@ public function getPartialReference(string $documentName, $identifier): object
      *
      * This is just a convenient shortcut for getRepository($documentName)->find($id).
      *
-     * @param string $className
-     * @param mixed  $id
-     * @param int    $lockMode
-     * @param int    $lockVersion
-     * @psalm-param class-string<T> $className
+     * @param class-string<T> $className
+     * @param mixed           $id
+     * @param int             $lockMode
+     * @param int             $lockVersion
      *
-     * @psalm-return T|null
+     * @return T|null
      *
      * @template T of object
      */
@@ -672,7 +666,6 @@ public function find($className, $id, $lockMode = LockMode::NONE, $lockVersion =
     {
         $repository = $this->getRepository($className);
         if ($repository instanceof DocumentRepository) {
-            /** @psalm-var DocumentRepository<T> $repository */
             return $repository->find($id, $lockMode, $lockVersion);
         }
 
@@ -745,7 +738,7 @@ public function getConfiguration(): Configuration
     /**
      * Returns a reference to the supplied document.
      *
-     * @psalm-param FieldMapping $referenceMapping
+     * @phpstan-param FieldMapping $referenceMapping
      *
      * @return mixed The reference for the document in question, according to the desired mapping
      *
@@ -803,10 +796,9 @@ public function createReference(object $document, array $referenceMapping)
      *
      * @param array                 $referenceMapping Mappings of reference for which discriminator data is created.
      * @param ClassMetadata<object> $class            Metadata of reference document class.
-     * @psalm-param FieldMapping $referenceMapping
+     * @phpstan-param FieldMapping $referenceMapping
      *
-     * @return array with next structure [{discriminator field} => {discriminator value}]
-     * @psalm-return array<string, class-string>
+     * @return array<string, class-string> with next structure [{discriminator field} => {discriminator value}]
      *
      * @throws MappingException When discriminator map is present and reference class in not registered in it.
      */
@@ -892,7 +884,7 @@ public function getFilterCollection(): FilterCollection
      * @param FieldMapping              $mapping
      * @param array<string, mixed>|null $data
      *
-     * @psalm-return class-string
+     * @return class-string
      */
     public function getClassNameForAssociation(array $mapping, $data): string
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php b/lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php
index 8119097143..f90f2079ba 100644
--- a/lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php
+++ b/lib/Doctrine/ODM/MongoDB/Event/OnClassMetadataNotFoundEventArgs.php
@@ -18,7 +18,7 @@ final class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs
     /** @var ClassMetadata<object>|null */
     private ?ClassMetadata $foundMetadata = null;
 
-    /** @psalm-param class-string $className */
+    /** @param class-string $className */
     public function __construct(private string $className, DocumentManager $dm)
     {
         parent::__construct($dm);
@@ -39,7 +39,7 @@ public function getFoundMetadata(): ?ClassMetadata
     /**
      * Retrieve class name for which a failed metadata fetch attempt was executed
      *
-     * @psalm-return class-string
+     * @return class-string
      */
     public function getClassName(): string
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php b/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php
index f01dff1a56..a82a0fb1e5 100644
--- a/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php
+++ b/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php
@@ -15,11 +15,11 @@
 /**
  * Class that holds event arguments for a preUpdate event.
  *
- * @psalm-import-type ChangeSet from UnitOfWork
+ * @phpstan-import-type ChangeSet from UnitOfWork
  */
 final class PreUpdateEventArgs extends LifecycleEventArgs
 {
-    /** @psalm-param array<string, ChangeSet> $changeSet */
+    /** @param array<string, ChangeSet> $changeSet */
     public function __construct(
         object $document,
         DocumentManager $dm,
diff --git a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
index 52c1f3943e..2b91220d5a 100644
--- a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
@@ -37,7 +37,7 @@
  * The HydratorFactory class is responsible for instantiating a correct hydrator
  * type based on document's ClassMetadata
  *
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type Hints from UnitOfWork
  */
 final class HydratorFactory
 {
@@ -69,7 +69,7 @@ final class HydratorFactory
     /**
      * Array of instantiated document hydrators.
      *
-     * @psalm-var array<class-string, HydratorInterface>
+     * @var array<class-string, HydratorInterface>
      */
     private array $hydrators = [];
 
@@ -94,7 +94,7 @@ public function __construct(DocumentManager $dm, EventManager $evm, ?string $hyd
     /**
      * Gets the hydrator object for the given document class.
      *
-     * @psalm-param class-string $className
+     * @param class-string $className
      */
     public function getHydratorFor(string $className): HydratorInterface
     {
@@ -420,7 +420,7 @@ public function hydrate(object \$document, array \$data, array \$hints = []): ar
      * Hydrate array of MongoDB document data into the given document object.
      *
      * @param array<string, mixed> $data
-     * @psalm-param Hints $hints Any hints to account for during reconstitution/lookup of the document.
+     * @phpstan-param Hints $hints Any hints to account for during reconstitution/lookup of the document.
      *
      * @return array<string, mixed>
      */
diff --git a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorInterface.php b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorInterface.php
index 58fc21c07b..f804b783d5 100644
--- a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorInterface.php
+++ b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorInterface.php
@@ -9,7 +9,7 @@
 /**
  * The HydratorInterface defines methods all hydrator need to implement
  *
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type Hints from UnitOfWork
  */
 interface HydratorInterface
 {
@@ -17,7 +17,7 @@ interface HydratorInterface
      * Hydrate array of MongoDB document data into the given document object.
      *
      * @param array<string, mixed> $data
-     * @psalm-param Hints $hints
+     * @phpstan-param Hints $hints
      *
      * @return array<string, mixed>
      */
diff --git a/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php b/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php
index 94f5f219f6..827b4cf4bf 100644
--- a/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php
+++ b/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php
@@ -17,7 +17,7 @@
  *
  * @internal
  *
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type Hints from UnitOfWork
  *
  * @template TDocument of object
  * @template-implements Iterator<TDocument>
@@ -30,7 +30,7 @@ final class HydratingIterator implements Iterator
     /**
      * @param Traversable<mixed, array<string, mixed>> $traversable
      * @param ClassMetadata<TDocument>                 $class
-     * @psalm-param Hints $unitOfWorkHints
+     * @phpstan-param Hints $unitOfWorkHints
      */
     public function __construct(Traversable $traversable, private UnitOfWork $unitOfWork, private ClassMetadata $class, private array $unitOfWorkHints = [])
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Iterator/Iterator.php b/lib/Doctrine/ODM/MongoDB/Iterator/Iterator.php
index 59561a2f68..bedeacd495 100644
--- a/lib/Doctrine/ODM/MongoDB/Iterator/Iterator.php
+++ b/lib/Doctrine/ODM/MongoDB/Iterator/Iterator.php
@@ -10,6 +10,6 @@
  */
 interface Iterator extends \Iterator
 {
-    /** @psalm-return array<mixed, TValue> */
+    /** @return array<mixed, TValue> */
     public function toArray(): array;
 }
diff --git a/lib/Doctrine/ODM/MongoDB/Iterator/PrimingIterator.php b/lib/Doctrine/ODM/MongoDB/Iterator/PrimingIterator.php
index 43c21f2787..86c4920b83 100644
--- a/lib/Doctrine/ODM/MongoDB/Iterator/PrimingIterator.php
+++ b/lib/Doctrine/ODM/MongoDB/Iterator/PrimingIterator.php
@@ -13,7 +13,7 @@
 use function iterator_to_array;
 
 /**
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type Hints from UnitOfWork
  * @template TValue
  * @template TDocument of object
  * @template-implements Iterator<TValue>
@@ -26,7 +26,7 @@ final class PrimingIterator implements Iterator
      * @param \Iterator<mixed, TValue>          $iterator
      * @param ClassMetadata<TDocument>          $class
      * @param array<string, callable|true|null> $primers
-     * @psalm-param Hints $unitOfWorkHints
+     * @phpstan-param Hints $unitOfWorkHints
      */
     public function __construct(private \Iterator $iterator, private ClassMetadata $class, private ReferencePrimer $referencePrimer, private array $primers, private array $unitOfWorkHints = [])
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/SearchIndex.php b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/SearchIndex.php
index cbf3ab52a7..cb5bc2a11f 100644
--- a/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/SearchIndex.php
+++ b/lib/Doctrine/ODM/MongoDB/Mapping/Annotations/SearchIndex.php
@@ -13,8 +13,8 @@
  *
  * @Annotation
  * @NamedArgumentConstructor
- * @psalm-import-type SearchIndexStoredSource from ClassMetadata
- * @psalm-import-type SearchIndexSynonym from ClassMetadata
+ * @phpstan-import-type SearchIndexStoredSource from ClassMetadata
+ * @phpstan-import-type SearchIndexSynonym from ClassMetadata
  */
 #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
 class SearchIndex implements Annotation
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
index 34c13622de..558ab6a860 100644
--- a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -65,7 +65,7 @@
  *    get the whole class name, namespace inclusive, prepended to every property in
  *    the serialized representation).
  *
- * @psalm-type FieldMappingConfig = array{
+ * @phpstan-type FieldMappingConfig array{
  *      type?: string,
  *      fieldName?: string,
  *      name?: string,
@@ -106,7 +106,7 @@
  *      background?: bool,
  *      enumType?: class-string<BackedEnum>,
  * }
- * @psalm-type FieldMapping = array{
+ * @phpstan-type FieldMapping array{
  *      type: string,
  *      fieldName: string,
  *      name: string,
@@ -152,7 +152,7 @@
  *      enumType?: class-string<BackedEnum>,
  *      storeEmptyArray?: bool,
  * }
- * @psalm-type AssociationFieldMapping = array{
+ * @phpstan-type AssociationFieldMapping array{
  *      type?: string,
  *      fieldName: string,
  *      name: string,
@@ -197,8 +197,8 @@
  *      alsoLoadFields?: list<string>,
  *      storeEmptyArray?: bool,
  * }
- * @psalm-type IndexKeys = array<string, mixed>
- * @psalm-type IndexOptions = array{
+ * @phpstan-type IndexKeys array<string, mixed>
+ * @phpstan-type IndexOptions array{
  *      background?: bool,
  *      bits?: int,
  *      default_language?: string,
@@ -214,21 +214,21 @@
  *      unique?: bool,
  *      weights?: array{string, int},
  * }
- * @psalm-type IndexMapping = array{
+ * @phpstan-type IndexMapping array{
  *      keys: IndexKeys,
  *      options: IndexOptions
  * }
- * @psalm-type SearchIndexStoredSourceInclude = array{include: list<string>}
- * @psalm-type SearchIndexStoredSourceExclude = array{exclude: list<string>}
- * @psalm-type SearchIndexStoredSource = bool|SearchIndexStoredSourceInclude|SearchIndexStoredSourceExclude
- * @psalm-type SearchIndexSynonym = array{
+ * @phpstan-type SearchIndexStoredSourceInclude array{include: list<string>}
+ * @phpstan-type SearchIndexStoredSourceExclude array{exclude: list<string>}
+ * @phpstan-type SearchIndexStoredSource bool|SearchIndexStoredSourceInclude|SearchIndexStoredSourceExclude
+ * @phpstan-type SearchIndexSynonym array{
  *      analyzer: string,
  *      name: string,
  *      source: array{
  *          collection: string,
  *      },
  * }
- * @psalm-type SearchIndexDefinition = array{
+ * @phpstan-type SearchIndexDefinition array{
  *      mappings: array{
  *          dynamic?: bool,
  *          fields?: array,
@@ -239,13 +239,13 @@
  *      storedSource?: SearchIndexStoredSource,
  *      synonyms?: list<SearchIndexSynonym>,
  * }
- * @psalm-type SearchIndexMapping = array{
+ * @phpstan-type SearchIndexMapping array{
  *      name: string,
  *      definition: SearchIndexDefinition
  * }
- * @psalm-type ShardKeys = array<string, mixed>
- * @psalm-type ShardOptions = array<string, mixed>
- * @psalm-type ShardKey = array{
+ * @phpstan-type ShardKeys array<string, mixed>
+ * @phpstan-type ShardOptions array<string, mixed>
+ * @phpstan-type ShardKey array{
  *      keys?: ShardKeys,
  *      options?: ShardOptions
  * }
@@ -517,7 +517,7 @@
      * READ-ONLY: The array of indexes for the document collection.
      *
      * @var array<array<string, mixed>>
-     * @psalm-var array<IndexMapping>
+     * @phpstan-var array<IndexMapping>
      */
     public $indexes = [];
 
@@ -532,14 +532,14 @@
      * READ-ONLY: Keys and options describing shard key. Only for sharded collections.
      *
      * @var array<string, array>
-     * @psalm-var ShardKey
+     * @phpstan-var ShardKey
      */
     public $shardKey = [];
 
     /**
      * Allows users to specify a validation schema for the collection.
      *
-     * @psalm-var array<string, mixed>|object|null
+     * @phpstan-var array<string, mixed>|object|null
      */
     private array|object|null $validator = null;
 
@@ -556,8 +556,7 @@
     /**
      * READ-ONLY: The name of the document class.
      *
-     * @var string
-     * @psalm-var class-string<T>
+     * @var class-string<T>
      */
     public $name;
 
@@ -566,8 +565,7 @@
      * hierarchy. If the document is not part of a mapped inheritance hierarchy this is the same
      * as {@link $documentName}.
      *
-     * @var string
-     * @psalm-var class-string
+     * @var class-string
      */
     public $rootDocumentName;
 
@@ -575,24 +573,21 @@
      * The name of the custom repository class used for the document class.
      * (Optional).
      *
-     * @var string|null
-     * @psalm-var class-string|null
+     * @var class-string|null
      */
     public $customRepositoryClassName;
 
     /**
      * READ-ONLY: The names of the parent classes (ancestors).
      *
-     * @var array
-     * @psalm-var list<class-string>
+     * @var list<class-string>
      */
     public $parentClasses = [];
 
     /**
      * READ-ONLY: The names of all subclasses (descendants).
      *
-     * @var array
-     * @psalm-var list<class-string>
+     * @var list<class-string>
      */
     public $subClasses = [];
 
@@ -645,7 +640,7 @@
      * document can have the id attribute, forming a composite key.
      *
      * @var array<string, mixed>
-     * @psalm-var array<string, FieldMapping>
+     * @phpstan-var array<string, FieldMapping>
      */
     public $fieldMappings = [];
 
@@ -654,7 +649,7 @@
      * Keys are field names and values are mapping definitions.
      *
      * @var array<string, mixed>
-     * @psalm-var array<string, AssociationFieldMapping>
+     * @phpstan-var array<string, AssociationFieldMapping>
      */
     public $associationMappings = [];
 
@@ -680,8 +675,7 @@
      *
      * @see discriminatorField
      *
-     * @var string|null
-     * @psalm-var class-string|null
+     * @var class-string|null
      */
     public $discriminatorValue;
 
@@ -693,7 +687,7 @@
      *
      * @see discriminatorField
      *
-     * @psalm-var array<string, class-string>
+     * @var array<string, class-string>
      */
     public $discriminatorMap = [];
 
@@ -794,8 +788,7 @@
     /**
      * The ReflectionClass instance of the mapped class.
      *
-     * @var ReflectionClass
-     * @psalm-var ReflectionClass<T>
+     * @var ReflectionClass<T>
      */
     public $reflClass;
 
@@ -817,7 +810,7 @@
      * Initializes a new ClassMetadata instance that will hold the object-document mapping
      * metadata of the class with the given name.
      *
-     * @psalm-param class-string<T> $documentName
+     * @param class-string<T> $documentName
      */
     public function __construct(string $documentName)
     {
@@ -939,7 +932,7 @@ public function isInheritedField(string $fieldName): bool
     /**
      * Registers a custom repository class for the document class.
      *
-     * @psalm-param class-string|null $repositoryClassName
+     * @param class-string|null $repositoryClassName
      */
     public function setCustomRepositoryClass(?string $repositoryClassName): void
     {
@@ -1058,8 +1051,7 @@ public function setAlsoLoadMethods(array $methods): void
      * are only used to discern the hydration class and are not mapped to class
      * properties.
      *
-     * @param array<string, mixed>|string|null $discriminatorField
-     * @psalm-param array{name?: string, fieldName?: string}|string|null $discriminatorField
+     * @param array{name?: string, fieldName?: string}|string|null $discriminatorField
      *
      * @throws MappingException If the discriminator field conflicts with the
      *                          "name" attribute of a mapped field.
@@ -1175,8 +1167,8 @@ public function setDiscriminatorValue(string $value): void
      * Add a index for this Document.
      *
      * @param array<string, int|string> $keys
-     * @psalm-param IndexKeys $keys
-     * @psalm-param IndexOptions $options
+     * @phpstan-param IndexKeys $keys
+     * @phpstan-param IndexOptions $options
      */
     public function addIndex(array $keys, array $options = []): void
     {
@@ -1206,7 +1198,7 @@ public function addIndex(array $keys, array $options = []): void
     /**
      * Returns the array of indexes for this Document.
      *
-     * @psalm-return array<IndexMapping>
+     * @phpstan-return array<IndexMapping>
      */
     public function getIndexes(): array
     {
@@ -1224,7 +1216,7 @@ public function hasIndexes(): bool
     /**
      * Add a search index for this Document.
      *
-     * @psalm-param SearchIndexDefinition $definition
+     * @phpstan-param SearchIndexDefinition $definition
      */
     public function addSearchIndex(array $definition, ?string $name = null): void
     {
@@ -1237,7 +1229,7 @@ public function addSearchIndex(array $definition, ?string $name = null): void
     /**
      * Returns the array of search indexes for this Document.
      *
-     * @psalm-return list<SearchIndexMapping>
+     * @phpstan-return list<SearchIndexMapping>
      */
     public function getSearchIndexes(): array
     {
@@ -1257,8 +1249,8 @@ public function hasSearchIndexes(): bool
      *
      * @param array<string, string|int> $keys
      * @param array<string, mixed>      $options
-     * @psalm-param ShardKeys $keys
-     * @psalm-param ShardOptions      $options
+     * @phpstan-param ShardKeys $keys
+     * @phpstan-param ShardOptions      $options
      *
      * @throws MappingException
      */
@@ -1309,7 +1301,7 @@ public function setShardKey(array $keys, array $options = []): void
         ];
     }
 
-    /** @psalm-return ShardKey */
+    /** @phpstan-return ShardKey */
     public function getShardKey(): array
     {
         return $this->shardKey;
@@ -1323,19 +1315,13 @@ public function isSharded(): bool
         return $this->shardKey !== [];
     }
 
-    /**
-     * @return array|object|null
-     * @psalm-return array<string, mixed>|object|null
-     */
+    /** @return array<string, mixed>|object|null */
     public function getValidator()
     {
         return $this->validator;
     }
 
-    /**
-     * @param array|object|null $validator
-     * @psalm-param array<string, mixed>|object|null $validator
-     */
+    /** @param array<string, mixed>|object|null $validator */
     public function setValidator($validator): void
     {
         $this->validator = $validator;
@@ -1449,7 +1435,7 @@ public function getReflectionProperty(string $name): ReflectionProperty
         return $this->reflFields[$name];
     }
 
-    /** @psalm-return class-string<T> */
+    /** @return class-string<T> */
     public function getName(): string
     {
         return $this->name;
@@ -1482,8 +1468,7 @@ public function getCollection(): string
     /**
      * Sets the collection this Document is mapped to.
      *
-     * @param array|string $name
-     * @psalm-param array{name: string, capped?: bool, size?: int, max?: int}|string $name
+     * @param array{name: string, capped?: bool, size?: int, max?: int}|string $name
      *
      * @throws InvalidArgumentException
      */
@@ -1583,7 +1568,7 @@ public function isMappedToCollection(): bool
     /**
      * Validates the storage strategy of a mapping for consistency
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      *
      * @throws MappingException
      */
@@ -1639,7 +1624,7 @@ private function applyStorageStrategy(array &$mapping): void
     /**
      * Map a single embedded document.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      */
     public function mapOneEmbedded(array $mapping): void
     {
@@ -1652,7 +1637,7 @@ public function mapOneEmbedded(array $mapping): void
     /**
      * Map a collection of embedded documents.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      */
     public function mapManyEmbedded(array $mapping): void
     {
@@ -1665,7 +1650,7 @@ public function mapManyEmbedded(array $mapping): void
     /**
      * Map a single document reference.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      */
     public function mapOneReference(array $mapping): void
     {
@@ -1678,7 +1663,7 @@ public function mapOneReference(array $mapping): void
     /**
      * Map a collection of document references.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      */
     public function mapManyReference(array $mapping): void
     {
@@ -1694,7 +1679,7 @@ public function mapManyReference(array $mapping): void
      *
      * @internal
      *
-     * @psalm-param FieldMapping $fieldMapping
+     * @phpstan-param FieldMapping $fieldMapping
      */
     public function addInheritedFieldMapping(array $fieldMapping): void
     {
@@ -1713,7 +1698,7 @@ public function addInheritedFieldMapping(array $fieldMapping): void
      *
      * @internal
      *
-     * @psalm-param AssociationFieldMapping $mapping
+     * @phpstan-param AssociationFieldMapping $mapping
      *
      * @throws MappingException
      */
@@ -1924,7 +1909,7 @@ public function getFieldValue(object $document, string $field)
     /**
      * Gets the mapping of a field.
      *
-     * @psalm-return FieldMapping
+     * @phpstan-return FieldMapping
      *
      * @throws MappingException If the $fieldName is not found in the fieldMappings array.
      */
@@ -1940,7 +1925,7 @@ public function getFieldMapping(string $fieldName): array
     /**
      * Gets mappings of fields holding embedded document(s).
      *
-     * @psalm-return array<string, AssociationFieldMapping>
+     * @return array<string, AssociationFieldMapping>
      */
     public function getEmbeddedFieldsMappings(): array
     {
@@ -1954,7 +1939,7 @@ public function getEmbeddedFieldsMappings(): array
      * Gets the field mapping by its DB name.
      * E.g. it returns identifier's mapping when called with _id.
      *
-     * @psalm-return FieldMapping
+     * @phpstan-return FieldMapping
      *
      * @throws MappingException
      */
@@ -2029,8 +2014,7 @@ public function isInheritanceTypeCollectionPerClass(): bool
     /**
      * Sets the mapped subclasses of this class.
      *
-     * @param string[] $subclasses The names of all mapped subclasses.
-     * @psalm-param class-string[] $subclasses
+     * @param class-string[] $subclasses The names of all mapped subclasses.
      */
     public function setSubclasses(array $subclasses): void
     {
@@ -2044,8 +2028,7 @@ public function setSubclasses(array $subclasses): void
      * Assumes that the class names in the passed array are in the order:
      * directParent -> directParentParent -> directParentParentParent ... -> root.
      *
-     * @param string[] $classNames
-     * @psalm-param list<class-string> $classNames
+     * @param list<class-string> $classNames
      */
     public function setParentClasses(array $classNames): void
     {
@@ -2094,7 +2077,7 @@ public function isIdGeneratorNone(): bool
      * Sets the version field mapping used for versioning. Sets the default
      * value to use depending on the column type.
      *
-     * @psalm-param FieldMapping $mapping
+     * @phpstan-param FieldMapping $mapping
      *
      * @throws LockException
      */
@@ -2129,7 +2112,7 @@ public function setVersionField(?string $versionField): void
      * Sets the version field mapping used for versioning. Sets the default
      * value to use depending on the column type.
      *
-     * @psalm-param FieldMapping $mapping
+     * @phpstan-param FieldMapping $mapping
      *
      * @throws LockException
      */
@@ -2178,7 +2161,7 @@ public function isView(): bool
         return $this->isView;
     }
 
-    /** @psalm-param class-string $rootClass */
+    /** @param class-string $rootClass */
     public function markViewOf(string $rootClass): void
     {
         $this->isView    = true;
@@ -2205,7 +2188,7 @@ public function getTypeOfField($fieldName): ?string
     /**
      * @param string $assocName
      *
-     * @psalm-return class-string|null
+     * @return class-string|null
      */
     public function getAssociationTargetClass($assocName): ?string
     {
@@ -2219,7 +2202,7 @@ public function getAssociationTargetClass($assocName): ?string
     /**
      * Retrieve the collectionClass associated with an association
      *
-     * @psalm-return class-string
+     * @return class-string
      */
     public function getAssociationCollectionClass(string $assocName): string
     {
@@ -2249,9 +2232,9 @@ public function getAssociationMappedByTargetField($assocName)
     /**
      * Map a field.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      *
-     * @psalm-return FieldMapping
+     * @phpstan-return FieldMapping
      *
      * @throws MappingException
      */
@@ -2640,11 +2623,11 @@ public function __wakeup()
     /**
      * Creates a new instance of the mapped class, without invoking the constructor.
      *
-     * @psalm-return T
+     * @phpstan-return T
      */
     public function newInstance(): object
     {
-        /** @psalm-var T */
+        /** @phpstan-var T */
         return $this->instantiator->instantiate($this->name);
     }
 
@@ -2653,7 +2636,7 @@ private function isAllowedGridFSField(string $name): bool
         return in_array($name, self::ALLOWED_GRIDFS_FIELDS, true);
     }
 
-    /** @psalm-param FieldMapping $mapping */
+    /** @phpstan-param FieldMapping $mapping */
     private function typeRequirementsAreMet(array $mapping): void
     {
         if ($mapping['type'] === Type::DECIMAL128 && ! extension_loaded('bcmath')) {
@@ -2661,7 +2644,7 @@ private function typeRequirementsAreMet(array $mapping): void
         }
     }
 
-    /** @psalm-param FieldMapping $mapping */
+    /** @phpstan-param FieldMapping $mapping */
     private function checkDuplicateMapping(array $mapping): void
     {
         if ($mapping['notSaved'] ?? false) {
@@ -2697,7 +2680,7 @@ private function isTypedProperty(string $name): bool
     /**
      * Validates & completes the given field mapping based on typed property.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      *
      * @return FieldMappingConfig
      */
@@ -2751,7 +2734,7 @@ private function validateAndCompleteTypedFieldMapping(array $mapping): array
     /**
      * Validates & completes the basic mapping information based on typed property.
      *
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      *
      * @return FieldMappingConfig
      */
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
index 64f32867ca..9035101f90 100644
--- a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
+++ b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
@@ -42,7 +42,7 @@
 /**
  * XmlDriver is a metadata driver that enables mapping through XML files.
  *
- * @psalm-import-type FieldMappingConfig from ClassMetadata
+ * @phpstan-import-type FieldMappingConfig from ClassMetadata
  * @template-extends FileDriver<SimpleXMLElement>
  */
 class XmlDriver extends FileDriver
@@ -346,7 +346,7 @@ public function loadMetadataForClass($className, \Doctrine\Persistence\Mapping\C
 
     /**
      * @param ClassMetadata<object> $class
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      */
     private function addFieldMapping(ClassMetadata $class, array $mapping): void
     {
@@ -800,7 +800,7 @@ private function setShardKey(ClassMetadata $class, SimpleXMLElement $xmlShardkey
      *
      * list($readPreference, $tags) = $this->transformReadPreference($xml->{read-preference});
      *
-     * @psalm-return array{string, array<int, array<string, string>>|null}
+     * @return array{string, array<int, array<string, string>>|null}
      */
     private function transformReadPreference(SimpleXMLElement $xmlReadPreference): array
     {
diff --git a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionFactory.php b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionFactory.php
index 39b163132e..6728597880 100644
--- a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionFactory.php
@@ -11,17 +11,17 @@
 /**
  * Interface for persistent collection classes factory.
  *
- * @psalm-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type FieldMapping from ClassMetadata
  */
 interface PersistentCollectionFactory
 {
     /**
      * Creates specified persistent collection to work with given collection class.
      *
-     * @psalm-param FieldMapping $mapping
-     * @psalm-param BaseCollection<array-key, object>|null $coll
+     * @param BaseCollection<array-key, object>|null $coll
+     * @phpstan-param FieldMapping $mapping
      *
-     * @psalm-return PersistentCollectionInterface<array-key, object>
+     * @return PersistentCollectionInterface<array-key, object>
      */
     public function create(DocumentManager $dm, array $mapping, ?BaseCollection $coll = null): PersistentCollectionInterface;
 }
diff --git a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionInterface.php b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionInterface.php
index e7012cbfd1..c71b5d17b7 100644
--- a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionInterface.php
+++ b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionInterface.php
@@ -15,8 +15,8 @@
  *
  * @internal
  *
- * @psalm-import-type FieldMapping from \Doctrine\ODM\MongoDB\Mapping\ClassMetadata
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type FieldMapping from \Doctrine\ODM\MongoDB\Mapping\ClassMetadata
+ * @phpstan-import-type Hints from UnitOfWork
  *
  * @template TKey of array-key
  * @template T of object
@@ -92,7 +92,7 @@ public function setDirty($dirty);
      * Sets the collection's owning document together with the AssociationMapping that
      * describes the association between the owner and the elements of the collection.
      *
-     * @psalm-param FieldMapping $mapping
+     * @phpstan-param FieldMapping $mapping
      *
      * @return void
      */
@@ -150,13 +150,13 @@ public function getOwner(): ?object;
 
     /**
      * @return array
-     * @psalm-return FieldMapping
+     * @phpstan-return FieldMapping
      */
     public function getMapping();
 
     /**
      * @return ClassMetadata
-     * @psalm-return ClassMetadata<T>
+     * @phpstan-return ClassMetadata<T>
      *
      * @throws MongoDBException
      */
diff --git a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
index 1ccb2aab0f..79dae29566 100644
--- a/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
+++ b/lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
@@ -28,8 +28,8 @@
 /**
  * Trait with methods needed to implement PersistentCollectionInterface.
  *
- * @psalm-import-type Hints from UnitOfWork
- * @psalm-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type Hints from UnitOfWork
+ * @phpstan-import-type FieldMapping from ClassMetadata
  * @template TKey of array-key
  * @template T of object
  */
@@ -50,7 +50,7 @@ trait PersistentCollectionTrait
 
     /**
      * @var array<string, mixed>|null
-     * @psalm-var FieldMapping|null
+     * @phpstan-var FieldMapping|null
      */
     private ?array $mapping = null;
 
@@ -93,7 +93,7 @@ trait PersistentCollectionTrait
      * Any hints to account for during reconstitution/lookup of the documents.
      *
      * @var array<int, mixed>
-     * @psalm-var Hints
+     * @phpstan-var Hints
      */
     private array $hints = [];
 
@@ -129,7 +129,7 @@ public function initialize()
             return;
         }
 
-        /** @psalm-var array<TKey, T> $newObjects */
+        /** @var array<TKey, T> $newObjects */
         $newObjects = [];
 
         if ($this->isDirty) {
@@ -363,7 +363,7 @@ public function exists(Closure $p)
     }
 
     /**
-     * @psalm-return (TMaybeContained is T ? TKey|false : false)
+     * @phpstan-return (TMaybeContained is T ? TKey|false : false)
      *
      * @template TMaybeContained
      */
@@ -422,7 +422,7 @@ public function isEmpty()
 
     /**
      * @return Traversable
-     * @psalm-return Traversable<TKey, T>
+     * @phpstan-return Traversable<TKey, T>
      */
     #[ReturnTypeWillChange]
     public function getIterator()
@@ -535,7 +535,7 @@ public function offsetExists($offset)
      * @param mixed $offset
      *
      * @return mixed
-     * @psalm-return T|null
+     * @phpstan-return T|null
      */
     #[ReturnTypeWillChange]
     public function offsetGet($offset)
@@ -656,7 +656,7 @@ private function doAdd($value, $arrayAccess)
      * @param mixed $offset
      *
      * @return bool|T|null
-     * @psalm-return (
+     * @phpstan-return (
      *      $arrayAccess is false
      *      ? T|null
      *      : T|true|null
@@ -728,9 +728,9 @@ private function needsSchedulingForSynchronization(): bool
     }
 
     /**
-     * @psalm-param Closure(TKey, T):bool $p
+     * @phpstan-param Closure(TKey, T):bool $p
      *
-     * @psalm-return T|null
+     * @phpstan-return T|null
      */
     public function findFirst(Closure $p)
     {
@@ -742,13 +742,13 @@ public function findFirst(Closure $p)
     }
 
     /**
-     * @psalm-param Closure(TReturn|TInitial|null, T):(TInitial|TReturn) $func
-     * @psalm-param TInitial|null $initial
+     * @phpstan-param Closure(TReturn|TInitial|null, T):(TInitial|TReturn) $func
+     * @phpstan-param TInitial|null $initial
      *
-     * @psalm-return TReturn|TInitial|null
+     * @phpstan-return TReturn|TInitial|null
      *
-     * @psalm-template TReturn
-     * @psalm-template TInitial
+     * @phpstan-template TReturn
+     * @phpstan-template TInitial
      */
     public function reduce(Closure $func, $initial = null)
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
index 780c0c6004..e2ddfcca7d 100644
--- a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
+++ b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -74,7 +74,7 @@
  *
  * @template T of object
  *
- * @psalm-type CommitOptions array{
+ * @phpstan-type CommitOptions array{
  *      fsync?: bool,
  *      safe?: int,
  *      session?: ?Session,
@@ -82,10 +82,10 @@
  *      withTransaction?: bool,
  *      writeConcern?: WriteConcern
  * }
- * @psalm-import-type Hints from UnitOfWork
- * @psalm-import-type FieldMapping from ClassMetadata
- * @psalm-import-type SortMeta from Sort
- * @psalm-import-type SortShape from Sort
+ * @phpstan-import-type Hints from UnitOfWork
+ * @phpstan-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type SortMeta from Sort
+ * @phpstan-import-type SortShape from Sort
  */
 final class DocumentPersister
 {
@@ -111,7 +111,7 @@ final class DocumentPersister
 
     private CollectionPersister $cp;
 
-    /** @psalm-param ClassMetadata<T> $class */
+    /** @phpstan-param ClassMetadata<T> $class */
     public function __construct(
         private PersistenceBuilder $pb,
         private DocumentManager $dm,
@@ -193,7 +193,7 @@ public function getClassMetadata(): ClassMetadata
      *
      * If no inserts are queued, invoking this method is a NOOP.
      *
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      *
      * @throws DriverException
      */
@@ -252,7 +252,7 @@ public function executeInserts(array $options = []): void
      *
      * If no upserts are queued, invoking this method is a NOOP.
      *
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      */
     public function executeUpserts(array $options = []): void
     {
@@ -351,7 +351,7 @@ private function executeUpsert(object $document, array $options): void
     /**
      * Updates the already persisted document if it has any new changesets.
      *
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      *
      * @throws LockException
      */
@@ -416,7 +416,7 @@ public function update(object $document, array $options = []): void
     /**
      * Removes document from mongo
      *
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      *
      * @throws LockException
      */
@@ -471,11 +471,11 @@ public function refresh(object $document): void
      *
      * @param array<string, mixed>|scalar|ObjectId|null            $criteria Query criteria
      * @param array<string, int|string|array<string, string>>|null $sort
-     * @psalm-param SortShape|null $sort
-     * @psalm-param Hints $hints
-     * @psalm-param T|null $document
+     * @param T|null                                               $document
+     * @phpstan-param SortShape|null $sort
+     * @phpstan-param Hints $hints
      *
-     * @psalm-return T|null
+     * @return T|null
      *
      * @throws LockException
      *
@@ -638,11 +638,11 @@ public function unlock(object $document): void
      * @param array<string, mixed> $result   The query result.
      * @param object|null          $document The document object to fill, if any.
      * @param array                $hints    Hints for document creation.
-     * @psalm-param Hints $hints
-     * @psalm-param T|null $document
+     * @phpstan-param Hints $hints
+     * @phpstan-param T|null $document
      *
      * @return object The filled and managed document object.
-     * @psalm-return T
+     * @phpstan-return T
      */
     private function createDocument(array $result, ?object $document = null, array $hints = []): object
     {
@@ -947,9 +947,9 @@ private function getSortDirection($sort)
      * names and changing direction strings to int.
      *
      * @param array<string, int|string|array<string, string>> $fields
-     * @psalm-param SortShape $fields
+     * @phpstan-param SortShape $fields
      *
-     * @psalm-return array<string, -1|1|SortMeta>
+     * @phpstan-return array<string, -1|1|SortMeta>
      */
     public function prepareSort(array $fields): array
     {
@@ -1458,7 +1458,7 @@ private function hasQueryOperators($value): bool
     /**
      * Returns the list of discriminator values for the given ClassMetadata
      *
-     * @psalm-return list<class-string|null>
+     * @return list<class-string|null>
      */
     private function getClassDiscriminatorValues(ClassMetadata $metadata): array
     {
@@ -1561,9 +1561,9 @@ private function getQueryForDocument(object $document): array
     }
 
     /**
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      *
-     * @psalm-return CommitOptions
+     * @phpstan-return CommitOptions
      */
     private function getWriteOptions(array $options = []): array
     {
@@ -1605,9 +1605,9 @@ private function isInTransaction(array $options): bool
     }
 
     /**
-     * @psalm-param FieldMapping $mapping
+     * @phpstan-param FieldMapping $mapping
      *
-     * @psalm-return array<array{
+     * @phpstan-return array<array{
      *     string,
      *     string|ObjectId|array<string, mixed>
      * }>
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php b/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
index 6ceaae37d8..80c257d66c 100644
--- a/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
+++ b/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
@@ -26,7 +26,7 @@
  *
  * @internal
  *
- * @psalm-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type FieldMapping from ClassMetadata
  */
 final class PersistenceBuilder
 {
@@ -322,7 +322,7 @@ public function prepareUpsertData($document)
      * simple reference, null may be returned.
      *
      * @param object $document
-     * @psalm-param FieldMapping $referenceMapping
+     * @phpstan-param FieldMapping $referenceMapping
      *
      * @return array<string, mixed>|null
      */
@@ -347,7 +347,7 @@ public function prepareReferencedDocumentValue(array $referenceMapping, $documen
      *
      * @param object $embeddedDocument
      * @param bool   $includeNestedCollections
-     * @psalm-param FieldMapping  $embeddedMapping
+     * @phpstan-param FieldMapping  $embeddedMapping
      *
      * @return array<string, mixed>|object
      *
@@ -462,7 +462,7 @@ public function prepareEmbeddedDocumentValue(array $embeddedMapping, $embeddedDo
      *
      * @param object $document
      * @param bool   $includeNestedCollections
-     * @psalm-param FieldMapping  $mapping
+     * @phpstan-param FieldMapping  $mapping
      *
      * @return mixed[]|object|null
      *
diff --git a/lib/Doctrine/ODM/MongoDB/Proxy/Factory/ProxyFactory.php b/lib/Doctrine/ODM/MongoDB/Proxy/Factory/ProxyFactory.php
index 35b292281e..1540e40e9e 100644
--- a/lib/Doctrine/ODM/MongoDB/Proxy/Factory/ProxyFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/Proxy/Factory/ProxyFactory.php
@@ -17,9 +17,9 @@ public function generateProxyClasses(array $classes): int;
      * the given identifier.
      *
      * @param mixed $identifier
-     * @psalm-param ClassMetadata<T> $metadata
+     * @phpstan-param ClassMetadata<T> $metadata
      *
-     * @psalm-return T&GhostObjectInterface<T>
+     * @return T&GhostObjectInterface<T>
      *
      * @template T of object
      */
diff --git a/lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php b/lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php
index 737795fe48..13fd4bd3ea 100644
--- a/lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php
@@ -38,9 +38,9 @@ public function __construct(DocumentManager $documentManager)
 
     /**
      * @param mixed $identifier
-     * @psalm-param ClassMetadata<T> $metadata
+     * @phpstan-param ClassMetadata<T> $metadata
      *
-     * @psalm-return T&GhostObjectInterface<T>
+     * @return T&GhostObjectInterface<T>
      *
      * @template T of object
      */
@@ -86,7 +86,7 @@ public function generateProxyClasses(array $classes): int
      * @param ClassMetadata<TDocument>     $metadata
      * @param DocumentPersister<TDocument> $documentPersister
      *
-     * @psalm-return Closure(
+     * @phpstan-return Closure(
      *   TDocument&GhostObjectInterface<TDocument>=,
      *   string=,
      *   array<string, mixed>=,
diff --git a/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ClassNameResolver.php b/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ClassNameResolver.php
index 36ffaafc59..f869de0eb5 100644
--- a/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ClassNameResolver.php
+++ b/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ClassNameResolver.php
@@ -10,7 +10,7 @@ interface ClassNameResolver
     /**
      * Gets the real class name of a class name that could be a proxy.
      *
-     * @psalm-param class-string $class
+     * @param class-string $class
      */
     public function getRealClass(string $class): string;
 }
diff --git a/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ProxyManagerClassNameResolver.php b/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ProxyManagerClassNameResolver.php
index c281cfc120..08c9f704fe 100644
--- a/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ProxyManagerClassNameResolver.php
+++ b/lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ProxyManagerClassNameResolver.php
@@ -22,11 +22,11 @@ public function getRealClass(string $class): string
     }
 
     /**
-     * @psalm-param class-string<RealClassName>|class-string<ProxyInterface<RealClassName>> $className
+     * @param class-string<RealClassName>|class-string<ProxyInterface<RealClassName>> $className
      *
-     * @psalm-return class-string<RealClassName>
+     * @return class-string<RealClassName>
      *
-     * @psalm-template RealClassName of object
+     * @phpstan-template RealClassName of object
      */
     public function resolveClassName(string $className): string
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Query/Builder.php b/lib/Doctrine/ODM/MongoDB/Query/Builder.php
index 7e249a5a92..7be346ea88 100644
--- a/lib/Doctrine/ODM/MongoDB/Query/Builder.php
+++ b/lib/Doctrine/ODM/MongoDB/Query/Builder.php
@@ -30,8 +30,8 @@
 /**
  * Query builder for ODM.
  *
- * @psalm-import-type QueryShape from Query
- * @psalm-import-type SortMetaKeywords from Sort
+ * @phpstan-import-type QueryShape from Query
+ * @phpstan-import-type SortMetaKeywords from Sort
  */
 class Builder
 {
@@ -85,7 +85,7 @@ class Builder
     /**
      * Array containing the query data.
      *
-     * @psalm-var QueryShape
+     * @phpstan-var QueryShape
      */
     private array $query = ['type' => Query::TYPE_FIND];
 
@@ -1488,7 +1488,7 @@ public function sort($fieldName, $order = 1): self
      *
      * @see https://docs.mongodb.com/manual/reference/operator/projection/meta/#sort
      *
-     * @psalm-param SortMetaKeywords $metaDataKeyword
+     * @phpstan-param SortMetaKeywords $metaDataKeyword
      */
     public function sortMeta(string $fieldName, string $metaDataKeyword): self
     {
@@ -1596,7 +1596,7 @@ public function where($javascript): self
     /**
      * Get Discriminator Values
      *
-     * @psalm-param class-string[] $classNames
+     * @param class-string[] $classNames
      *
      * @return array<string|null>
      *
@@ -1620,10 +1620,7 @@ private function getDiscriminatorValues(array $classNames): array
         return $discriminatorValues;
     }
 
-    /**
-     * @param string[]|string|null $documentName an array of document names or just one.
-     * @psalm-param class-string[]|class-string|null $documentName
-     */
+    /** @param class-string[]|class-string|null $documentName an array of document names or just one. */
     private function setDocumentName($documentName): void
     {
         if (is_array($documentName)) {
diff --git a/lib/Doctrine/ODM/MongoDB/Query/Expr.php b/lib/Doctrine/ODM/MongoDB/Query/Expr.php
index ca96ca4fe5..f2e6bbb3e3 100644
--- a/lib/Doctrine/ODM/MongoDB/Query/Expr.php
+++ b/lib/Doctrine/ODM/MongoDB/Query/Expr.php
@@ -34,7 +34,7 @@
 /**
  * Query expression builder for ODM.
  *
- * @psalm-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type FieldMapping from ClassMetadata
  */
 class Expr
 {
diff --git a/lib/Doctrine/ODM/MongoDB/Query/Query.php b/lib/Doctrine/ODM/MongoDB/Query/Query.php
index 267fb1134b..bf3372bb60 100644
--- a/lib/Doctrine/ODM/MongoDB/Query/Query.php
+++ b/lib/Doctrine/ODM/MongoDB/Query/Query.php
@@ -43,7 +43,7 @@
  * ODM Query wraps the raw Doctrine MongoDB queries to add additional functionality
  * and to hydrate the raw arrays of data to Doctrine document objects.
  *
- * @psalm-type QueryShape = array{
+ * @phpstan-type QueryShape array{
  *     distinct?: string,
  *     hint?: string|array<string, -1|1>,
  *     limit?: int,
@@ -60,8 +60,8 @@
  *     type: Query::TYPE_*,
  *     upsert?: bool,
  * }
- * @psalm-import-type Hints from UnitOfWork
- * @psalm-import-type SortMeta from Sort
+ * @phpstan-import-type Hints from UnitOfWork
+ * @phpstan-import-type SortMeta from Sort
  */
 final class Query implements IteratorAggregate
 {
@@ -106,7 +106,7 @@ final class Query implements IteratorAggregate
     /**
      * Hints for UnitOfWork behavior.
      *
-     * @psalm-var Hints
+     * @phpstan-var Hints
      */
     private array $unitOfWorkHints = [];
 
@@ -118,7 +118,7 @@ final class Query implements IteratorAggregate
     /**
      * Query structure generated by the Builder class.
      *
-     * @psalm-var QueryShape
+     * @phpstan-var QueryShape
      */
     private array $query;
 
diff --git a/lib/Doctrine/ODM/MongoDB/Query/QueryExpressionVisitor.php b/lib/Doctrine/ODM/MongoDB/Query/QueryExpressionVisitor.php
index 599ebb0ba2..83ff341825 100644
--- a/lib/Doctrine/ODM/MongoDB/Query/QueryExpressionVisitor.php
+++ b/lib/Doctrine/ODM/MongoDB/Query/QueryExpressionVisitor.php
@@ -38,7 +38,7 @@ final class QueryExpressionVisitor extends ExpressionVisitor
     /**
      * Map Criteria API composite types to query builder methods
      *
-     * @psalm-var array<CompositeExpression::TYPE_*, string>
+     * @var array<CompositeExpression::TYPE_*, string>
      */
     private static array $compositeMethods = [
         CompositeExpression::TYPE_AND => 'addAnd',
diff --git a/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php b/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php
index ab39bff8ac..ff3478cf8a 100644
--- a/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php
+++ b/lib/Doctrine/ODM/MongoDB/Query/ReferencePrimer.php
@@ -37,8 +37,8 @@
  *
  * @internal
  *
- * @psalm-import-type FieldMapping from ClassMetadata
- * @psalm-import-type Hints from UnitOfWork
+ * @phpstan-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type Hints from UnitOfWork
  */
 final class ReferencePrimer
 {
@@ -70,7 +70,7 @@ public function __construct(DocumentManager $dm, UnitOfWork $uow)
      * @param string                            $fieldName Field name containing references to prime
      * @param array                             $hints     UnitOfWork hints for priming queries
      * @param callable|null                     $primer    Optional primer callable
-     * @psalm-param Hints $hints
+     * @phpstan-param Hints $hints
      *
      * @throws InvalidArgumentException If the mapped field is not the owning
      *                                   side of a reference relationship.
@@ -121,7 +121,7 @@ public function primeReferences(ClassMetadata $class, $documents, string $fieldN
             }
         }
 
-        /** @psalm-var class-string $className */
+        /** @var class-string $className */
         foreach ($groupedIds as $className => $ids) {
             $refClass = $this->dm->getClassMetadata($className);
             call_user_func($primer, $this->dm, $refClass, array_values($ids), $hints);
@@ -216,7 +216,7 @@ private function parseDotSyntaxForPrimer(string $fieldName, ClassMetadata $class
      * infer the class of the referenced documents.
      *
      * @param PersistentCollectionInterface<array-key, object> $persistentCollection
-     * @psalm-param array<class-string, array<string, mixed>> $groupedIds
+     * @param array<class-string, array<string, mixed>>        $groupedIds
      */
     private function addManyReferences(PersistentCollectionInterface $persistentCollection, array &$groupedIds): void
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Repository/AbstractRepositoryFactory.php b/lib/Doctrine/ODM/MongoDB/Repository/AbstractRepositoryFactory.php
index 065ba26356..9d500dcd75 100644
--- a/lib/Doctrine/ODM/MongoDB/Repository/AbstractRepositoryFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/Repository/AbstractRepositoryFactory.php
@@ -26,9 +26,9 @@ abstract class AbstractRepositoryFactory implements RepositoryFactory
     private array $repositoryList = [];
 
     /**
-     * @psalm-param class-string<T> $documentName
+     * @param class-string<T> $documentName
      *
-     * @psalm-return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>
+     * @phpstan-return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>
      *
      * @template T of object
      */
@@ -51,10 +51,10 @@ public function getRepository(DocumentManager $documentManager, string $document
     /**
      * Create a new repository instance for a document class.
      *
-     * @psalm-param class-string<T> $documentName
+     * @param class-string<T> $documentName
      *
      * @return DocumentRepository|GridFSRepository|ViewRepository
-     * @psalm-return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>
+     * @phpstan-return DocumentRepository<T>|GridFSRepository<T>|ViewRepository<T>
      *
      * @template T of object
      */
@@ -104,7 +104,7 @@ protected function createRepository(DocumentManager $documentManager, string $do
      * Instantiates requested repository.
      *
      * @param ClassMetadata<T> $metadata
-     * @psalm-param class-string<T> $repositoryClassName
+     * @param class-string<T>  $repositoryClassName
      *
      * @return ObjectRepository<T>
      *
diff --git a/lib/Doctrine/ODM/MongoDB/Repository/DefaultGridFSRepository.php b/lib/Doctrine/ODM/MongoDB/Repository/DefaultGridFSRepository.php
index 586c56ab16..030fb112f8 100644
--- a/lib/Doctrine/ODM/MongoDB/Repository/DefaultGridFSRepository.php
+++ b/lib/Doctrine/ODM/MongoDB/Repository/DefaultGridFSRepository.php
@@ -86,7 +86,7 @@ private function getDocumentBucket(): Bucket
     }
 
     /**
-     * @psalm-return array{
+     * @return array{
      *     _id?: mixed,
      *     chunkSizeBytes?: int,
      *     metadata?: object
diff --git a/lib/Doctrine/ODM/MongoDB/Repository/DocumentRepository.php b/lib/Doctrine/ODM/MongoDB/Repository/DocumentRepository.php
index 93cf4e453d..7fcc37429b 100644
--- a/lib/Doctrine/ODM/MongoDB/Repository/DocumentRepository.php
+++ b/lib/Doctrine/ODM/MongoDB/Repository/DocumentRepository.php
@@ -38,10 +38,7 @@
  */
 class DocumentRepository implements ObjectRepository, Selectable
 {
-    /**
-     * @var string
-     * @psalm-var class-string<T>
-     */
+    /** @var class-string<T> */
     protected $documentName;
 
     /** @var DocumentManager */
@@ -50,10 +47,7 @@ class DocumentRepository implements ObjectRepository, Selectable
     /** @var UnitOfWork */
     protected $uow;
 
-    /**
-     * @var ClassMetadata
-     * @psalm-var ClassMetadata<T>
-     */
+    /** @var ClassMetadata<T> */
     protected $class;
 
     /**
@@ -62,7 +56,7 @@ class DocumentRepository implements ObjectRepository, Selectable
      * @param DocumentManager $dm            The DocumentManager to use.
      * @param UnitOfWork      $uow           The UnitOfWork to use.
      * @param ClassMetadata   $classMetadata The class metadata.
-     * @psalm-param ClassMetadata<T>   $classMetadata The class metadata.
+     * @phpstan-param ClassMetadata<T>   $classMetadata The class metadata.
      */
     public function __construct(DocumentManager $dm, UnitOfWork $uow, ClassMetadata $classMetadata)
     {
@@ -111,7 +105,7 @@ public function clear(): void
      *
      * @param mixed $id Identifier.
      *
-     * @psalm-return T|null
+     * @return T|null
      *
      * @throws MappingException
      * @throws LockException
@@ -190,15 +184,14 @@ public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $
      * @param array<string, mixed>|null $sort
      * @param array<string, mixed>      $criteria
      *
-     * @return object|null The object.
-     * @psalm-return T|null
+     * @return T|null The object.
      */
     public function findOneBy(array $criteria, ?array $sort = null): ?object
     {
         return $this->getDocumentPersister()->load($criteria, null, [], 0, $sort);
     }
 
-    /** @psalm-return class-string<T> */
+    /** @return class-string<T> */
     public function getDocumentName(): string
     {
         return $this->documentName;
@@ -209,13 +202,13 @@ public function getDocumentManager(): DocumentManager
         return $this->dm;
     }
 
-    /** @psalm-return ClassMetadata<T> */
+    /** @return ClassMetadata<T> */
     public function getClassMetadata(): ClassMetadata
     {
         return $this->class;
     }
 
-    /** @psalm-return class-string<T> */
+    /** @return class-string<T> */
     public function getClassName(): string
     {
         return $this->getDocumentName();
@@ -257,7 +250,7 @@ public function matching(Criteria $criteria): ArrayCollection
         return new ArrayCollection($iterator->toArray());
     }
 
-    /** @psalm-return DocumentPersister<T> */
+    /** @return DocumentPersister<T> */
     protected function getDocumentPersister(): DocumentPersister
     {
         return $this->uow->getDocumentPersister($this->documentName);
diff --git a/lib/Doctrine/ODM/MongoDB/Repository/RepositoryFactory.php b/lib/Doctrine/ODM/MongoDB/Repository/RepositoryFactory.php
index ee5e681ffa..24036aa77d 100644
--- a/lib/Doctrine/ODM/MongoDB/Repository/RepositoryFactory.php
+++ b/lib/Doctrine/ODM/MongoDB/Repository/RepositoryFactory.php
@@ -15,9 +15,9 @@ interface RepositoryFactory
     /**
      * Gets the repository for a document class.
      *
-     * @psalm-param class-string<T> $documentName
+     * @param class-string<T> $documentName
      *
-     * @psalm-return ObjectRepository<T>
+     * @return ObjectRepository<T>
      *
      * @template T of object
      */
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
index b142f1902e..63a7bd7c72 100644
--- a/lib/Doctrine/ODM/MongoDB/SchemaManager.php
+++ b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -36,8 +36,8 @@
 use function str_contains;
 
 /**
- * @psalm-import-type IndexMapping from ClassMetadata
- * @psalm-import-type IndexOptions from ClassMetadata
+ * @phpstan-import-type IndexMapping from ClassMetadata
+ * @phpstan-import-type IndexOptions from ClassMetadata
  */
 final class SchemaManager
 {
@@ -103,7 +103,7 @@ public function updateIndexes(?int $maxTimeMs = null, ?WriteConcern $writeConcer
      * Indexes that exist in MongoDB but not the document metadata will be
      * deleted.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -150,9 +150,9 @@ public function updateDocumentIndexes(string $documentName, ?int $maxTimeMs = nu
     }
 
     /**
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
-     * @psalm-return IndexMapping[]
+     * @phpstan-return IndexMapping[]
      */
     public function getDocumentIndexes(string $documentName): array
     {
@@ -162,10 +162,10 @@ public function getDocumentIndexes(string $documentName): array
     }
 
     /**
-     * @psalm-param class-string $documentName
-     * @psalm-param array<class-string, bool> $visited
+     * @param class-string              $documentName
+     * @param array<class-string, bool> $visited
      *
-     * @psalm-return IndexMapping[]
+     * @phpstan-return IndexMapping[]
      */
     private function doGetDocumentIndexes(string $documentName, array &$visited): array
     {
@@ -233,7 +233,7 @@ private function doGetDocumentIndexes(string $documentName, array &$visited): ar
     /**
      * @param ClassMetadata<object> $class
      *
-     * @psalm-return IndexMapping[]
+     * @phpstan-return IndexMapping[]
      */
     private function prepareIndexes(ClassMetadata $class): array
     {
@@ -266,7 +266,7 @@ private function prepareIndexes(ClassMetadata $class): array
     /**
      * Ensure the given document's indexes are created.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -310,7 +310,7 @@ public function deleteIndexes(?int $maxTimeMs = null, ?WriteConcern $writeConcer
     /**
      * Delete the given document's indexes.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -341,7 +341,7 @@ public function createSearchIndexes(): void
     /**
      * Create search indexes for the given document class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -396,7 +396,7 @@ public function updateSearchIndexes(): void
      * Search indexes will be updated using the definitions in the document
      * metadata. Search indexes not defined in the metadata will be deleted.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -451,7 +451,7 @@ public function deleteSearchIndexes(): void
     /**
      * Delete search indexes for the given document class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -497,7 +497,7 @@ public function updateValidators(?int $maxTimeMs = null, ?WriteConcern $writeCon
     /**
      * Ensure collection validators are up to date for the mapped document class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      */
     public function updateDocumentValidator(string $documentName, ?int $maxTimeMs = null, ?WriteConcern $writeConcern = null): void
     {
@@ -566,7 +566,7 @@ public function createCollections(?int $maxTimeMs = null, ?WriteConcern $writeCo
     /**
      * Create the document collection for a mapped class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -644,7 +644,7 @@ public function dropCollections(?int $maxTimeMs = null, ?WriteConcern $writeConc
     /**
      * Drop the document collection for a mapped class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -683,7 +683,7 @@ public function dropDatabases(?int $maxTimeMs = null, ?WriteConcern $writeConcer
     /**
      * Drop the document database for a mapped class.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws InvalidArgumentException
      */
@@ -697,7 +697,7 @@ public function dropDocumentDatabase(string $documentName, ?int $maxTimeMs = nul
         $this->dm->getDocumentDatabase($documentName)->drop($this->getWriteOptions($maxTimeMs, $writeConcern));
     }
 
-    /** @psalm-param IndexMapping $documentIndex */
+    /** @phpstan-param IndexMapping $documentIndex */
     public function isMongoIndexEquivalentToDocumentIndex(IndexInfo $mongoIndex, array $documentIndex): bool
     {
         return $this->isEquivalentIndexKeys($mongoIndex, $documentIndex) && $this->isEquivalentIndexOptions($mongoIndex, $documentIndex);
@@ -707,7 +707,7 @@ public function isMongoIndexEquivalentToDocumentIndex(IndexInfo $mongoIndex, arr
      * Determine if the keys for a MongoDB index can be considered equivalent to
      * those for an index in class metadata.
      *
-     * @psalm-param IndexMapping $documentIndex
+     * @phpstan-param IndexMapping $documentIndex
      */
     private function isEquivalentIndexKeys(IndexInfo $mongoIndex, array $documentIndex): bool
     {
@@ -735,7 +735,7 @@ private function isEquivalentIndexKeys(IndexInfo $mongoIndex, array $documentInd
             $mongoIndexKeys == $documentIndexKeys;
     }
 
-    /** @psalm-param IndexMapping $documentIndex */
+    /** @phpstan-param IndexMapping $documentIndex */
     private function hasTextIndexesAtSamePosition(IndexInfo $mongoIndex, array $documentIndex): bool
     {
         $mongoIndexKeys    = $mongoIndex['key'];
@@ -771,7 +771,7 @@ private function hasTextIndexesAtSamePosition(IndexInfo $mongoIndex, array $docu
      * The background option is only relevant to index creation and is not
      * considered.
      *
-     * @psalm-param IndexMapping $documentIndex
+     * @phpstan-param IndexMapping $documentIndex
      */
     private function isEquivalentIndexOptions(IndexInfo $mongoIndex, array $documentIndex): bool
     {
@@ -836,8 +836,8 @@ private function isEquivalentIndexOptions(IndexInfo $mongoIndex, array $document
      * Options added to the ALLOWED_MISSING_INDEX_OPTIONS constant are ignored
      * and are expected to be checked later
      *
-     * @psalm-param IndexOptions $mongoIndexOptions
-     * @psalm-param IndexOptions $documentIndexOptions
+     * @phpstan-param IndexOptions $mongoIndexOptions
+     * @phpstan-param IndexOptions $documentIndexOptions
      */
     private function indexOptionsAreMissing(array $mongoIndexOptions, array $documentIndexOptions): bool
     {
@@ -852,7 +852,7 @@ private function indexOptionsAreMissing(array $mongoIndexOptions, array $documen
      * Determine if the text index weights for a MongoDB index can be considered
      * equivalent to those for an index in class metadata.
      *
-     * @psalm-param IndexMapping $documentIndex
+     * @phpstan-param IndexMapping $documentIndex
      */
     private function isEquivalentTextIndexWeights(IndexInfo $mongoIndex, array $documentIndex): bool
     {
@@ -900,7 +900,7 @@ public function ensureSharding(?WriteConcern $writeConcern = null): void
     /**
      * Ensure sharding for collection by document name.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws MongoDBException
      */
@@ -927,7 +927,7 @@ public function ensureDocumentSharding(string $documentName, ?WriteConcern $writ
     /**
      * Enable sharding for database which contains documents with given name.
      *
-     * @psalm-param class-string $documentName
+     * @param class-string $documentName
      *
      * @throws MongoDBException
      */
@@ -948,7 +948,7 @@ public function enableShardingForDbByDocumentName(string $documentName): void
         }
     }
 
-    /** @psalm-param class-string $documentName */
+    /** @param class-string $documentName */
     private function runShardCollectionCommand(string $documentName, ?WriteConcern $writeConcern = null): void
     {
         $class    = $this->dm->getClassMetadata($documentName);
@@ -1019,7 +1019,7 @@ private function ensureFilesIndex(ClassMetadata $class, ?int $maxTimeMs = null,
         $filesCollection->createIndex(self::GRIDFS_CHUNKS_COLLECTION_INDEX, $this->getWriteOptions($maxTimeMs, $writeConcern, ['background' => $background]));
     }
 
-    /** @psalm-param class-string $documentName */
+    /** @param class-string $documentName */
     private function collectionIsSharded(string $documentName): bool
     {
         $class = $this->dm->getClassMetadata($documentName);
diff --git a/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php b/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php
index 2bd59a14e0..8b6481b803 100644
--- a/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php
+++ b/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php
@@ -103,7 +103,7 @@ protected function processSearchIndex(SchemaManager $sm): void
     }
 
     /**
-     * @psalm-param class-string $document
+     * @param class-string $document
      *
      * @throws BadMethodCallException
      */
diff --git a/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/ShardCommand.php b/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/ShardCommand.php
index 6394064d49..25bc6ba07f 100644
--- a/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/ShardCommand.php
+++ b/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/ShardCommand.php
@@ -53,7 +53,7 @@ private function doExecute(InputInterface $input, OutputInterface $output): int
         return $isErrored ? 255 : 0;
     }
 
-    /** @psalm-param class-string $document */
+    /** @param class-string $document */
     private function processDocumentSharding(SchemaManager $sm, string $document, ?WriteConcern $writeConcern = null): void
     {
         $sm->ensureDocumentSharding($document, $writeConcern);
diff --git a/lib/Doctrine/ODM/MongoDB/Tools/ResolveTargetDocumentListener.php b/lib/Doctrine/ODM/MongoDB/Tools/ResolveTargetDocumentListener.php
index 45269dcc60..d2e74fcee2 100644
--- a/lib/Doctrine/ODM/MongoDB/Tools/ResolveTargetDocumentListener.php
+++ b/lib/Doctrine/ODM/MongoDB/Tools/ResolveTargetDocumentListener.php
@@ -20,11 +20,11 @@
  *
  * Mechanism to overwrite document interfaces or classes specified as association targets.
  *
- * @psalm-import-type AssociationFieldMapping from ClassMetadata
+ * @phpstan-import-type AssociationFieldMapping from ClassMetadata
  */
 class ResolveTargetDocumentListener implements EventSubscriber
 {
-    /** @psalm-var array<class-string, array{targetDocument: class-string}> */
+    /** @var array<class-string, array{targetDocument: class-string}> */
     private array $resolveTargetDocuments = [];
 
     public function getSubscribedEvents()
@@ -38,7 +38,7 @@ public function getSubscribedEvents()
     /**
      * Add a target-document class name to resolve to a new class name.
      *
-     * @psalm-param array{targetDocument?: class-string} $mapping
+     * @param array{targetDocument?: class-string} $mapping
      */
     public function addResolveTargetDocument(string $originalDocument, string $newDocument, array $mapping): void
     {
@@ -46,7 +46,7 @@ public function addResolveTargetDocument(string $originalDocument, string $newDo
         $this->resolveTargetDocuments[$this->getRealClassName($originalDocument)] = $mapping;
     }
 
-    /** @psalm-return class-string */
+    /** @return class-string */
     private function getRealClassName(string $className): string
     {
         return ltrim($className, '\\');
@@ -88,7 +88,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args): void
 
     /**
      * @param ClassMetadata<object> $classMetadata
-     * @psalm-param AssociationFieldMapping $mapping
+     * @phpstan-param AssociationFieldMapping $mapping
      */
     private function remapAssociation(ClassMetadata $classMetadata, array $mapping): void
     {
diff --git a/lib/Doctrine/ODM/MongoDB/Types/Type.php b/lib/Doctrine/ODM/MongoDB/Types/Type.php
index 90a795bbe4..b8b308c11e 100644
--- a/lib/Doctrine/ODM/MongoDB/Types/Type.php
+++ b/lib/Doctrine/ODM/MongoDB/Types/Type.php
@@ -57,10 +57,7 @@ abstract class Type
     /** @var Type[] Map of already instantiated type objects. One instance per type (flyweight). */
     private static array $typeObjects = [];
 
-    /**
-     * @var string[] The map of supported doctrine mapping types.
-     * @psalm-var array<string, class-string>
-     */
+    /** @var array<string, class-string> The map of supported doctrine mapping types. */
     private static array $typesMap = [
         self::ID => Types\IdType::class,
         self::INTID => Types\IntIdType::class,
@@ -203,7 +200,7 @@ public static function convertPHPToDatabaseValue($value)
     /**
      * Adds a custom type to the type map.
      *
-     * @psalm-param class-string $className
+     * @param class-string $className
      *
      * @throws MappingException
      *
@@ -231,7 +228,7 @@ public static function hasType(string $name): bool
     /**
      * Overrides an already defined type to use a different implementation.
      *
-     * @psalm-param class-string $className
+     * @param class-string $className
      *
      * @throws MappingException
      *
@@ -250,7 +247,7 @@ public static function overrideType(string $name, string $className): void
      * Get the types array map which holds all registered types and the corresponding
      * type class
      *
-     * @psalm-return array<string, class-string>
+     * @phpstan-return array<string, class-string>
      */
     public static function getTypesMap(): array
     {
diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
index eb9591f996..f7a728693e 100644
--- a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
+++ b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -56,14 +56,14 @@
  * "object-level" transaction and for writing out changes to the database
  * in the correct order.
  *
- * @psalm-import-type FieldMapping from ClassMetadata
- * @psalm-import-type AssociationFieldMapping from ClassMetadata
- * @psalm-type ChangeSet = array{
+ * @phpstan-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type AssociationFieldMapping from ClassMetadata
+ * @phpstan-type ChangeSet array{
  *      0: mixed,
  *      1: mixed
  * }
- * @psalm-type Hints = array<int, mixed>
- * @psalm-type CommitOptions array{
+ * @phpstan-type Hints array<int, mixed>
+ * @phpstan-type CommitOptions array{
  *      fsync?: bool,
  *      safe?: int,
  *      w?: int,
@@ -118,7 +118,7 @@ final class UnitOfWork implements PropertyChangedListener
      * Since all classes in a hierarchy must share the same identifier set,
      * we always take the root class name of the hierarchy.
      *
-     * @psalm-var array<class-string, array<string, object>>
+     * @var array<class-string, array<string, object>>
      */
     private array $identityMap = [];
 
@@ -147,7 +147,7 @@ final class UnitOfWork implements PropertyChangedListener
      * Map of document changes. Keys are object ids (spl_object_hash).
      * Filled at the beginning of a commit of the UnitOfWork and cleaned at the end.
      *
-     * @psalm-var array<string, array<string, ChangeSet>>
+     * @var array<string, array<string, ChangeSet>>
      */
     private array $documentChangeSets = [];
 
@@ -155,7 +155,7 @@ final class UnitOfWork implements PropertyChangedListener
      * The (cached) states of any known documents.
      * Keys are object ids (spl_object_hash).
      *
-     * @psalm-var array<string, self::STATE_*>
+     * @var array<string, self::STATE_*>
      */
     private array $documentStates = [];
 
@@ -166,7 +166,7 @@ final class UnitOfWork implements PropertyChangedListener
      * object hash. This is only used for documents with a change tracking
      * policy of DEFERRED_EXPLICIT.
      *
-     * @psalm-var array<class-string, array<string, object>>
+     * @var array<class-string, array<string, object>>
      */
     private array $scheduledForSynchronization = [];
 
@@ -201,21 +201,21 @@ final class UnitOfWork implements PropertyChangedListener
     /**
      * All pending collection deletions.
      *
-     * @psalm-var array<string, PersistentCollectionInterface<array-key, object>>
+     * @var array<string, PersistentCollectionInterface<array-key, object>>
      */
     private array $scheduledCollectionDeletions = [];
 
     /**
      * All pending collection updates.
      *
-     * @psalm-var array<string, PersistentCollectionInterface<array-key, object>>
+     * @var array<string, PersistentCollectionInterface<array-key, object>>
      */
     private array $scheduledCollectionUpdates = [];
 
     /**
      * A list of documents related to collections scheduled for update or deletion
      *
-     * @psalm-var array<string, array<string, PersistentCollectionInterface<array-key, object>>>
+     * @var array<string, array<string, PersistentCollectionInterface<array-key, object>>>
      */
     private array $hasScheduledCollections = [];
 
@@ -224,7 +224,7 @@ final class UnitOfWork implements PropertyChangedListener
      * At the end of the UnitOfWork all these collections will make new snapshots
      * of their data.
      *
-     * @psalm-var array<string, array<PersistentCollectionInterface<array-key, object>>>
+     * @var array<string, array<PersistentCollectionInterface<array-key, object>>>
      */
     private array $visitedCollections = [];
 
@@ -253,7 +253,7 @@ final class UnitOfWork implements PropertyChangedListener
     /**
      * The document persister instances used to persist document instances.
      *
-     * @psalm-var array<class-string, Persisters\DocumentPersister>
+     * @var array<class-string, Persisters\DocumentPersister>
      */
     private array $persisters = [];
 
@@ -270,7 +270,7 @@ final class UnitOfWork implements PropertyChangedListener
     /**
      * Array of parent associations between embedded documents.
      *
-     * @psalm-var array<string, array{0: AssociationFieldMapping, 1: object|null, 2: string}>
+     * @var array<string, array{0: AssociationFieldMapping, 1: object|null, 2: string}>
      */
     private array $parentAssociations = [];
 
@@ -321,7 +321,7 @@ public function getPersistenceBuilder(): PersistenceBuilder
      *
      * @internal
      *
-     * @psalm-param FieldMapping $mapping
+     * @phpstan-param FieldMapping $mapping
      */
     public function setParentAssociation(object $document, array $mapping, ?object $parent, string $propertyPath): void
     {
@@ -337,7 +337,7 @@ public function setParentAssociation(object $document, array $mapping, ?object $
      *     list($mapping, $parent, $propertyPath) = $this->getParentAssociation($embeddedDocument);
      *     </code>
      *
-     * @psalm-return array{0: AssociationFieldMapping, 1: object|null, 2: string}|null
+     * @phpstan-return array{0: AssociationFieldMapping, 1: object|null, 2: string}|null
      */
     public function getParentAssociation(object $document): ?array
     {
@@ -349,9 +349,9 @@ public function getParentAssociation(object $document): ?array
     /**
      * Get the document persister instance for the given document name
      *
-     * @psalm-param class-string<T> $documentName
+     * @param class-string<T> $documentName
      *
-     * @psalm-return Persisters\DocumentPersister<T>
+     * @return Persisters\DocumentPersister<T>
      *
      * @template T of object
      */
@@ -363,7 +363,6 @@ public function getDocumentPersister(string $documentName): Persisters\DocumentP
             $this->persisters[$documentName] = new Persisters\DocumentPersister($pb, $this->dm, $this, $this->hydratorFactory, $class);
         }
 
-        /** @psalm-var Persisters\DocumentPersister<T> */
         return $this->persisters[$documentName];
     }
 
@@ -385,8 +384,8 @@ public function getCollectionPersister(): CollectionPersister
      *
      * @internal
      *
-     * @psalm-param class-string<T> $documentName
-     * @psalm-param Persisters\DocumentPersister<T> $persister
+     * @param class-string<T> $documentName
+     * @phpstan-param Persisters\DocumentPersister<T> $persister
      *
      * @template T of object
      */
@@ -407,7 +406,7 @@ public function setDocumentPersister(string $documentName, Persisters\DocumentPe
      * 3) All document deletions
      *
      * @param array $options Array of options to be used with batchInsert(), update() and remove()
-     * @psalm-param CommitOptions $options
+     * @phpstan-param CommitOptions $options
      */
     public function commit(array $options = []): void
     {
@@ -504,7 +503,7 @@ function (Session $session) use ($options): void {
      *
      * @param array<string, object> $documents
      *
-     * @psalm-return array<class-string, array{0: ClassMetadata<object>, 1: array<string, object>}>
+     * @phpstan-return array<class-string, array{0: ClassMetadata<object>, 1: array<string, object>}>
      */
     private function getClassesForCommitAction(array $documents, bool $includeEmbedded = false): array
     {
@@ -583,7 +582,7 @@ private function computeScheduleUpsertsChangeSets(): void
      * Gets the changeset for a document.
      *
      * @return array array('property' => array(0 => mixed, 1 => mixed))
-     * @psalm-return array<string, ChangeSet>
+     * @phpstan-return array<string, ChangeSet>
      */
     public function getDocumentChangeSet(object $document): array
     {
@@ -597,7 +596,7 @@ public function getDocumentChangeSet(object $document): array
      *
      * @internal
      *
-     * @psalm-param array<string, ChangeSet> $changeset
+     * @param array<string, ChangeSet> $changeset
      */
     public function setDocumentChangeSet(object $document, array $changeset): void
     {
@@ -667,8 +666,8 @@ public function getDocumentActualData(object $document): array
      * and any changes to its properties are detected, then a reference to the document is stored
      * there to mark it for an update.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @template T of object
      */
@@ -689,8 +688,8 @@ public function computeChangeSet(ClassMetadata $class, object $document): void
     /**
      * Used to do the common work of computeChangeSet and recomputeSingleDocumentChangeSet
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @template T of object
      */
@@ -961,7 +960,7 @@ public function computeChangeSets(): void
      * Computes the changes of an association.
      *
      * @param mixed $value The value of the association.
-     * @psalm-param AssociationFieldMapping $assoc
+     * @phpstan-param AssociationFieldMapping $assoc
      *
      * @throws InvalidArgumentException
      */
@@ -1083,8 +1082,8 @@ private function computeAssociationChanges(object $parentDocument, array $assoc,
      * because this method is invoked during a commit cycle then the change sets are added.
      * whereby changes detected in this method prevail.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @throws InvalidArgumentException If the passed document is not MANAGED.
      *
@@ -1111,8 +1110,8 @@ public function recomputeSingleDocumentChangeSet(ClassMetadata $class, object $d
     }
 
     /**
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @throws InvalidArgumentException If there is something wrong with document's identifier.
      *
@@ -1165,9 +1164,9 @@ private function persistNew(ClassMetadata $class, object $document): void
     /**
      * Executes all document insertions for documents of the specified type.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T[] $documents
-     * @psalm-param CommitOptions $options
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T[] $documents
+     * @phpstan-param CommitOptions $options
      *
      * @template T of object
      */
@@ -1189,9 +1188,9 @@ private function executeInserts(ClassMetadata $class, array $documents, array $o
     /**
      * Executes all document upserts for documents of the specified type.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T[] $documents
-     * @psalm-param CommitOptions $options
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T[] $documents
+     * @phpstan-param CommitOptions $options
      *
      * @template T of object
      */
@@ -1213,9 +1212,9 @@ private function executeUpserts(ClassMetadata $class, array $documents, array $o
     /**
      * Executes all document updates for documents of the specified type.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T[] $documents
-     * @psalm-param CommitOptions $options
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T[] $documents
+     * @phpstan-param CommitOptions $options
      *
      * @template T of object
      */
@@ -1242,9 +1241,9 @@ private function executeUpdates(ClassMetadata $class, array $documents, array $o
     /**
      * Executes all document deletions for documents of the specified type.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T[] $documents
-     * @psalm-param CommitOptions $options
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T[] $documents
+     * @phpstan-param CommitOptions $options
      *
      * @template T of object
      */
@@ -1288,8 +1287,8 @@ private function executeDeletions(ClassMetadata $class, array $documents, array
      *
      * @internal
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @throws InvalidArgumentException
      *
@@ -1326,8 +1325,8 @@ public function scheduleForInsert(ClassMetadata $class, object $document): void
      *
      * @internal
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @throws InvalidArgumentException
      *
@@ -1614,15 +1613,13 @@ public function removeFromIdentityMap(object $document): bool
      * @internal
      *
      * @param mixed $id Document identifier
-     * @psalm-param ClassMetadata<T> $class
+     * @phpstan-param ClassMetadata<T> $class
      *
-     * @psalm-return T
+     * @phpstan-return T
      *
      * @throws InvalidArgumentException If the class does not have an identifier.
      *
      * @template T of object
-     *
-     * @psalm-suppress InvalidReturnStatement, InvalidReturnType because of the inability of defining a generic property map
      */
     public function getById($id, ClassMetadata $class): object
     {
@@ -1642,16 +1639,16 @@ public function getById($id, ClassMetadata $class): object
      * @internal
      *
      * @param mixed $id Document identifier
-     * @psalm-param ClassMetadata<T> $class
+     * @phpstan-param ClassMetadata<T> $class
      *
      * @return mixed The found document or FALSE.
-     * @psalm-return T|false
+     * @phpstan-return T|false
      *
      * @throws InvalidArgumentException If the class does not have an identifier.
      *
      * @template T of object
      *
-     * @psalm-suppress InvalidReturnStatement, InvalidReturnType because of the inability of defining a generic property map
+     * @ phpstan-suppress InvalidReturnStatement, InvalidReturnType because of the inability of defining a generic property map
      */
     public function tryGetById($id, ClassMetadata $class)
     {
@@ -1874,7 +1871,7 @@ public function merge(object $document): object
      * Executes a merge operation on a document.
      *
      * @param array<string, object> $visited
-     * @psalm-param AssociationFieldMapping|null $assoc
+     * @phpstan-param AssociationFieldMapping|null $assoc
      *
      * @throws InvalidArgumentException If the entity instance is NEW.
      * @throws LockException If the document uses optimistic locking through a
@@ -2463,11 +2460,11 @@ public function unscheduleOrphanRemoval(object $document): void
      *  3) NOP if state is OK
      * Returned collection should be used from now on (only important with 2nd point)
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
-     * @psalm-param T $document
-     * @psalm-param ClassMetadata<T> $class
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param T $document
+     * @phpstan-param ClassMetadata<T> $class
      *
-     * @psalm-return PersistentCollectionInterface<array-key, object>
+     * @phpstan-return PersistentCollectionInterface<array-key, object>
      *
      * @template T of object
      */
@@ -2497,7 +2494,7 @@ private function fixPersistentCollectionOwnership(PersistentCollectionInterface
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function scheduleCollectionDeletion(PersistentCollectionInterface $coll): void
     {
@@ -2516,7 +2513,7 @@ public function scheduleCollectionDeletion(PersistentCollectionInterface $coll):
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function isCollectionScheduledForDeletion(PersistentCollectionInterface $coll): bool
     {
@@ -2528,7 +2525,7 @@ public function isCollectionScheduledForDeletion(PersistentCollectionInterface $
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function unscheduleCollectionDeletion(PersistentCollectionInterface $coll): void
     {
@@ -2551,7 +2548,7 @@ public function unscheduleCollectionDeletion(PersistentCollectionInterface $coll
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function scheduleCollectionUpdate(PersistentCollectionInterface $coll): void
     {
@@ -2577,7 +2574,7 @@ public function scheduleCollectionUpdate(PersistentCollectionInterface $coll): v
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function unscheduleCollectionUpdate(PersistentCollectionInterface $coll): void
     {
@@ -2600,7 +2597,7 @@ public function unscheduleCollectionUpdate(PersistentCollectionInterface $coll):
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function isCollectionScheduledForUpdate(PersistentCollectionInterface $coll): bool
     {
@@ -2614,7 +2611,7 @@ public function isCollectionScheduledForUpdate(PersistentCollectionInterface $co
      * @internal
      *
      * @return PersistentCollectionInterface[]
-     * @psalm-return array<PersistentCollectionInterface<array-key, object>>
+     * @phpstan-return array<PersistentCollectionInterface<array-key, object>>
      */
     public function getVisitedCollections(object $document): array
     {
@@ -2628,8 +2625,7 @@ public function getVisitedCollections(object $document): array
      *
      * @internal
      *
-     * @return PersistentCollectionInterface[]
-     * @psalm-return array<string, PersistentCollectionInterface<array-key, object>>
+     * @return array<string, PersistentCollectionInterface<array-key, object>>
      */
     public function getScheduledCollections(object $document): array
     {
@@ -2660,7 +2656,7 @@ public function hasScheduledCollections(object $document): bool
      * unscheduled and atomic one is scheduled for update instead. This makes
      * calculating update data way easier.
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     private function scheduleCollectionOwner(PersistentCollectionInterface $coll): void
     {
@@ -2728,12 +2724,12 @@ public function getOwningDocument(object $document): object
     /**
      * Creates a document. Used for reconstitution of documents during hydration.
      *
-     * @psalm-param class-string<T> $className
-     * @psalm-param array<string, mixed> $data
-     * @psalm-param T|null $document
-     * @psalm-param Hints $hints
+     * @param class-string<T>      $className
+     * @param array<string, mixed> $data
+     * @param T|null               $document
+     * @phpstan-param Hints                $hints
      *
-     * @psalm-return T
+     * @return T
      *
      * @template T of object
      */
@@ -2750,7 +2746,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
         }
 
         if ($discriminatorValue !== null) {
-            /** @psalm-var class-string<T> $className */
+            /** @var class-string<T> $className */
             $className =  $class->discriminatorMap[$discriminatorValue] ?? $discriminatorValue;
 
             $class = $this->dm->getClassMetadata($className);
@@ -2759,7 +2755,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
         }
 
         if (! empty($hints[Query::HINT_READ_ONLY])) {
-            /** @psalm-var T $document */
+            /** @phpstan-var T $document */
             $document = $class->newInstance();
             $this->hydratorFactory->hydrate($document, $data, $hints);
 
@@ -2777,7 +2773,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
 
         $oid = null;
         if ($isManagedObject) {
-            /** @psalm-var T $document */
+            /** @phpstan-var T $document */
             $document = $this->identityMap[$class->name][$serializedId];
             $oid      = spl_object_hash($document);
             if ($this->isUninitializedObject($document)) {
@@ -2796,7 +2792,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
             }
         } else {
             if ($document === null) {
-                /** @psalm-var T $document */
+                /** @phpstan-var T $document */
                 $document = $class->newInstance();
             }
 
@@ -2822,7 +2818,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
      *
      * @internal
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $collection
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $collection
      */
     public function loadCollection(PersistentCollectionInterface $collection): void
     {
@@ -2839,7 +2835,7 @@ public function loadCollection(PersistentCollectionInterface $collection): void
      *
      * @internal
      *
-     * @psalm-return array<class-string, array<string, object>>
+     * @return array<class-string, array<string, object>>
      */
     public function getIdentityMap(): array
     {
@@ -2993,7 +2989,7 @@ public function propertyChanged($sender, $propertyName, $oldValue, $newValue)
     /**
      * Gets the currently scheduled document insertions in this UnitOfWork.
      *
-     * @psalm-return array<string, object>
+     * @return array<string, object>
      */
     public function getScheduledDocumentInsertions(): array
     {
@@ -3003,7 +2999,7 @@ public function getScheduledDocumentInsertions(): array
     /**
      * Gets the currently scheduled document upserts in this UnitOfWork.
      *
-     * @psalm-return array<string, object>
+     * @return array<string, object>
      */
     public function getScheduledDocumentUpserts(): array
     {
@@ -3013,7 +3009,7 @@ public function getScheduledDocumentUpserts(): array
     /**
      * Gets the currently scheduled document updates in this UnitOfWork.
      *
-     * @psalm-return array<string, object>
+     * @return array<string, object>
      */
     public function getScheduledDocumentUpdates(): array
     {
@@ -3023,7 +3019,7 @@ public function getScheduledDocumentUpdates(): array
     /**
      * Gets the currently scheduled document deletions in this UnitOfWork.
      *
-     * @psalm-return array<string, object>
+     * @return array<string, object>
      */
     public function getScheduledDocumentDeletions(): array
     {
@@ -3035,7 +3031,7 @@ public function getScheduledDocumentDeletions(): array
      *
      * @internal
      *
-     * @psalm-return array<string, PersistentCollectionInterface<array-key, object>>
+     * @return array<string, PersistentCollectionInterface<array-key, object>>
      */
     public function getScheduledCollectionDeletions(): array
     {
@@ -3047,7 +3043,7 @@ public function getScheduledCollectionDeletions(): array
      *
      * @internal
      *
-     * @psalm-return array<string, PersistentCollectionInterface<array-key, object>>
+     * @return array<string, PersistentCollectionInterface<array-key, object>>
      */
     public function getScheduledCollectionUpdates(): array
     {
@@ -3096,7 +3092,7 @@ private function objToStr(object $obj): string
         return method_exists($obj, '__toString') ? (string) $obj : $obj::class . '@' . spl_object_hash($obj);
     }
 
-    /** @psalm-param CommitOptions $options */
+    /** @phpstan-param CommitOptions $options */
     private function doCommit(array $options): void
     {
         foreach ($this->getClassesForCommitAction($this->scheduledDocumentUpserts) as $classAndDocuments) {
@@ -3120,7 +3116,7 @@ private function doCommit(array $options): void
         }
     }
 
-    /** @psalm-param CommitOptions $options */
+    /** @phpstan-param CommitOptions $options */
     private function useTransaction(array $options): bool
     {
         if (isset($options['withTransaction'])) {
@@ -3130,7 +3126,7 @@ private function useTransaction(array $options): bool
         return $this->dm->getConfiguration()->isTransactionalFlushEnabled();
     }
 
-    /** @psalm-param CommitOptions $options */
+    /** @phpstan-param CommitOptions $options */
     private function getTransactionOptions(array $options): array
     {
         return array_intersect_key(
diff --git a/lib/Doctrine/ODM/MongoDB/Utility/LifecycleEventManager.php b/lib/Doctrine/ODM/MongoDB/Utility/LifecycleEventManager.php
index a44ff8f254..a6d26cc2fc 100644
--- a/lib/Doctrine/ODM/MongoDB/Utility/LifecycleEventManager.php
+++ b/lib/Doctrine/ODM/MongoDB/Utility/LifecycleEventManager.php
@@ -63,7 +63,7 @@ public function documentNotFound(object $proxy, $id): bool
     /**
      * Dispatches postCollectionLoad event.
      *
-     * @psalm-param PersistentCollectionInterface<array-key, object> $coll
+     * @phpstan-param PersistentCollectionInterface<array-key, object> $coll
      */
     public function postCollectionLoad(PersistentCollectionInterface $coll): void
     {
@@ -74,8 +74,8 @@ public function postCollectionLoad(PersistentCollectionInterface $coll): void
     /**
      * Invokes postPersist callbacks and events for given document cascading them to embedded documents as well.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @template T of object
      */
@@ -95,8 +95,8 @@ public function postPersist(ClassMetadata $class, object $document, ?Session $se
     /**
      * Invokes postRemove callbacks and events for given document.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @template T of object
      */
@@ -116,8 +116,8 @@ public function postRemove(ClassMetadata $class, object $document, ?Session $ses
      * Invokes postUpdate callbacks and events for given document. The same will be done for embedded documents owned
      * by given document unless they were new in which case postPersist callbacks and events will be dispatched.
      *
-     * @psalm-param ClassMetadata<T> $class
-     * @psalm-param T $document
+     * @phpstan-param ClassMetadata<T> $class
+     * @phpstan-param T $document
      *
      * @template T of object
      */
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index 110172f146..0000000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
-  <file src="lib/Doctrine/ODM/MongoDB/Aggregation/Aggregation.php">
-    <MissingTemplateParam>
-      <code><![CDATA[IteratorAggregate]]></code>
-    </MissingTemplateParam>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$fieldName]]></code>
-      <code><![CDATA[$order]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/AbstractSearchOperator.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$fieldName]]></code>
-      <code><![CDATA[$order]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Configuration.php">
-    <TypeDoesNotContainType>
-      <code><![CDATA[$reflectionClass->implementsInterface(ClassMetadataFactoryInterface::class)]]></code>
-      <code><![CDATA[$reflectionClass->implementsInterface(GridFSRepository::class)]]></code>
-      <code><![CDATA[$reflectionClass->implementsInterface(ObjectRepository::class)]]></code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/DocumentManager.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[ClassMetadataFactoryInterface]]></code>
-    </ImplementedReturnTypeMismatch>
-    <NullableReturnStatement>
-      <code><![CDATA[$mapping['targetDocument']]]></code>
-    </NullableReturnStatement>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Event/OnClearEventArgs.php">
-    <TooManyArguments>
-      <code><![CDATA[parent::__construct($objectManager, $entityClass)]]></code>
-    </TooManyArguments>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Iterator/CachingIterator.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[TValue|false]]></code>
-    </ImplementedReturnTypeMismatch>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[array<string|null>]]></code>
-    </ImplementedReturnTypeMismatch>
-    <InvalidArgument>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$mapping]]></code>
-    </InvalidArgument>
-    <InvalidArrayOffset>
-      <code><![CDATA[[$this->identifier => $this->getIdentifierValue($object)]]]></code>
-    </InvalidArrayOffset>
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->associationMappings]]></code>
-      <code><![CDATA[$this->associationMappings]]></code>
-      <code><![CDATA[$this->fieldMappings]]></code>
-    </InvalidPropertyAssignmentValue>
-    <InvalidReturnStatement>
-      <code><![CDATA[$mapping]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[FieldMapping]]></code>
-    </InvalidReturnType>
-    <LessSpecificImplementedReturnType>
-      <code><![CDATA[array]]></code>
-      <code><![CDATA[array<string|null>]]></code>
-    </LessSpecificImplementedReturnType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php">
-    <InvalidArgument>
-      <code><![CDATA[$mapping]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php">
-    <InvalidArgument>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$options]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php">
-    <InvalidArgument>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$options]]></code>
-    </InvalidArgument>
-    <RedundantCast>
-      <code><![CDATA[(bool) $mapping['background']]]></code>
-      <code><![CDATA[(bool) $mapping['sparse']]]></code>
-      <code><![CDATA[(bool) $mapping['unique']]]></code>
-      <code><![CDATA[(string) $mapping['index-name']]]></code>
-    </RedundantCast>
-    <RedundantCondition>
-      <code><![CDATA[assert($attributes instanceof SimpleXMLElement)]]></code>
-      <code><![CDATA[isset($embed->{'default-discriminator-value'})]]></code>
-      <code><![CDATA[isset($embed->{'discriminator-field'})]]></code>
-      <code><![CDATA[isset($embed->{'discriminator-map'})]]></code>
-      <code><![CDATA[isset($field->{'generator-option'})]]></code>
-      <code><![CDATA[isset($partialFilterExpressionMapping->and)]]></code>
-      <code><![CDATA[isset($partialFilterExpressionMapping->field)]]></code>
-      <code><![CDATA[isset($reference->criteria)]]></code>
-      <code><![CDATA[isset($reference->prime)]]></code>
-      <code><![CDATA[isset($reference->sort)]]></code>
-      <code><![CDATA[isset($reference->{'default-discriminator-value'})]]></code>
-      <code><![CDATA[isset($reference->{'discriminator-field'})]]></code>
-      <code><![CDATA[isset($reference->{'discriminator-map'})]]></code>
-      <code><![CDATA[isset($xmlIndex->option)]]></code>
-      <code><![CDATA[isset($xmlIndex->{'partial-filter-expression'})]]></code>
-      <code><![CDATA[isset($xmlReadPreference->{'tag-set'})]]></code>
-      <code><![CDATA[isset($xmlRoot->field)]]></code>
-      <code><![CDATA[isset($xmlRoot->id)]]></code>
-      <code><![CDATA[isset($xmlRoot->indexes)]]></code>
-      <code><![CDATA[isset($xmlRoot->{'default-discriminator-value'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'discriminator-field'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'discriminator-map'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'embed-many'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'embed-one'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'lifecycle-callbacks'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'read-preference'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'reference-many'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'reference-one'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'schema-validation'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'search-indexes'})]]></code>
-      <code><![CDATA[isset($xmlRoot->{'shard-key'})]]></code>
-      <code><![CDATA[isset($xmlShardkey->option)]]></code>
-    </RedundantCondition>
-    <TypeDoesNotContainType>
-      <code><![CDATA[isset($xmlRoot->metadata)]]></code>
-      <code><![CDATA[isset($xmlRoot->{'also-load-methods'})]]></code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/PersistentCollection/AbstractPersistentCollectionFactory.php">
-    <InvalidArgument>
-      <code><![CDATA[new PersistentCollection($coll, $dm, $dm->getUnitOfWork())]]></code>
-      <code><![CDATA[new PersistentCollection($coll, $dm, $dm->getUnitOfWork())]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php">
-    <RedundantCondition>
-      <code><![CDATA[is_object($this->coll)]]></code>
-      <code><![CDATA[isset($this->uow) && $this->isOrphanRemovalEnabled() && $value !== null]]></code>
-      <code><![CDATA[isset($this->uow) && $this->isOrphanRemovalEnabled() && $value !== null]]></code>
-    </RedundantCondition>
-    <RedundantPropertyInitializationCheck>
-      <code><![CDATA[$this->owner && isset($this->dm)]]></code>
-      <code><![CDATA[isset($this->dm)]]></code>
-      <code><![CDATA[isset($this->uow)]]></code>
-      <code><![CDATA[isset($this->uow)]]></code>
-    </RedundantPropertyInitializationCheck>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php">
-    <RedundantFunctionCall>
-      <code><![CDATA[array_values]]></code>
-    </RedundantFunctionCall>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Proxy/Resolver/ProxyManagerClassNameResolver.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$className]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Query/Builder.php">
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->query]]></code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Query/Expr.php">
-    <UnsupportedPropertyReferenceUsage>
-      <code><![CDATA[$current = &$this->newObj]]></code>
-      <code><![CDATA[$query = &$this->query]]></code>
-      <code><![CDATA[$query = &$this->query[$this->currentField]]]></code>
-    </UnsupportedPropertyReferenceUsage>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Query/Query.php">
-    <MissingTemplateParam>
-      <code><![CDATA[IteratorAggregate]]></code>
-    </MissingTemplateParam>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Repository/DocumentRepository.php">
-    <LessSpecificImplementedReturnType>
-      <code><![CDATA[array]]></code>
-    </LessSpecificImplementedReturnType>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/ClearCache/MetadataCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/CommandCompatibility.php">
-    <DuplicateClass>
-      <code><![CDATA[CommandCompatibility]]></code>
-    </DuplicateClass>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GenerateHydratorsCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GeneratePersistentCollectionsCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GenerateProxiesCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/QueryCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/ValidateCommand.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getDocumentManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/Helper/DocumentManagerHelper.php">
-    <DuplicateClass>
-      <code><![CDATA[DocumentManagerHelperCompatibility]]></code>
-    </DuplicateClass>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/Console/MetadataFilter.php">
-    <MissingTemplateParam>
-      <code><![CDATA[MetadataFilter]]></code>
-    </MissingTemplateParam>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Tools/ResolveTargetDocumentListener.php">
-    <InvalidArgument>
-      <code><![CDATA[$newMapping]]></code>
-      <code><![CDATA[$newMapping]]></code>
-      <code><![CDATA[$newMapping]]></code>
-      <code><![CDATA[$newMapping]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/Types/DateImmutableType.php">
-    <RedundantCondition>
-      <code><![CDATA[$datetime instanceof DateTime]]></code>
-    </RedundantCondition>
-  </file>
-  <file src="lib/Doctrine/ODM/MongoDB/UnitOfWork.php">
-    <InvalidArgument>
-      <code><![CDATA[$assoc]]></code>
-      <code><![CDATA[$assoc]]></code>
-      <code><![CDATA[$assoc2]]></code>
-      <code><![CDATA[$assoc2]]></code>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[$mapping]]></code>
-    </InvalidArgument>
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->parentAssociations]]></code>
-    </InvalidPropertyAssignmentValue>
-    <InvalidReturnStatement>
-      <code><![CDATA[$divided]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[array<class-string, array{0: ClassMetadata<object>, 1: array<string, object>}>]]></code>
-    </InvalidReturnType>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/UnsetTest.php">
-    <InvalidArgument>
-      <code><![CDATA[$documentPersister]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/ClassMetadataTestUtil.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[$mapping + $defaultFieldMapping]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[FieldMapping]]></code>
-    </InvalidReturnType>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/DocumentManagerTest.php">
-    <InvalidArgument>
-      <code><![CDATA[$class->associationMappings['ref']]]></code>
-      <code><![CDATA[$class->associationMappings['ref1']]]></code>
-      <code><![CDATA[$class->associationMappings['ref2']]]></code>
-      <code><![CDATA[$class->associationMappings['ref3']]]></code>
-      <code><![CDATA[$class->associationMappings['ref4']]]></code>
-      <code><![CDATA[['storeAs' => ClassMetadata::REFERENCE_STORE_AS_DB_REF]]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/DocumentRepositoryTest.php">
-    <InvalidArgument>
-      <code><![CDATA[new ArrayCollection([$project])]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Events/PreLoadEventArgsTest.php">
-    <UnsupportedPropertyReferenceUsage>
-      <code><![CDATA[$eventArgsData =& $eventArgs->getData()]]></code>
-    </UnsupportedPropertyReferenceUsage>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/CollectionPersisterTest.php">
-    <InvalidArgument>
-      <code><![CDATA[[$user->categories[0]->children, $user->categories[1]->children]]]></code>
-      <code><![CDATA[[$user->categories[0]->children[0]->children, $user->categories[0]->children[1]->children]]]></code>
-      <code><![CDATA[[$user->categories[0]->children[0]->children, $user->categories[0]->children[1]->children]]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/CustomCollectionsTest.php">
-    <InvalidArgument>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$j]]></code>
-      <code><![CDATA[$j]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/DetachedDocumentTest.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[$phonenumbers]]></code>
-      <code><![CDATA[$phonenumbers]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Iterator/CachingIteratorTest.php">
-    <MissingTemplateParam>
-      <code><![CDATA[Iterator]]></code>
-    </MissingTemplateParam>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferenceEmbeddedDocumentsTest.php">
-    <InvalidArgument>
-      <code><![CDATA[new ArrayCollection([
-            new Issue('Issue #1', 'Issue #1 on Sub Project #1'),
-            new Issue('Issue #2', 'Issue #2 on Sub Project #1'),
-        ])]]></code>
-      <code><![CDATA[new ArrayCollection([
-            new Issue('Issue #1', 'Issue #1 on Sub Project #2'),
-            new Issue('Issue #2', 'Issue #2 on Sub Project #2'),
-        ])]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/RepositoriesTest.php">
-    <TypeDoesNotContainType>
-      <code><![CDATA[assertEmpty]]></code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/ShardKeyTest.php">
-    <InvalidArgument>
-      <code><![CDATA[['upsert' => true]]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/TargetDocumentTest.php">
-    <UndefinedClass>
-      <code><![CDATA[['Foo' => 'Doctrine\ODM\MongoDB\Tests\Functional\SomeInvalidClass']]]></code>
-    </UndefinedClass>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1011Test.php">
-    <InvalidArgument>
-      <code><![CDATA[$doc->embeds]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH245Test.php">
-    <RedundantCondition>
-      <code><![CDATA[assertIsInt]]></code>
-    </RedundantCondition>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH453Test.php">
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$colAddToSet]]></code>
-      <code><![CDATA[$colAddToSet]]></code>
-      <code><![CDATA[$colAddToSet]]></code>
-      <code><![CDATA[$colPush]]></code>
-      <code><![CDATA[$colPush]]></code>
-      <code><![CDATA[$colPush]]></code>
-      <code><![CDATA[$colSet]]></code>
-      <code><![CDATA[$colSet]]></code>
-      <code><![CDATA[$colSet]]></code>
-      <code><![CDATA[$colSetArray]]></code>
-      <code><![CDATA[$colSetArray]]></code>
-      <code><![CDATA[$colSetArray]]></code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH566Test.php">
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[new ArrayCollection([
-            $embeddedDoc1,
-            $embeddedDoc2,
-        ])]]></code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH597Test.php">
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[new ArrayCollection([
-            new GH597Comment('Comment 1'),
-            new GH597Comment('Comment 2'),
-            new GH597Comment('Comment 3'),
-        ])]]></code>
-      <code><![CDATA[new ArrayCollection([$referenceMany1, $referenceMany2])]]></code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM29Test.php">
-    <InvalidArgument>
-      <code><![CDATA[$collection]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM43Test.php">
-    <UnsupportedPropertyReferenceUsage>
-      <code><![CDATA[$data =& $e->getData()]]></code>
-    </UnsupportedPropertyReferenceUsage>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM81Test.php">
-    <InvalidNullableReturnType>
-      <code><![CDATA[DocumentManager]]></code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement>
-      <code><![CDATA[$this->dm]]></code>
-    </NullableReturnStatement>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php">
-    <InvalidArgument>
-      <code><![CDATA[$config]]></code>
-      <code><![CDATA[$mapping]]></code>
-      <code><![CDATA[[
-            'fieldName' => 'assoc',
-            'reference' => true,
-            'type' => 'many',
-            'targetDocument' => 'stdClass',
-            'repositoryMethod' => 'fetch',
-            $prop => $value,
-        ]]]></code>
-      <code><![CDATA[[
-            'fieldName' => 'enum',
-            'enumType' => Card::class,
-        ]]]></code>
-      <code><![CDATA[[
-            'fieldName' => 'enum',
-            'enumType' => SuitNonBacked::class,
-        ]]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Query/BuilderTest.php">
-    <InvalidArgument>
-      <code><![CDATA[1]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php">
-    <InternalClass>
-      <code><![CDATA[new IndexInfoIteratorIterator(new ArrayIterator($indexes))]]></code>
-      <code><![CDATA[new IndexInfoIteratorIterator(new ArrayIterator([]))]]></code>
-    </InternalClass>
-    <InternalMethod>
-      <code><![CDATA[new IndexInfoIteratorIterator(new ArrayIterator($indexes))]]></code>
-      <code><![CDATA[new IndexInfoIteratorIterator(new ArrayIterator([]))]]></code>
-    </InternalMethod>
-    <InvalidArgument>
-      <code><![CDATA[$options + $expectedWriteOptions]]></code>
-    </InvalidArgument>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Types/DateImmutableTypeTest.php">
-    <TypeDoesNotContainType>
-      <code><![CDATA[assertInstanceOf]]></code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="tests/Doctrine/ODM/MongoDB/Tests/Types/DateTypeTest.php">
-    <TypeDoesNotContainType>
-      <code><![CDATA[assertInstanceOf]]></code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="tests/Documents/CommentRepository.php">
-    <InternalMethod>
-      <code><![CDATA[loadAll]]></code>
-      <code><![CDATA[loadAll]]></code>
-    </InternalMethod>
-  </file>
-</files>
diff --git a/psalm.xml.dist b/psalm.xml.dist
deleted file mode 100644
index 63e41ba00e..0000000000
--- a/psalm.xml.dist
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="4"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
-    findUnusedPsalmSuppress="true"
-    phpVersion="8.2"
-    resolveFromConfigFile="true"
-    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"
->
-    <projectFiles>
-        <directory name="lib/Doctrine/ODM/MongoDB" />
-        <directory name="tests/Doctrine" />
-        <directory name="tests/Documents" />
-        <ignoreFiles>
-            <file name="tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/User.php" />
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-    <issueHandlers>
-        <UndefinedConstant>
-            <!-- DOCTRINE_MONGODB_DATABASE constant defined in phpunit.xml.dist -->
-            <errorLevel type="suppress">
-                <file name="tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php"/>
-                <file name="tests/Doctrine/ODM/MongoDB/Tests/DocumentRepositoryTest.php"/>
-                <file name="tests/Doctrine/ODM/MongoDB/Tests/Id/IncrementGeneratorTest.php"/>
-                <file name="tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php"/>
-            </errorLevel>
-        </UndefinedConstant>
-
-        <InvalidReturnType>
-            <errorLevel type="suppress">
-                <!-- Remove it when dropping support for doctrine/collections v1 -->
-                <file name="lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php"/>
-            </errorLevel>
-        </InvalidReturnType>
-    </issueHandlers>
-</psalm>
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/FacetTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/FacetTest.php
index d2b0ee0506..a25183060c 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/FacetTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/FacetTest.php
@@ -66,7 +66,6 @@ public function testThrowsExceptionWithoutFieldName(): void
         $facetStage->pipeline($this->getTestAggregationBuilder());
     }
 
-    /** @psalm-suppress InvalidArgument on purpose to throw exception */
     public function testThrowsExceptionOnInvalidPipeline(): void
     {
         $facetStage = new Facet($this->getTestAggregationBuilder());
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/SortTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/SortTest.php
index 76331a095c..e56dddceae 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/SortTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/SortTest.php
@@ -9,14 +9,14 @@
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-/** @psalm-import-type SortShape from Sort */
+/** @phpstan-import-type SortShape from Sort */
 class SortTest extends BaseTestCase
 {
     use AggregationTestTrait;
 
     /**
      * @param string|array<string, string> $field
-     * @psalm-param SortShape $expectedSort
+     * @phpstan-param SortShape $expectedSort
      */
     #[DataProvider('provideSortOptions')]
     public function testStage(array $expectedSort, $field, ?string $order = null): void
@@ -28,7 +28,7 @@ public function testStage(array $expectedSort, $field, ?string $order = null): v
 
     /**
      * @param string|array<string, string> $field
-     * @psalm-param SortShape $expectedSort
+     * @phpstan-param SortShape $expectedSort
      */
     #[DataProvider('provideSortOptions')]
     public function testFromBuilder(array $expectedSort, $field, ?string $order = null): void
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php b/tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php
index 7806d9cf40..b24c54c3fe 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php
@@ -160,7 +160,7 @@ protected function skipTestIfTransactionalFlushEnabled(): void
         }
     }
 
-    /** @psalm-param class-string $className */
+    /** @param class-string $className */
     protected function skipTestIfNotSharded(string $className): void
     {
         $result = $this->dm->getDocumentDatabase($className)->command(['listCommands' => true], ['typeMap' => DocumentManager::CLIENT_TYPEMAP])->toArray()[0];
@@ -172,7 +172,7 @@ protected function skipTestIfNotSharded(string $className): void
         $this->markTestSkipped('Test skipped because server does not support sharding');
     }
 
-    /** @psalm-param class-string $className */
+    /** @param class-string $className */
     protected function skipTestIfSharded(string $className): void
     {
         $result = $this->dm->getDocumentDatabase($className)->command(['listCommands' => true], ['typeMap' => DocumentManager::CLIENT_TYPEMAP])->toArray()[0];
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/ClassMetadataTestUtil.php b/tests/Doctrine/ODM/MongoDB/Tests/ClassMetadataTestUtil.php
index 5783c7e9ed..40b3ffd05d 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/ClassMetadataTestUtil.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/ClassMetadataTestUtil.php
@@ -8,15 +8,15 @@
 use Doctrine\ODM\MongoDB\Types\Type;
 
 /**
- * @psalm-import-type FieldMapping from ClassMetadata
- * @psalm-import-type FieldMappingConfig from ClassMetadata
+ * @phpstan-import-type FieldMapping from ClassMetadata
+ * @phpstan-import-type FieldMappingConfig from ClassMetadata
  */
 class ClassMetadataTestUtil
 {
     /**
-     * @psalm-param FieldMappingConfig $mapping
+     * @phpstan-param FieldMappingConfig $mapping
      *
-     * @psalm-return FieldMapping
+     * @phpstan-return FieldMapping
      */
     public static function getFieldMapping(array $mapping): array
     {
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleListenersTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleListenersTest.php
index 7a5ea7e836..088040c918 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleListenersTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleListenersTest.php
@@ -220,7 +220,7 @@ public function testPostCollectionLoad(): void
 
 class MyEventListener
 {
-    /** @psalm-var array<string, list<class-string>> */
+    /** @var array<string, list<class-string>> */
     public array $called = [];
 
     /** @param array{LifecycleEventArgs} $args */
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php
index 03f2ef3d73..232c35343c 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php
@@ -624,7 +624,7 @@ public static function dataProviderTestWriteConcern(): array
         ];
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testExecuteInsertsRespectsWriteConcern(string $class, string|int $writeConcern): void
     {
@@ -646,7 +646,7 @@ public function testExecuteInsertsRespectsWriteConcern(string $class, string|int
         $this->dm->flush();
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testExecuteInsertsOmitsWriteConcernInTransaction(string $class, string|int $writeConcern): void
     {
@@ -668,7 +668,7 @@ public function testExecuteInsertsOmitsWriteConcernInTransaction(string $class,
         $this->dm->flush();
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testExecuteUpsertsRespectsWriteConcern(string $class, string|int $writeConcern): void
     {
@@ -691,7 +691,7 @@ public function testExecuteUpsertsRespectsWriteConcern(string $class, string|int
         $this->dm->flush();
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testExecuteUpsertsDoesNotUseWriteConcernInTransaction(string $class, string|int $writeConcern): void
     {
@@ -714,7 +714,7 @@ public function testExecuteUpsertsDoesNotUseWriteConcernInTransaction(string $cl
         $this->dm->flush();
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testRemoveRespectsWriteConcern(string $class, string|int $writeConcern): void
     {
@@ -739,7 +739,7 @@ public function testRemoveRespectsWriteConcern(string $class, string|int $writeC
         $this->dm->flush();
     }
 
-    /** @psalm-param class-string $class */
+    /** @param class-string $class */
     #[DataProvider('dataProviderTestWriteConcern')]
     public function testRemoveDoesNotUseWriteConcernInTransaction(string $class, string|int $writeConcern): void
     {
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php
index 1ad64db3aa..c1f2b70e9f 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php
@@ -14,7 +14,7 @@
 use MongoDB\Driver\WriteConcern;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-/** @psalm-type ReadPreferenceTagShape = array{dc?: string, usage?: string} */
+/** @phpstan-type ReadPreferenceTagShape array{dc?: string, usage?: string} */
 class ReadPreferenceTest extends BaseTestCase
 {
     public function setUp(): void
@@ -44,7 +44,7 @@ public function testHintIsNotSetByDefault(): void
         self::assertArrayNotHasKey(Query::HINT_READ_PREFERENCE, $groups->getHints());
     }
 
-    /** @psalm-param ReadPreferenceTagShape[] $tags */
+    /** @phpstan-param ReadPreferenceTagShape[] $tags */
     #[DataProvider('provideReadPreferenceHints')]
     public function testHintIsSetOnQuery(string $readPreference, array $tags = []): void
     {
@@ -101,7 +101,7 @@ public function testDocumentLevelReadPreferenceCanBeOverriddenInQueryBuilder():
         $this->assertReadPreferenceHint(ReadPreference::SECONDARY, $query->getQuery()['readPreference']);
     }
 
-    /** @psalm-param ReadPreferenceTagShape[] $tags */
+    /** @phpstan-param ReadPreferenceTagShape[] $tags */
     private function assertReadPreferenceHint(string $mode, ReadPreference $readPreference, array $tags = []): void
     {
         self::assertInstanceOf(ReadPreference::class, $readPreference);
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1152Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1152Test.php
index cfee336c63..050a36bcdb 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1152Test.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1152Test.php
@@ -49,11 +49,11 @@ class GH1152Parent
     public $child;
 }
 
-/** @psalm-import-type AssociationFieldMapping from ClassMetadata */
+/** @phpstan-import-type AssociationFieldMapping from ClassMetadata */
 #[ODM\EmbeddedDocument]
 class GH1152Child
 {
-    /** @psalm-var array{0: AssociationFieldMapping, 1: object|null, 2: string}|null */
+    /** @var array{0: AssociationFieldMapping, 1: object|null, 2: string}|null */
     public $parentAssociation;
 }
 
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
index 976b83a1ce..cb905e9acf 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
@@ -238,6 +238,7 @@ public function testEnumTypeMustPointToAnEnum(): void
         $this->expectExceptionMessage(
             'Attempting to map a non-enum type Documents\Card as an enum: ',
         );
+        // @phpstan-ignore-next-line
         $cm->mapField([
             'fieldName' => 'enum',
             'enumType' => Card::class,
@@ -257,6 +258,7 @@ public function testEnumTypeMustPointToABackedEnum(): void
         $this->expectExceptionMessage(
             'Attempting to map a non-backed enum Documents\SuitNonBacked: ',
         );
+        // @phpstan-ignore-next-line
         $cm->mapField([
             'fieldName' => 'enum',
             'enumType' => SuitNonBacked::class,
@@ -539,6 +541,7 @@ public function testSetFieldValueWithProxy(): void
 
         $proxy = $this->dm->getReference(Album::class, $document->getId());
         self::assertInstanceOf(GhostObjectInterface::class, $proxy);
+        self::assertInstanceOf(Album::class, $proxy);
 
         self::assertEquals('nevermind', $proxy->getName());
     }
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php b/tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php
index 0d7e2c1e0a..b8d3a6df42 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/QueryTest.php
@@ -420,11 +420,10 @@ public function testConstructorShouldThrowExceptionForInvalidType(): void
     {
         $this->expectException(InvalidArgumentException::class);
 
-        /** @psalm-suppress InvalidArgument */
         new Query($this->dm, new ClassMetadata(User::class), $this->getMockCollection(), ['type' => -1], []);
     }
 
-    /** @psalm-param Query::TYPE_* $type */
+    /** @param Query::TYPE_* $type */
     #[DataProvider('provideQueryTypesThatDoNotReturnAnIterator')]
     public function testGetIteratorShouldThrowExceptionWithoutExecutingForTypesThatDoNotReturnAnIterator(int $type, string $method): void
     {
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Repository/DefaultGridFSRepositoryTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Repository/DefaultGridFSRepositoryTest.php
index 51ba3d519a..6a65706c41 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/Repository/DefaultGridFSRepositoryTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/Repository/DefaultGridFSRepositoryTest.php
@@ -307,7 +307,6 @@ private function getRepository(string $className = File::class): GridFSRepositor
 
         assert($repository instanceof GridFSRepository);
 
-        /** @psalm-var GridFSRepository<T> */
         return $repository;
     }
 
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
index a8dc4e6563..cdd3cdf8ea 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
@@ -46,12 +46,12 @@
 use function in_array;
 
 /**
- * @psalm-import-type IndexMapping from ClassMetadata
- * @psalm-import-type IndexOptions from ClassMetadata
+ * @phpstan-import-type IndexMapping from ClassMetadata
+ * @phpstan-import-type IndexOptions from ClassMetadata
  */
 class SchemaManagerTest extends BaseTestCase
 {
-    /** @psalm-var list<class-string> */
+    /** @var list<class-string> */
     private array $indexedClasses = [
         CmsAddress::class,
         CmsArticle::class,
@@ -63,13 +63,13 @@ class SchemaManagerTest extends BaseTestCase
         ShardedOneWithDifferentKey::class,
     ];
 
-    /** @psalm-var list<class-string> */
+    /** @var list<class-string> */
     private array $searchIndexedClasses = [
         CmsAddress::class,
         CmsArticle::class,
     ];
 
-    /** @psalm-var list<class-string> */
+    /** @var list<class-string> */
     private array $views = [
         UserName::class,
     ];
@@ -167,7 +167,7 @@ public static function getIndexCreationWriteOptions(): array
         ];
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getIndexCreationWriteOptions')]
     public function testEnsureIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern, bool $background = false): void
     {
@@ -213,7 +213,7 @@ public function testEnsureIndexes(array $expectedWriteOptions, ?int $maxTimeMs,
         $this->schemaManager->ensureIndexes($maxTimeMs, $writeConcern, $background);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getIndexCreationWriteOptions')]
     public function testEnsureDocumentIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern, bool $background = false): void
     {
@@ -232,7 +232,7 @@ public function testEnsureDocumentIndexes(array $expectedWriteOptions, ?int $max
         $this->schemaManager->ensureDocumentIndexes(CmsArticle::class, $maxTimeMs, $writeConcern, $background);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getIndexCreationWriteOptions')]
     public function testEnsureDocumentIndexesForGridFSFile(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern, bool $background = false): void
     {
@@ -273,7 +273,7 @@ public function testEnsureDocumentIndexesForGridFSFile(array $expectedWriteOptio
         $this->schemaManager->ensureDocumentIndexes(File::class, $maxTimeMs, $writeConcern, $background);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getIndexCreationWriteOptions')]
     public function testEnsureDocumentIndexesWithTwoLevelInheritance(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern, bool $background = false): void
     {
@@ -287,7 +287,7 @@ public function testEnsureDocumentIndexesWithTwoLevelInheritance(array $expected
         $this->schemaManager->ensureDocumentIndexes(CmsProduct::class, $maxTimeMs, $writeConcern, $background);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testUpdateDocumentIndexesShouldCreateMappedIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -309,7 +309,7 @@ public function testUpdateDocumentIndexesShouldCreateMappedIndexes(array $expect
         $this->schemaManager->updateDocumentIndexes(CmsArticle::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testUpdateDocumentIndexesShouldDeleteUnmappedIndexesBeforeCreatingMappedIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -339,7 +339,7 @@ public function testUpdateDocumentIndexesShouldDeleteUnmappedIndexesBeforeCreati
         $this->schemaManager->updateDocumentIndexes(CmsArticle::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDeleteIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -362,7 +362,7 @@ public function testDeleteIndexes(array $expectedWriteOptions, ?int $maxTimeMs,
         $this->schemaManager->deleteIndexes($maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDeleteDocumentIndexes(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -576,7 +576,7 @@ public function testUpdateValidators(): void
         $this->schemaManager->updateValidators();
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testUpdateDocumentValidator(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -623,7 +623,7 @@ public function testUpdateDocumentValidatorShouldThrowExceptionForMappedSupercla
         $this->schemaManager->updateDocumentValidator($class->name);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testUpdateDocumentValidatorReset(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -644,7 +644,7 @@ public function testUpdateDocumentValidatorReset(array $expectedWriteOptions, ?i
         $this->schemaManager->updateDocumentValidator($class->name, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testCreateDocumentCollection(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -670,7 +670,7 @@ public function testCreateDocumentCollection(array $expectedWriteOptions, ?int $
         $this->schemaManager->createDocumentCollection(CmsArticle::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testCreateDocumentCollectionForFile(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -683,7 +683,7 @@ public function testCreateDocumentCollectionForFile(array $expectedWriteOptions,
         $this->schemaManager->createDocumentCollection(File::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testCreateDocumentCollectionWithValidator(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -724,7 +724,7 @@ public function testCreateDocumentCollectionWithValidator(array $expectedWriteOp
         $this->schemaManager->createDocumentCollection($cm->name, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testCreateView(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -760,7 +760,7 @@ public function testCreateView(array $expectedWriteOptions, ?int $maxTimeMs, ?Wr
         $this->schemaManager->createDocumentCollection(UserName::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testCreateCollections(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -787,7 +787,7 @@ public function testCreateCollections(array $expectedWriteOptions, ?int $maxTime
         self::assertSame(1, array_count_values($createdCollections)['Tournament']);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropCollections(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -800,7 +800,7 @@ public function testDropCollections(array $expectedWriteOptions, ?int $maxTimeMs
         $this->schemaManager->dropCollections($maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropDocumentCollection(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -818,7 +818,7 @@ public function testDropDocumentCollection(array $expectedWriteOptions, ?int $ma
         $this->schemaManager->dropDocumentCollection(CmsArticle::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropDocumentCollectionForGridFSFile(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -852,7 +852,7 @@ public function testDropDocumentCollectionForGridFSFile(array $expectedWriteOpti
         $this->schemaManager->dropDocumentCollection(File::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropView(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -870,7 +870,7 @@ public function testDropView(array $expectedWriteOptions, ?int $maxTimeMs, ?Writ
         $this->schemaManager->dropDocumentCollection(UserName::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropDocumentDatabase(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -889,7 +889,7 @@ public function testDropDocumentDatabase(array $expectedWriteOptions, ?int $maxT
         $this->schemaManager->dropDocumentDatabase(CmsArticle::class, $maxTimeMs, $writeConcern);
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     #[DataProvider('getWriteOptions')]
     public function testDropDatabases(array $expectedWriteOptions, ?int $maxTimeMs, ?WriteConcern $writeConcern): void
     {
@@ -905,7 +905,7 @@ public function testDropDatabases(array $expectedWriteOptions, ?int $maxTimeMs,
 
     /**
      * @param array<string, mixed> $mongoIndex
-     * @psalm-param IndexMapping $documentIndex
+     * @phpstan-param IndexMapping $documentIndex
      */
     #[DataProvider('dataIsMongoIndexEquivalentToDocumentIndex')]
     public function testIsMongoIndexEquivalentToDocumentIndex(bool $expected, array $mongoIndex, array $documentIndex): void
@@ -1123,7 +1123,7 @@ public static function dataIsMongoIndexEquivalentToDocumentIndex(): array
 
     /**
      * @param array<string, mixed> $mongoIndex
-     * @psalm-param IndexMapping $documentIndex
+     * @phpstan-param IndexMapping $documentIndex
      */
     #[DataProvider('dataIsMongoTextIndexEquivalentToDocumentIndex')]
     public function testIsMongoIndexEquivalentToDocumentIndexWithTextIndexes(bool $expected, array $mongoIndex, array $documentIndex): void
@@ -1316,7 +1316,7 @@ private function getMockDatabase()
         return $db;
     }
 
-    /** @psalm-param IndexOptions $expectedWriteOptions */
+    /** @phpstan-param IndexOptions $expectedWriteOptions */
     private function writeOptions(array $expectedWriteOptions): Constraint
     {
         return new Callback(static function (array $value) use ($expectedWriteOptions) {
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php b/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
index 81fac9bea7..e79c0ef931 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
@@ -511,8 +511,7 @@ public function testCommitsInProgressIsUpdatedOnException(): void
         try {
             $this->dm->flush();
         } catch (Throwable) {
-            $getCommitsInProgress = Closure::bind(fn (UnitOfWork $unitOfWork) => /** @psalm-suppress InaccessibleProperty */
-$unitOfWork->commitsInProgress, $this->dm->getUnitOfWork(), UnitOfWork::class);
+            $getCommitsInProgress = Closure::bind(fn (UnitOfWork $unitOfWork) => $unitOfWork->commitsInProgress, $this->dm->getUnitOfWork(), UnitOfWork::class);
 
             self::assertSame(0, $getCommitsInProgress($this->dm->getUnitOfWork()));