Merge 1.x into 2.x

Author: SonataCI

psalm.xml

@@ -15,5 +15,6 @@
         <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
         <DocblockTypeContradiction errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
+        <MissingClassConstType errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

src/Collection/AuditedCollection.php

@@ -297,8 +297,6 @@ public function exists(\Closure $p)
      *
      * @phpstan-param \Closure(T, TKey):bool $p
      * @phpstan-return Collection<TKey, T>
-     *
-     * @psalm-suppress MoreSpecificImplementedParamType https://github.com/doctrine/collections/pull/411
      */
     #[\ReturnTypeWillChange]
     public function filter(\Closure $p)
@@ -341,8 +339,6 @@ public function map(\Closure $func)
      *
      * @phpstan-param \Closure(TKey, T):bool $p
      * @phpstan-return array{0: Collection<TKey, T>, 1: Collection<TKey, T>}
-     *
-     * @psalm-suppress MoreSpecificImplementedParamType https://github.com/doctrine/collections/pull/411
      */
     #[\ReturnTypeWillChange]
     public function partition(\Closure $p)

src/EventListener/LogRevisionsListener.php

@@ -547,7 +547,7 @@ private function saveRevisionEntityData(EntityManagerInterface $em, ClassMetadat
                     $data = $entityData[$field] ?? null;
                     $relatedId = [];
 
-                    if (null !== $data && $uow->isInIdentityMap($data)) {
+                    if (\is_object($data) && $uow->isInIdentityMap($data)) {
                         $relatedId = $uow->getEntityIdentifier($data);
                     }
 
@@ -741,7 +741,7 @@ private function prepareUpdateData(EntityManagerInterface $em, EntityPersister $
 
             $newValId = null;
 
-            if (null !== $newVal) {
+            if (\is_object($newVal)) {
                 if (!$uow->isInIdentityMap($newVal)) {
                     continue;
                 }