Fix cs by hand

lib/Doctrine/ORM/AbstractQuery.php

@@ -1007,8 +1007,8 @@ public function toIterable(iterable $parameters = [], $hydrationMode = null): it
     /**
      * Executes the query.
      *
-     * @param ArrayCollection|array|null $parameters    Query parameters.
-     * @param string|int|null            $hydrationMode Processing mode to be used during the hydration process.
+     * @param ArrayCollection|mixed[]|null $parameters    Query parameters.
+     * @param string|int|null              $hydrationMode Processing mode to be used during the hydration process.
      *
      * @return mixed
      */

lib/Doctrine/ORM/Cache/CacheFactory.php

@@ -49,7 +49,7 @@ public function buildCachedEntityPersister(EntityManagerInterface $em, EntityPer
      *
      * @param EntityManagerInterface $em        The entity manager.
      * @param CollectionPersister    $persister The collection persister that will be cached.
-     * @param array                  $mapping   The association mapping.
+     * @param mixed[]                $mapping   The association mapping.
      *
      * @return CachedCollectionPersister
      */
@@ -79,7 +79,7 @@ public function buildEntityHydrator(EntityManagerInterface $em, ClassMetadata $m
      * Build a collection hydrator
      *
      * @param EntityManagerInterface $em      The Entity manager.
-     * @param array                  $mapping The association mapping.
+     * @param mixed[]                $mapping The association mapping.
      *
      * @return CollectionHydrator The built collection hydrator.
      */

lib/Doctrine/ORM/Cache/CollectionHydrator.php

@@ -32,7 +32,7 @@ interface CollectionHydrator
     /**
      * @param ClassMetadata      $metadata   The entity metadata.
      * @param CollectionCacheKey $key        The cached collection key.
-     * @param array|Collection   $collection The collection.
+     * @param mixed[]|Collection $collection The collection.
      *
      * @return CollectionCacheEntry
      */

lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php

@@ -41,7 +41,7 @@ class DefaultCollectionHydrator implements CollectionHydrator
     /** @var UnitOfWork */
     private $uow;
 
-    /** @var array */
+    /** @var array<string,mixed> */
     private static $hints = [Query::HINT_CACHE_ENABLED => true];
 
     /**

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

@@ -50,7 +50,7 @@ class DefaultEntityHydrator implements EntityHydrator
      */
     private $identifierFlattener;
 
-    /** @var array */
+    /** @var array<string,mixed> */
     private static $hints = [Query::HINT_CACHE_ENABLED => true];
 
     /**

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

@@ -62,7 +62,7 @@ class DefaultQueryCache implements QueryCache
     /** @var CacheLogger */
     protected $cacheLogger;
 
-    /** @var array */
+    /** @var array<string,mixed> */
     private static $hints = [Query::HINT_CACHE_ENABLED => true];
 
     /**
@@ -304,7 +304,8 @@ public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $h
                 // root entity association
                 if ($rootAlias === $parentAlias) {
                     // Cancel put result if association put fail
-                    if (($assocInfo = $this->storeAssociationCache($key, $assoc, $assocValue)) === null) {
+                    $assocInfo = $this->storeAssociationCache($key, $assoc, $assocValue);
+                    if ($assocInfo === null) {
                         return false;
                     }
 
@@ -337,8 +338,8 @@ public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $h
     }
 
     /**
-     * @param array $assoc
-     * @param mixed $assocValue
+     * @param array<string,mixed> $assoc
+     * @param mixed               $assocValue
      *
      * @return mixed[]|null
      *

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

@@ -57,10 +57,10 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
     /** @var ClassMetadata */
     protected $targetEntity;
 
-    /** @var array */
+    /** @var mixed[] */
     protected $association;
 
-     /** @var array */
+     /** @var mixed[] */
     protected $queuedCache = [];
 
     /** @var Region */
@@ -79,7 +79,7 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
      * @param CollectionPersister    $persister   The collection persister that will be cached.
      * @param Region                 $region      The collection region.
      * @param EntityManagerInterface $em          The entity manager.
-     * @param array                  $association The association mapping.
+     * @param mixed[]                $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, Region $region, EntityManagerInterface $em, array $association)
     {

lib/Doctrine/ORM/Cache/Persister/Collection/CachedCollectionPersister.php

@@ -52,7 +52,7 @@ public function loadCollectionCache(PersistentCollection $collection, Collection
     /**
      * Stores a collection into cache
      *
-     * @param array|Collection $elements
+     * @param mixed[]|Collection $elements
      *
      * @return void
      */

lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php

@@ -34,7 +34,7 @@ class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister
      * @param CollectionPersister    $persister   The collection persister that will be cached.
      * @param ConcurrentRegion       $region      The collection region.
      * @param EntityManagerInterface $em          The entity manager.
-     * @param array                  $association The association mapping.
+     * @param mixed[]                $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, ConcurrentRegion $region, EntityManagerInterface $em, array $association)
     {

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

@@ -57,7 +57,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
     /** @var ClassMetadata */
     protected $class;
 
-     /** @var array */
+     /** @var mixed[] */
     protected $queuedCache = [];
 
     /** @var Region */

lib/Doctrine/ORM/Cache/QueryCache.php

@@ -34,15 +34,15 @@ interface QueryCache
     public function clear();
 
     /**
-     * @param mixed $result
-     * @param array $hints
+     * @param mixed   $result
+     * @param mixed[] $hints
      *
      * @return bool
      */
     public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = []);
 
     /**
-     * @param array $hints
+     * @param mixed[] $hints
      *
      * @return array|null
      */

lib/Doctrine/ORM/Cache/Region/FileLockRegion.php

@@ -53,17 +53,13 @@ class FileLockRegion implements ConcurrentRegion
 {
     public const LOCK_EXTENSION = 'lock';
 
-    /**
-     * var \Doctrine\ORM\Cache\Region
-     */
+    /** @var Region */
     private $region;
 
     /** @var string */
     private $directory;
 
-    /**
-     * var integer
-     */
+    /** @var int */
     private $lockLifetime;
 
     /**
@@ -267,10 +263,6 @@ public function unlock(CacheKey $key, Lock $lock)
             return false;
         }
 
-        if (! @unlink($this->getLockFileName($key))) {
-            return false;
-        }
-
-        return true;
+        return @unlink($this->getLockFileName($key));
     }
 }

lib/Doctrine/ORM/Cache/RegionsConfiguration.php

@@ -25,10 +25,10 @@
  */
 class RegionsConfiguration
 {
-    /** @var array */
+    /** @var array<string,int> */
     private $lifetimes = [];
 
-    /** @var array */
+    /** @var array<string,int> */
     private $lockLifetimes = [];
 
     /** @var int */

lib/Doctrine/ORM/EntityManager.php

@@ -354,7 +354,7 @@ public function createQueryBuilder()
      * If an entity is explicitly passed to this method only this entity and
      * the cascade-persist semantics + scheduled inserts/removals are synchronized.
      *
-     * @param object|array|null $entity
+     * @param object|mixed[]|null $entity
      *
      * @return void
      *

lib/Doctrine/ORM/EntityRepository.php

@@ -32,6 +32,7 @@
 
 use function array_slice;
 use function lcfirst;
+use function sprintf;
 use function strpos;
 use function substr;
 use function trigger_error;
@@ -238,7 +239,7 @@ public function count(array $criteria)
      * @return mixed The returned value from the resolved method.
      *
      * @throws ORMException
-     * @throws BadMethodCallException If the method called is invalid
+     * @throws BadMethodCallException If the method called is invalid.
      */
     public function __call($method, $arguments)
     {
@@ -254,10 +255,11 @@ public function __call($method, $arguments)
             return $this->resolveMagicCall('count', substr($method, 7), $arguments);
         }
 
-        throw new BadMethodCallException(
-            "Undefined method '$method'. The method name must start with " .
-            'either findBy, findOneBy or countBy!'
-        );
+        throw new BadMethodCallException(sprintf(
+            'Undefined method "%s". The method name must start with ' .
+            'either findBy, findOneBy or countBy!',
+            $method
+        ));
     }
 
     /**
@@ -316,7 +318,7 @@ public function matching(Criteria $criteria)
      *
      * @return mixed
      *
-     * @throws ORMException If the method called is invalid or the requested field/association does not exist
+     * @throws ORMException If the method called is invalid or the requested field/association does not exist.
      */
     private function resolveMagicCall($method, $by, array $arguments)
     {

lib/Doctrine/ORM/Event/PreUpdateEventArgs.php

@@ -31,12 +31,12 @@
  */
 class PreUpdateEventArgs extends LifecycleEventArgs
 {
-    /** @var array */
+    /** @var array<string,array<int,mixed>> */
     private $entityChangeSet;
 
     /**
-     * @param object $entity
-     * @param array  $changeSet
+     * @param object                         $entity
+     * @param array<string,array<int,mixed>> $changeSet
      */
     public function __construct($entity, EntityManagerInterface $em, array &$changeSet)
     {

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -307,9 +307,9 @@ abstract protected function hydrateAllData();
      * field names during this procedure as well as any necessary conversions on
      * the values applied. Scalar values are kept in a specific key 'scalars'.
      *
-     * @param array $data                SQL Result Row.
-     * @param array &$id                 Dql-Alias => ID-Hash.
-     * @param array &$nonemptyComponents Does this DQL-Alias has at least one non NULL value?
+     * @param mixed[] $data                SQL Result Row.
+     * @param array   &$id                 Dql-Alias => ID-Hash.
+     * @param array   &$nonemptyComponents Does this DQL-Alias has at least one non NULL value?
      *
      * @return array<string, array<string, mixed>> An array with all the fields
      *                                             (name => value) of the data
@@ -560,8 +560,8 @@ protected function getClassMetadata($className)
     /**
      * Register entity as managed in UnitOfWork.
      *
-     * @param object $entity
-     * @param array  $data
+     * @param object  $entity
+     * @param mixed[] $data
      *
      * @return void
      *

lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php

@@ -35,19 +35,19 @@
  */
 class ArrayHydrator extends AbstractHydrator
 {
-    /** @var array */
+    /** @var array<string,bool> */
     private $_rootAliases = [];
 
     /** @var bool */
     private $_isSimpleQuery = false;
 
-    /** @var array */
+    /** @var mixed[] */
     private $_identifierMap = [];
 
-    /** @var array */
+    /** @var mixed[] */
     private $_resultPointers = [];
 
-    /** @var array */
+    /** @var array<string,string> */
     private $_idTemplate = [];
 
     /** @var int */
@@ -259,7 +259,7 @@ protected function hydrateRowData(array $row, array &$result)
      * Updates the result pointer for an Entity. The result pointers point to the
      * last seen instance of each Entity type. This is used for graph construction.
      *
-     * @param array    $coll     The element.
+     * @param mixed[]  $coll     The element.
      * @param bool|int $index    Index of the element in the collection.
      * @param string   $dqlAlias
      * @param bool     $oneToOne Whether it is a single-valued association or not.

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

@@ -43,25 +43,25 @@
  */
 class ObjectHydrator extends AbstractHydrator
 {
-    /** @var array */
+    /** @var mixed[] */
     private $identifierMap = [];
 
-    /** @var array */
+    /** @var mixed[] */
     private $resultPointers = [];
 
-    /** @var array */
+    /** @var mixed[] */
     private $idTemplate = [];
 
     /** @var int */
     private $resultCounter = 0;
 
-    /** @var array */
+    /** @var mixed[] */
     private $rootAliases = [];
 
-    /** @var array */
+    /** @var mixed[] */
     private $initializedCollections = [];
 
-    /** @var array */
+    /** @var mixed[] */
     private $existingCollections = [];
 
     /**

lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php

@@ -38,7 +38,7 @@ final class HydrationCompleteHandler
     /** @var EntityManagerInterface */
     private $em;
 
-    /** @var array[] */
+    /** @var mixed[][] */
     private $deferredPostLoadInvocations = [];
 
     /**

lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php

@@ -28,18 +28,18 @@ class AssociationBuilder
     /** @var ClassMetadataBuilder */
     protected $builder;
 
-    /** @var array */
+    /** @var mixed[] */
     protected $mapping;
 
-    /** @var array|null */
+    /** @var mixed[]|null */
     protected $joinColumns;
 
     /** @var int */
     protected $type;
 
     /**
-     * @param array $mapping
-     * @param int   $type
+     * @param mixed[] $mapping
+     * @param int     $type
      */
     public function __construct(ClassMetadataBuilder $builder, array $mapping, $type)
     {