From ef3a63c779eec2f586442af33902cf9e2439cc59 Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <fbourigault@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:11:38 +0100
Subject: [PATCH] Workaround null & mixed being ReservedWords

Symfony 6 added return types to most of it's signatures.

This is reported as ReservedWords by Psalm.

See https://github.com/vimeo/psalm/issues/7026 and https://github.com/doctrine/dbal/pull/5053 for more context.
---
 psalm.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/psalm.xml b/psalm.xml
index b4cc1ed63c..c94971208d 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -31,5 +31,15 @@
                 <referencedMethod name="Symfony\Component\Config\Definition\Builder\TreeBuilder::root"/>
             </errorLevel>
         </UndefinedMethod>
+        <!-- Workaround for https://github.com/vimeo/psalm/issues/7026 -->
+        <ReservedWord errorLevel="suppress">
+            <errorLevel type="suppress">
+                <file name="src/Propel/Common/Config/ConfigurationManager.php" />
+                <file name="src/Propel/Common/Config/Loader/YamlFileLoader.php" />
+                <file name="src/Propel/Common/Config/PropelConfiguration.php" />
+                <file name="src/Propel/Generator/Behavior/Validate/ValidateBehavior.php" />
+                <file name="src/Propel/Runtime/Parser/YamlParser.php" />
+            </errorLevel>
+        </ReservedWord>
     </issueHandlers>
 </psalm>