Review

doctrine · Oct 9, 2024 · 64904ba · 64904ba
1 parent 56fe112
commit 64904ba
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php
@@ -29,8 +29,8 @@
  * Fluent interface for building aggregation pipelines.
  *
  * @phpstan-import-type SortShape from Sort
- * @phpstan-import-type StageExpression from Stage
- * @phpstan-type PipelineExpression list<array<string, mixed>>
+ * @phpstan-type StageExpression array<string, mixed>
+ * @phpstan-type PipelineExpression list<StageExpression>
  */
 class Builder
 {

diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php
@@ -14,8 +14,8 @@
  *
  * @internal
  *
- * @phpstan-type PipelineExpression list<array<string, mixed>>
- * @phpstan-type StageExpression array<string, mixed>
+ * @phpstan-import-type PipelineExpression from Builder
+ * @phpstan-import-type StageExpression from Builder
  */
 abstract class Stage
 {

diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php
@@ -19,15 +19,15 @@
  * @phpstan-import-type PipelineExpression from Builder
  * @phpstan-type PipelineParamType Builder|Stage|PipelineExpression
  * @phpstan-type LookupStageExpression array{
- *     "$lookup": array{
+ *     '$lookup': array{
  *         from: string,
  *         'as'?: string,
  *         localField?: string,
  *         foreignField?: string,
  *         pipeline?: PipelineExpression,
  *         let?: array<string, mixed>,
  *     }
- *   }
+ * }
  */
 class Lookup extends Stage
 {

diff --git a/lib/Doctrine/ODM/MongoDB/DocumentManager.php b/lib/Doctrine/ODM/MongoDB/DocumentManager.php
@@ -653,11 +653,10 @@ public function getPartialReference(string $documentName, $identifier): object
      *
      * This is just a convenient shortcut for getRepository($documentName)->find($id).
      *
-     * @param string          $className
+     * @param class-string<T> $className
      * @param mixed           $id
      * @param int             $lockMode
      * @param int             $lockVersion
-     * @param class-string<T> $className
      *
      * @return T|null
      *

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -2014,8 +2014,7 @@ public function isInheritanceTypeCollectionPerClass(): bool
     /**
      * Sets the mapped subclasses of this class.
      *
-     * @param string[]       $subclasses The names of all mapped subclasses.
-     * @param class-string[] $subclasses
+     * @param class-string[] $subclasses The names of all mapped subclasses.
      */
     public function setSubclasses(array $subclasses): void
     {