From 511d76d4bea0590bf8d1aaba62144b890998f66e Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Wed, 2 Mar 2022 14:24:32 +0100
Subject: [PATCH] Bump symfony dependencies

---
 composer.json |  8 ++++----
 psalm.xml     | 32 ++------------------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index 71b43bd..9cc6a28 100644
--- a/composer.json
+++ b/composer.json
@@ -34,10 +34,10 @@
     "contao/core-bundle": "^4.9",
     "hofff/contao-selectri": "^4.0",
     "netzmacht/contao-page-context": "^1.0",
-    "symfony/config": "^3.3 || ^4.0",
-    "symfony/dependency-injection": "^3.3 || ^4.0",
-    "symfony/http-foundation": "^3.3 || ^4.0",
-    "symfony/http-kernel": "^3.3 || ^4.0"
+    "symfony/config": "^4.4 || ^5.0",
+    "symfony/dependency-injection": "^4.4 || ^5.0",
+    "symfony/http-foundation": "^4.4 || ^5.0",
+    "symfony/http-kernel": "^4.4 || ^5.0"
   },
   "require-dev": {
     "contao/manager-plugin": "^2.0",
diff --git a/psalm.xml b/psalm.xml
index cb4acdb..22567fd 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -24,6 +24,8 @@
             <errorLevel type="suppress">
                 <!-- We need a new major version to get rid of it -->
                 <referencedMethod name="Contao\ModuleLoader::getActive"/>
+                <!-- We support Symfony 4.4 and cannot blindly follow Symfony approach to build a better world here -->
+                <referencedMethod name="Symfony\Component\HttpFoundation\RequestStack::getMasterRequest"/>
             </errorLevel>
         </DeprecatedMethod>
         <InternalMethod>
@@ -41,34 +43,4 @@
         <class name="Contao\Template"/>
         <class name="Contao\Widget"/>
     </universalObjectCrates>
-
-<!--    <issueHandlers>-->
-<!--        <InternalMethod>-->
-<!--            <errorLevel type="suppress">-->
-<!--                <referencedMethod name="Contao\CoreBundle\Framework\Adapter::__call"/>-->
-<!--                <referencedMethod name="Contao\CoreBundle\Framework\ContaoFramework::initialize"/>-->
-<!--                <referencedMethod name="Contao\CoreBundle\Framework\ContaoFramework::createInstance"/>-->
-<!--                <referencedMethod name="Contao\CoreBundle\Framework\ContaoFramework::getAdapter"/>-->
-<!--            </errorLevel>-->
-<!--        </InternalMethod>-->
-<!--        <DeprecatedMethod>-->
-<!--            <errorLevel type="suppress">-->
-<!--                &lt;!&ndash; Required as long as we support doctrine/dbal ^2.11 | Contao 4.9 &ndash;&gt;-->
-<!--                <referencedMethod name="Doctrine\DBAL\Query\QueryBuilder::execute"/>-->
-<!--            </errorLevel>-->
-<!--        </DeprecatedMethod>-->
-<!--        <UndefinedDocblockClass>-->
-<!--            <errorLevel type="suppress">-->
-<!--                &lt;!&ndash; Depending if doctrine/dbal 2 or 3 is installed &ndash;&gt;-->
-<!--                <referencedClass name="Doctrine\DBAL\ForwardCompatibility\Result"/>-->
-<!--                <referencedClass name="Doctrine\DBAL\Result"/>-->
-<!--            </errorLevel>-->
-<!--        </UndefinedDocblockClass>-->
-<!--    </issueHandlers>-->
-
-<!--    <universalObjectCrates>-->
-<!--        <class name="Contao\BackendTemplate"/>-->
-<!--        <class name="Contao\FrontendTemplate"/>-->
-<!--        <class name="Contao\PageModel"/>-->
-<!--    </universalObjectCrates>-->
 </psalm>