From b0c7993dd6ef788bb8cde13888fcd01e068eb7b6 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 29 Jun 2021 15:08:49 +0200
Subject: [PATCH] Ignore errors about missing ReturnTypeWillChange class

Signed-off-by: Alexander M. Turek <me@derrabus.de>
---
 .github/workflows/static-analysis.yml | 4 ++--
 phpstan.neon                          | 4 ++++
 psalm.xml                             | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 620f292f44..ea4e67381c 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout code"
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout code"
diff --git a/phpstan.neon b/phpstan.neon
index ce6af483ef..d1ad4ae510 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -12,3 +12,7 @@ parameters:
         Doctrine\ORM\Query\Parser:
             - syntaxError
     phpVersion: 70100
+
+    ignoreErrors:
+        # The class was added in PHP 8.1
+        - '/^Attribute class ReturnTypeWillChange does not exist.$/'
diff --git a/psalm.xml b/psalm.xml
index aed0fd50a0..e900948e2e 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -28,6 +28,12 @@
                 <file name="lib/Doctrine/ORM/Mapping/Driver/AttributeReader.php"/>
             </errorLevel>
         </NullArgument>
+        <UndefinedAttributeClass>
+            <errorLevel type="suppress">
+                <!-- The class was added in PHP 8.1 -->
+                <referencedClass name="ReturnTypeWillChange"/>
+            </errorLevel>
+        </UndefinedAttributeClass>
         <UndefinedClass>
             <errorLevel type="suppress">
                 <referencedClass name="Doctrine\Common\Cache\ApcCache"/>