From 1596f81e984eaf92c8bcda3fa4c9181bf90fa9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Mon, 8 May 2023 16:15:35 +0200
Subject: [PATCH] Upgrade to Psalm 5

---
 composer.json           |  2 +-
 psalm.xml.dist          | 14 ++++++++++++++
 src/ArrayCollection.php |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 99ec24b0..36ad7f1a 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^5.11"
     },
     "autoload": {
         "psr-4": {
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 27ddd2f6..bf24a173 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -4,6 +4,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />
@@ -18,6 +20,18 @@
         <MixedArgumentTypeCoercion errorLevel="info" />
         <MixedAssignment errorLevel="info" />
 
+        <MixedInferredReturnType>
+            <errorLevel type="suppress">
+                <file name="src/AbstractLazyCollection.php"/>
+            </errorLevel>
+        </MixedInferredReturnType>
+
+        <MixedReturnStatement>
+            <errorLevel type="suppress">
+                <file name="src/AbstractLazyCollection.php"/>
+            </errorLevel>
+        </MixedReturnStatement>
+
         <PossiblyNullArgument>
             <errorLevel type="suppress">
                 <!-- Remove when https://github.com/vimeo/psalm/pull/7759 is released -->
diff --git a/src/ArrayCollection.php b/src/ArrayCollection.php
index d8c569a8..6ec9b540 100644
--- a/src/ArrayCollection.php
+++ b/src/ArrayCollection.php
@@ -432,6 +432,7 @@ public function partition(Closure $p)
      * Returns a string representation of this object.
      * {@inheritDoc}
      */
+    #[ReturnTypeWillChange]
     public function __toString()
     {
         return self::class . '@' . spl_object_hash($this);