Make phpdoc type correct

doctrine · Mar 16, 2021 · d6f926d · d6f926d
1 parent 5247c56
commit d6f926d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -796,7 +796,7 @@ public function getResult($hydrationMode = self::HYDRATE_OBJECT)
      *
      * Alias for execute(null, HYDRATE_ARRAY).
      *
-     * @return array<int,mixed>
+     * @return mixed[]
      */
     public function getArrayResult()
     {
@@ -808,7 +808,7 @@ public function getArrayResult()
      *
      * Alias for execute(null, HYDRATE_SCALAR).
      *
-     * @return array<int,mixed>
+     * @return mixed[]
      */
     public function getScalarResult()
     {

diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php
@@ -428,7 +428,7 @@ private function getAssociationValue(ResultSetMapping $rsm, $assocAlias, $entity
      * @param mixed        $value
      * @param array<mixed> $path
      *
-     * @return array<object>|object|null
+     * @return mixed
      */
     private function getAssociationPathValue($value, array $path)
     {

diff --git a/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php b/lib/Doctrine/ORM/Cache/Region/FileLockRegion.php
@@ -59,7 +59,7 @@ class FileLockRegion implements ConcurrentRegion
     /** @var string */
     private $directory;
 
-    /** @var int */
+    /** @var string */
     private $lockLifetime;
 
     /**

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1482,7 +1482,7 @@ protected function _validateAndCompleteFieldMapping(array &$mapping)
      *                   isCascadeRefresh: bool,
      *                   isCascadeMerge: bool,
      *                   isCascadeDetach: bool,
-     *                   orphanRemoval: bool
+     *                   ?orphanRemoval: bool
      *               }
      */
     protected function _validateAndCompleteAssociationMapping(array $mapping)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -2892,7 +2892,7 @@ public function ArithmeticFactor()
      *          | FunctionsReturningDatetime | IdentificationVariable | ResultVariable
      *          | InputParameter | CaseExpression
      *
-     * @return Node
+     * @return Node|string
      */
     public function ArithmeticPrimary()
     {

diff --git a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
@@ -293,7 +293,7 @@ private function formatMappings(array $propertyMappings): array
      *
      * @return string[]
      *
-     * @psalm-param list<class-string> $entityListeners
+     * @psalm-param list<object> $entityListeners
      * @psalm-return array{0: string, 1: string}
      */
     private function formatEntityListeners(array $entityListeners): array

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
@@ -244,8 +244,8 @@ protected function yamlDump($array, $inline = 2)
     }
 
     /**
-     * @psalm-param array{entityListeners: array<class-string, array<string, array{string}>>} $array
-     * @psalm-return array{entityListeners: array<class-string, array<string, array{string}>>}
+     * @psalm-param array<string, mixed> $array
+     * @psalm-return array<string, mixed>&array{entityListeners: array<class-string, array<string, array{string}>>}
      */
     private function processEntityListeners(ClassMetadataInfo $metadata, array $array): array
     {

diff --git a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php
@@ -132,7 +132,7 @@ public function count()
     /**
      * {@inheritdoc}
      *
-     * @return ArrayIterator<mixed, T>
+     * @return ArrayIterator<int|string, T>
      */
     public function getIterator()
     {

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -125,7 +125,7 @@ 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, list<object>>
+     * @psalm-var array<class-string, array<string, object|null>>
      */
     private $identityMap = [];
 
@@ -2976,7 +2976,7 @@ public function loadCollection(PersistentCollection $collection)
     /**
      * Gets the identity map of the UnitOfWork.
      *
-     * @psalm-return array<class-string, list<object>>
+     * @psalm-return array<class-string, array<string, object|null>>
      */
     public function getIdentityMap()
     {