try to fix remaining issues

doctrine · Mar 15, 2021 · b60db93 · b60db93
1 parent 00b3532
commit b60db93
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 31 deletions.
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -350,9 +350,8 @@ public function addNamedNativeQuery($name, $sql, Query\ResultSetMapping $rsm)
      *
      * @param string $name The name of the query.
      *
-     * @return array A tuple with the first element being the SQL string and the second
+     * @return array{string, ResultSetMapping} A tuple with the first element being the SQL string and the second
      *               element being the ResultSetMapping.
-     * @psalm-return array{string, ResultSetMapping}
      *
      * @throws ORMException
      */

diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
@@ -386,22 +386,21 @@ private function buildFieldMappings(ClassMetadataInfo $metadata)
      *
      * @param string $tableName
      *
-     * @return array
-     * @psalm-return array{
-     *                   fieldName: string,
-     *                   columnName: string,
-     *                   type: string,
-     *                   nullable: bool,
-     *                   options?: array{
-     *                       unsigned?: bool,
-     *                       fixed?: bool,
-     *                       comment?: string,
-     *                       default?: string
-     *                   },
-     *                   precision?: int,
-     *                   scale?: int,
-     *                   length?: int|null
-     *               }
+     * @return array{
+     *     fieldName: string,
+     *     columnName: string,
+     *     type: string,
+     *     nullable: bool,
+     *     options?: array{
+     *         unsigned?: bool,
+     *         fixed?: bool,
+     *         comment?: string,
+     *         default?: string
+     *     },
+     *     precision?: int,
+     *     scale?: int,
+     *     length?: int|null
+     * }
      */
     private function buildFieldMapping($tableName, Column $column)
     {

diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -240,15 +240,15 @@ public function getEntityManager()
      *
      * @param string $dqlAlias The DQL alias.
      *
-     * @return array
+     * @return mixed[]
      * @psalm-return array{
-     *                   metadata: ClassMetadata,
-     *                   parent: string,
-     *                   relation: mixed[],
-     *                   map: mixed,
-     *                   nestingLevel: int,
-     *                   token: array
-     *               }
+     *     metadata: ClassMetadata,
+     *     parent: string,
+     *     relation: mixed[],
+     *     map: mixed,
+     *     nestingLevel: int,
+     *     token: array
+     * }
      */
     public function getQueryComponent($dqlAlias)
     {

diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
@@ -690,9 +690,9 @@ public function getMaxResults()
      * The available parts are: 'select', 'from', 'join', 'set', 'where',
      * 'groupBy', 'having' and 'orderBy'.
      *
-     * @param string                             $dqlPartName The DQL part name.
-     * @param string|object|array An Expr object.
-     * @param bool                               $append      Whether to append (true) or replace (false).
+     * @param string              $dqlPartName The DQL part name.
+     * @param string|object|array $dqlPart     An Expr object.
+     * @param bool                $append      Whether to append (true) or replace (false).
      * @psalm-param string|object|list<string>|array{join: array<int|string, object>} $dqlPart
      *
      * @return self

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -590,7 +590,7 @@ private function executeExtraUpdates(): void
      *
      * @param object $entity
      *
-     * @return array[]
+     * @return mixed[][]
      * @psalm-return array<string, array{mixed, mixed}>
      */
     public function & getEntityChangeSet($entity)
@@ -2986,7 +2986,7 @@ public function getIdentityMap()
      *
      * @param object $entity
      *
-     * @return array[]
+     * @return mixed[][]
      * @psalm-return array<string, array<string, mixed>>
      */
     public function getOriginalEntityData($entity)