From 3c98973ab39c0ae34c0e8e20db95d77e2a7b031b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 12 Jan 2023 17:42:11 +0100
Subject: [PATCH] Use more accurate phpdoc for OptimisticLockException

While working on migrating this part of the codebase to PHP 8, I found
phpdoc that is wrong.
---
 lib/Doctrine/ORM/OptimisticLockException.php | 16 ++++++++--------
 phpstan-baseline.neon                        |  5 -----
 psalm-baseline.xml                           |  3 +--
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/Doctrine/ORM/OptimisticLockException.php b/lib/Doctrine/ORM/OptimisticLockException.php
index 5b652b89e09..1b350bde400 100644
--- a/lib/Doctrine/ORM/OptimisticLockException.php
+++ b/lib/Doctrine/ORM/OptimisticLockException.php
@@ -13,12 +13,12 @@
  */
 class OptimisticLockException extends ORMException
 {
-    /** @var object|null */
+    /** @var object|string|null */
     private $entity;
 
     /**
-     * @param string      $msg
-     * @param object|null $entity
+     * @param string             $msg
+     * @param object|string|null $entity
      */
     public function __construct($msg, $entity)
     {
@@ -30,7 +30,7 @@ public function __construct($msg, $entity)
     /**
      * Gets the entity that caused the exception.
      *
-     * @return object|null
+     * @return object|string|null
      */
     public function getEntity()
     {
@@ -38,7 +38,7 @@ public function getEntity()
     }
 
     /**
-     * @param object $entity
+     * @param object|class-string $entity
      *
      * @return OptimisticLockException
      */
@@ -48,9 +48,9 @@ public static function lockFailed($entity)
     }
 
     /**
-     * @param object                $entity
-     * @param int|DateTimeInterface $expectedLockVersion
-     * @param int|DateTimeInterface $actualLockVersion
+     * @param object                       $entity
+     * @param int|string|DateTimeInterface $expectedLockVersion
+     * @param int|string|DateTimeInterface $actualLockVersion
      *
      * @return OptimisticLockException
      */
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 05365d2e1f9..58e09b616db 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -440,11 +440,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/SqlWalker.php
 
-		-
-			message: "#^Parameter \\#1 \\$entity of static method Doctrine\\\\ORM\\\\OptimisticLockException\\:\\:lockFailed\\(\\) expects object, class\\-string\\<object\\> given\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
-
 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 6b371a6383a..8dd060e6804 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2216,12 +2216,11 @@
     <ImplicitToStringCast occurrences="1">
       <code>$expr</code>
     </ImplicitToStringCast>
-    <InvalidArgument occurrences="5">
+    <InvalidArgument occurrences="4">
       <code>$assoc</code>
       <code>$condExpr</code>
       <code>$condTerm</code>
       <code>$factor</code>
-      <code>$selectedClass['class']-&gt;name</code>
     </InvalidArgument>
     <InvalidNullableReturnType occurrences="1">
       <code>string</code>