From d66884403f05330a98875249cf7873ea02bad144 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 21 May 2024 13:32:25 +0200
Subject: [PATCH 1/2] PHPStan 1.11.1 (#11466)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c43da335c67..7642119992d 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/annotations": "^1.13 || ^2",
         "doctrine/coding-standard": "^9.0.2 || ^12.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.10.59",
+        "phpstan/phpstan": "~1.4.10 || 1.11.1",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",

From d31aabb40c71020e92f8606eae9b98954e490bc5 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 21 May 2024 14:21:50 +0200
Subject: [PATCH 2/2] Psalm 5.24.0 (#11467)

---
 composer.json      |  2 +-
 psalm-baseline.xml | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 7642119992d..ebf92996079 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0",
         "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2 || ^7.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "vimeo/psalm": "4.30.0 || 5.22.2"
+        "vimeo/psalm": "4.30.0 || 5.24.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 3.0"
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 6c70101de13..7858eafcbae 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
   <file src="src/AbstractQuery.php">
     <DeprecatedClass>
       <code><![CDATA[IterableResult]]></code>
@@ -380,6 +380,9 @@
       <code><![CDATA[serialize]]></code>
       <code><![CDATA[unserialize]]></code>
     </MethodSignatureMustProvideReturnType>
+    <ParamNameMismatch>
+      <code><![CDATA[$serialized]]></code>
+    </ParamNameMismatch>
   </file>
   <file src="src/Id/TableGenerator.php">
     <PossiblyFalseOperand>
@@ -2341,9 +2344,6 @@
     <InvalidReturnType>
       <code><![CDATA[ObjectRepository]]></code>
     </InvalidReturnType>
-    <TypeDoesNotContainType>
-      <code><![CDATA[$repository instanceof EntityRepository]]></code>
-    </TypeDoesNotContainType>
     <UnsafeInstantiation>
       <code><![CDATA[new $repositoryClassName($entityManager, $metadata)]]></code>
     </UnsafeInstantiation>
@@ -2514,6 +2514,11 @@
     <PossiblyNullArgument>
       <code><![CDATA[$variableType]]></code>
     </PossiblyNullArgument>
+    <PossiblyUndefinedArrayOffset>
+      <code><![CDATA[$fieldMapping['declaredField']]]></code>
+      <code><![CDATA[$fieldMapping['declaredField']]]></code>
+      <code><![CDATA[$fieldMapping['declaredField']]]></code>
+    </PossiblyUndefinedArrayOffset>
     <PropertyNotSetInConstructor>
       <code><![CDATA[$classToExtend]]></code>
     </PropertyNotSetInConstructor>