From 607f45681e390c213b31b3ec574f1b4df9b18c85 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Sat, 29 Jul 2023 18:03:50 +0200
Subject: [PATCH 1/2] Add phpstan.neon.dist and psalm.xml to .gitattributes

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 7f680d2d2..268f84059 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,5 @@ tests export-ignore
 .github export-ignore
 phpunit.xml.dist export-ignore
 /phpcs.xml.dist export-ignore
+/phpstan.neon.dist export-ignore
+/psalm.xml export-ignore

From 8450e7c1f32c28e87a1fd821ecbff90b441b1b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sat, 29 Jul 2023 18:18:23 +0200
Subject: [PATCH 2/2] Remove no longer needed ignore rules

---
 phpstan.neon.dist | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 748a07b21..beddadc4f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -25,23 +25,15 @@ parameters:
         -
             message: '#^Result of method Doctrine\\Tests\\Common\\Proxy\\LazyLoadableObjectWithVoid::(adding|incrementing)AndReturningVoid\(\) \(void\) is used\.$#'
             path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
-        -
-            message: '#^Property Doctrine\\Tests\\Common\\Proxy\\ProxyLogicTest::\$initializerCallbackMock \(callable\(\): mixed&PHPUnit\\Framework\\MockObject\\MockObject\) does not accept PHPUnit\\Framework\\MockObject\\MockObject&stdClass\.$#'
-            path: 'tests/Common/Proxy/ProxyLogicTest.php'
         -
             message: '#.*LazyLoadableObject.*#'
-            paths:
-               - 'tests/Common/Proxy/ProxyLogicTest.php'
-               - 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
+            path: 'tests/Common/Proxy/ProxyLogicTest.php'
         -
             message: '#^Instantiated class Doctrine\\Tests\\Common\\ProxyProxy\\__CG__\\Doctrine\\Tests\\Common\\Proxy\\.* not found.$#'
             path: 'tests/Common/Proxy/ProxyLogicTest.php'
         -
             message: '#^Instantiated class Doctrine\\Tests\\Common\\ProxyProxy\\__CG__\\Doctrine\\Tests\\Common\\Proxy\\.* not found.$#'
             path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
-        -
-            message: '#^Property Doctrine\\Tests\\Common\\Proxy\\ProxyLogicVoidReturnTypeTest::\$initializerCallbackMock \(callable\(\): mixed&PHPUnit\\Framework\\MockObject\\MockObject\) does not accept PHPUnit\\Framework\\MockObject\\MockObject&stdClass\.$#'
-            path: 'tests/Common/Proxy/ProxyLogicVoidReturnTypeTest.php'
         -
             message: '#^Method Doctrine\\Tests\\Common\\Proxy\\MagicIssetClassWithInteger::__isset\(\) should return bool but returns int\.$#'
             path: 'tests/Common/Proxy/MagicIssetClassWithInteger.php'