Fixes

doctrine · Apr 18, 2021 · 64bb314 · 64bb314
1 parent f47aa2c
commit 64bb314
Show file tree

Hide file tree

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

diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
@@ -386,7 +386,8 @@ private function buildFieldMappings(ClassMetadataInfo $metadata)
      *
      * @param string $tableName
      *
-     * @return array{
+     * @return mixed[]
+     * @psalm-return array{
      *     fieldName: string,
      *     columnName: string,
      *     type: string,

diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
@@ -620,7 +620,7 @@ public function __sleep(): array
      * @param int      $offset
      * @param int|null $length
      *
-     * @return T[]
+     * @return mixed[]
      * @psalm-return array<TKey,T>
      */
     public function slice($offset, $length = null)

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -1930,7 +1930,7 @@ private function getTypes($field, $value, ClassMetadata $class)
      *
      * @param mixed $value
      *
-     * @return array{mixed}
+     * @return mixed[]
      */
     private function getValues($value)
     {

diff --git a/lib/Doctrine/ORM/Query/Expr/Base.php b/lib/Doctrine/ORM/Query/Expr/Base.php
@@ -60,7 +60,7 @@ public function __construct($args = [])
     }
 
     /**
-     * @param array $args
+     * @param string[]|object[] $args
      * @psalm-param list<string|object> $args
      *
      * @return static

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -555,7 +555,7 @@ public function semanticalError($message = '', $token = null)
      *
      * @param bool $resetPeek Reset peek after finding the closing parenthesis.
      *
-     * @return mixed[]| null
+     * @return mixed[]|null
      * @psalm-return array<string, mixed>| null
      */
     private function peekBeyondClosingParenthesis(bool $resetPeek = true)