Fix some static analysis issues

composer.json

@@ -28,7 +28,7 @@
         "doctrine/inflector": "^1.4|^2.0",
         "doctrine/instantiator": "^1.3",
         "doctrine/lexer": "^1.0",
-        "doctrine/persistence": "^2.0",
+        "doctrine/persistence": "^2.2",
         "symfony/console": "^3.0|^4.0|^5.0"
     },
     "require-dev": {

lib/Doctrine/ORM/Cache/EntityCacheEntry.php

@@ -40,12 +40,14 @@ class EntityCacheEntry implements CacheEntry
      * READ-ONLY: Public only for performance reasons, it should be considered immutable.
      *
      * @var string The entity class name
+     * @psalm-var class-string
      */
     public $class;
 
     /**
      * @param string              $class The entity class.
      * @param array<string,mixed> $data  The entity data.
+     * @psalm-param class-string $class
      */
     public function __construct($class, array $data)
     {

lib/Doctrine/ORM/EntityManager.php

@@ -293,9 +293,7 @@ public function rollback()
      *
      * Internal note: Performance-sensitive method.
      *
-     * @param string $className
-     *
-     * @return ClassMetadata
+     * {@inheritDoc}
      */
     public function getClassMetadata($className)
     {

lib/Doctrine/ORM/EntityManagerInterface.php

@@ -34,7 +34,6 @@
 /**
  * EntityManager interface
  *
- * @method Mapping\ClassMetadata getClassMetadata($className)
  * @method Mapping\ClassMetadataFactory getMetadataFactory()
  */
 interface EntityManagerInterface extends ObjectManager
@@ -306,4 +305,16 @@ public function isFiltersStateClean();
      * @return bool True, if the EM has a filter collection.
      */
     public function hasFilters();
+
+    /**
+     * {@inheritDoc}
+     *
+     * @psalm-param string|class-string<T> $className
+     *
+     * @return Mapping\ClassMetadata
+     * @psalm-return Mapping\ClassMetadata<T>
+     *
+     * @template T of object
+     */
+    public function getClassMetadata($className);
 }

lib/Doctrine/ORM/Mapping/ClassMetadata.php

@@ -24,6 +24,8 @@
  * {@inheritDoc}
  *
  * @todo remove or rename ClassMetadataInfo to ClassMetadata
+ * @template T of object
+ * @template-extends ClassMetadataInfo<T>
  */
 class ClassMetadata extends ClassMetadataInfo
 {

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -749,6 +749,7 @@ protected function initializeReflection(ClassMetadataInterface $class, Reflectio
      */
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
+        /** @psalm-var class-string */
         return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
     }
 

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -72,6 +72,9 @@
  * 2) To drastically reduce the size of a serialized instance (private/protected members
  *    get the whole class name, namespace inclusive, prepended to every property in
  *    the serialized representation).
+ *
+ * @template T of object
+ * @template-implements ClassMetadata<T>
  */
 class ClassMetadataInfo implements ClassMetadata
 {
@@ -235,6 +238,7 @@ class ClassMetadataInfo implements ClassMetadata
      * READ-ONLY: The name of the entity class.
      *
      * @var string
+     * @psalm-var class-string<T>
      */
     public $name;
 

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

@@ -875,16 +875,19 @@ protected function loadMappingFile($file)
 
         if (isset($xmlElement->entity)) {
             foreach ($xmlElement->entity as $entityElement) {
+                /** @psalm-var class-string */
                 $entityName          = (string) $entityElement['name'];
                 $result[$entityName] = $entityElement;
             }
         } elseif (isset($xmlElement->{'mapped-superclass'})) {
             foreach ($xmlElement->{'mapped-superclass'} as $mappedSuperClass) {
+                /** @psalm-var class-string */
                 $className          = (string) $mappedSuperClass['name'];
                 $result[$className] = $mappedSuperClass;
             }
         } elseif (isset($xmlElement->embeddable)) {
             foreach ($xmlElement->embeddable as $embeddableElement) {
+                /** @psalm-var class-string */
                 $embeddableName          = (string) $embeddableElement['name'];
                 $result[$embeddableName] = $embeddableElement;
             }

lib/Doctrine/ORM/Mapping/Reflection/ReflectionPropertiesGetter.php

@@ -76,6 +76,7 @@ public function getProperties($className)
 
     /**
      * @param string $className
+     * @psalm-param class-string $className
      *
      * @return ReflectionClass[]
      * @psalm-return list<ReflectionClass>

lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php

@@ -149,6 +149,7 @@ private function displayEntity($entityName, EntityManagerInterface $entityManage
      * Return all mapped entity class names
      *
      * @return string[]
+     * @psalm-return class-string[]
      */
     private function getMappedEntities(EntityManagerInterface $entityManager): array
     {

lib/Doctrine/ORM/UnitOfWork.php

@@ -298,7 +298,7 @@ class UnitOfWork implements PropertyChangedListener
     /**
      * Map of Entity Class-Names and corresponding IDs that should eager loaded when requested.
      *
-     * @psalm-var array<string, array<string, mixed>>
+     * @psalm-var array<class-string, array<string, mixed>>
      */
     private $eagerLoadingEntities = [];
 
@@ -2630,6 +2630,7 @@ private function newInstance($class)
      *
      * @param string  $className The name of the entity class.
      * @param mixed[] $data      The data for the entity.
+     * @psalm-param class-string $className
      * @psalm-param array<string, mixed> $hints Any hints to account for during reconstitution/lookup of the entity.
      *
      * @return object The managed entity instance.