Add more specific doc block type hints for arrays.

lib/Doctrine/Persistence/ManagerRegistry.php

@@ -26,7 +26,7 @@ public function getManager(?string $name = null) : ObjectManager;
     /**
      * Gets an array of all registered object managers.
      *
-     * @return ObjectManager[] An array of ObjectManager instances
+     * @return array<string, ObjectManager> An array of ObjectManager instances
      */
     public function getManagers() : array;
 

lib/Doctrine/Persistence/Mapping/AbstractClassMetadataFactory.php

@@ -34,7 +34,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
     /** @var Cache|null */
     private $cacheDriver;
 
-    /** @var ClassMetadata[] */
+    /** @var array<string, ClassMetadata> */
     private $loadedMetadata = [];
 
     /** @var bool */
@@ -73,7 +73,7 @@ public function getLoadedMetadata() : array
      * Forces the factory to load the metadata of all classes known to the underlying
      * mapping driver.
      *
-     * @return ClassMetadata[] The ClassMetadata instances of all mapped classes.
+     * @return array<int, ClassMetadata> The ClassMetadata instances of all mapped classes.
      */
     public function getAllMetadata() : array
     {
@@ -222,7 +222,7 @@ public function setMetadataFor(string $className, ClassMetadata $class) : void
     /**
      * Gets an array of parent classes for the given entity class.
      *
-     * @return string[]
+     * @return array<int, string>
      */
     protected function getParentClasses(string $name) : array
     {
@@ -255,7 +255,7 @@ protected function getParentClasses(string $name) : array
      *
      * @param string $name The name of the class for which the metadata should get loaded.
      *
-     * @return string[]
+     * @return array<int, string>
      */
     protected function loadMetadata(string $name) : array
     {
@@ -323,8 +323,7 @@ protected function onNotFoundMetadata(string $className) : ?ClassMetadata
     /**
      * Actually loads the metadata from the underlying metadata.
      *
-     * @param string[] $nonSuperclassParents All parent class names
-     *                                       that are not marked as mapped superclasses.
+     * @param array<int, string> $nonSuperclassParents All parent class names that are not marked as mapped superclasses.
      */
     abstract protected function doLoadMetadata(
         ClassMetadata $class,

lib/Doctrine/Persistence/Mapping/ClassMetadata.php

@@ -21,7 +21,7 @@ public function getName() : string;
      *
      * The returned structure is an array of the identifier field names.
      *
-     * @return mixed[]
+     * @return array<int, string>
      */
     public function getIdentifier() : array;
 
@@ -108,7 +108,7 @@ public function getAssociationMappedByTargetField(string $associationName) : str
      *
      * Has to return an empty array if no identifier isset.
      *
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     public function getIdentifierValues(object $object) : array;
 }

lib/Doctrine/Persistence/Mapping/ClassMetadataFactory.php

@@ -13,7 +13,7 @@ interface ClassMetadataFactory
      * Forces the factory to load the metadata of all classes known to the underlying
      * mapping driver.
      *
-     * @return ClassMetadata[] The ClassMetadata instances of all mapped classes.
+     * @return array<int, ClassMetadata> The ClassMetadata instances of all mapped classes.
      */
     public function getAllMetadata() : array;
 

lib/Doctrine/Persistence/Mapping/Driver/FileDriver.php

@@ -124,19 +124,16 @@ public function getAllClassNames() : array
             return $this->locator->getAllClassNames($this->globalBasename);
         }
 
-        /** @var ClassMetadata[] $classCache */
+        /** @var array<string, ClassMetadata> $classCache */
         $classCache = $this->classCache;
 
-        /** @var string[] $keys */
+        /** @var array<int, string> $keys */
         $keys = array_keys($classCache);
 
-        /** @var string[] $merged */
-        $merged = array_unique(array_merge(
+        return array_unique(array_merge(
             $keys,
             $this->locator->getAllClassNames($this->globalBasename)
         ));
-
-        return $merged;
     }
 
     /**

lib/Doctrine/Persistence/Mapping/Driver/MappingDriverChain.php

@@ -23,7 +23,7 @@ class MappingDriverChain implements MappingDriver
      */
     private $defaultDriver;
 
-    /** @var MappingDriver[] */
+    /** @var array<string, MappingDriver> */
     private $drivers = [];
 
     /**
@@ -53,7 +53,7 @@ public function addDriver(MappingDriver $nestedDriver, string $namespace) : void
     /**
      * Gets the array of nested drivers.
      *
-     * @return MappingDriver[] $drivers
+     * @return array<string, MappingDriver> $drivers
      */
     public function getDrivers() : array
     {

lib/Doctrine/Persistence/Mapping/MappingException.php

@@ -14,7 +14,7 @@
 class MappingException extends Exception
 {
     /**
-     * @param string[] $namespaces
+     * @param array<int, string> $namespaces
      */
     public static function classNotFoundInNamespaces(
         string $className,

lib/Doctrine/Persistence/ObjectRepository.php

@@ -23,7 +23,7 @@ public function find($id) : ?object;
     /**
      * Finds all objects in the repository.
      *
-     * @return object[] The objects.
+     * @return array<int, object> The objects.
      */
     public function findAll() : array;
 
@@ -34,10 +34,10 @@ public function findAll() : array;
      * an UnexpectedValueException if certain values of the sorting or limiting details are
      * not supported.
      *
-     * @param mixed[]       $criteria
-     * @param string[]|null $orderBy
+     * @param array<string, mixed>  $criteria
+     * @param array<string, string> $orderBy
      *
-     * @return object[] The objects.
+     * @return array<int, object> The objects.
      *
      * @throws UnexpectedValueException
      */
@@ -51,7 +51,7 @@ public function findBy(
     /**
      * Finds a single object by a set of criteria.
      *
-     * @param mixed[] $criteria The criteria.
+     * @param array<string, mixed> $criteria The criteria.
      *
      * @return object|null The object.
      */