Merge 2.10.x into 2.11.x (#9213)

doctrine · Nov 30, 2021 · f0a20db · f0a20db
2 parents 6857a2e + 15ec77f
commit f0a20db
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -92,6 +92,13 @@
                 <file name="lib/Doctrine/ORM/QueryBuilder.php"/>
             </errorLevel>
         </RedundantCastGivenDocblockType>
+        <!-- Workaround for https://github.com/vimeo/psalm/issues/7026 -->
+        <ReservedWord>
+            <errorLevel type="suppress">
+                <directory name="lib"/>
+                <directory name="tests"/>
+            </errorLevel>
+        </ReservedWord>
         <TypeDoesNotContainType>
             <errorLevel type="suppress">
                 <file name="lib/Doctrine/ORM/Internal/SQLResultCasing.php"/>