From 02e10ce3819403e9435ac2d1285d140f48ecbe11 Mon Sep 17 00:00:00 2001
From: jmsche <contact@jmsche.fr>
Date: Mon, 24 Jul 2023 11:48:15 +0200
Subject: [PATCH] Allow Symfony 7

---
 composer.json                                    | 16 ++++++++--------
 psalm-baseline.xml                               |  8 ++++++++
 psalm.xml                                        |  5 ++++-
 tests/EventListener/ExceptionListenerTest.php    |  2 +-
 .../PreLoadAssetsEventListenerTest.php           |  4 ++--
 tools/psalm/composer.json                        |  2 +-
 6 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 psalm-baseline.xml

diff --git a/composer.json b/composer.json
index 22c430b0..882467a7 100644
--- a/composer.json
+++ b/composer.json
@@ -11,17 +11,17 @@
     ],
     "require": {
         "php": ">=8.1.0",
-        "symfony/asset": "^5.4 || ^6.2",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
+        "symfony/asset": "^5.4 || ^6.2 || ^7.0",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
         "symfony/service-contracts": "^1.1.9 || ^2.1.3 || ^3.0"
     },
     "require-dev": {
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/phpunit-bridge": "^5.4 || ^6.2",
-        "symfony/twig-bundle": "^5.4 || ^6.2",
-        "symfony/web-link": "^5.4 || ^6.2"
+        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.2 || ^7.0",
+        "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/web-link": "^5.4 || ^6.2 || ^7.0"
     },
     "minimum-stability": "dev",
     "autoload": {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 00000000..a71db35e
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+  <file src="src/DependencyInjection/Configuration.php">
+    <UndefinedMethod>
+      <code>children</code>
+    </UndefinedMethod>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
index 4e61c12e..d46c3c9b 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,7 +5,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    phpVersion="8.0"
+    phpVersion="8.1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/tests/EventListener/ExceptionListenerTest.php b/tests/EventListener/ExceptionListenerTest.php
index cd7c7eb3..8bd16c4a 100644
--- a/tests/EventListener/ExceptionListenerTest.php
+++ b/tests/EventListener/ExceptionListenerTest.php
@@ -46,7 +46,7 @@ public function testItResetsAllEntrypointLookups()
         $event = new $exceptionEventClass(
             $this->createMock(HttpKernelInterface::class),
             $request,
-            HttpKernelInterface::MASTER_REQUEST,
+            HttpKernelInterface::MAIN_REQUEST,
             $exception
         );
         $listener = new ExceptionListener($entrypointLookupCollection, $buildNames);
diff --git a/tests/EventListener/PreLoadAssetsEventListenerTest.php b/tests/EventListener/PreLoadAssetsEventListenerTest.php
index 696bb607..f0eb1002 100644
--- a/tests/EventListener/PreLoadAssetsEventListenerTest.php
+++ b/tests/EventListener/PreLoadAssetsEventListenerTest.php
@@ -33,7 +33,7 @@ public function testItPreloadsAssets()
 
         $request = new Request();
         $response = new Response();
-        $event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
         $listener = new PreLoadAssetsEventListener($tagRenderer);
         $listener->onKernelResponse($event);
         $this->assertTrue($request->attributes->has('_links'));
@@ -68,7 +68,7 @@ public function testItReusesExistingLinkProvider()
         $request->attributes->set('_links', $linkProvider);
 
         $response = new Response();
-        $event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
         $listener = new PreLoadAssetsEventListener($tagRenderer);
         $listener->onKernelResponse($event);
         /** @var GenericLinkProvider|FigGenericLinkProvider $linkProvider */
diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
index c8f552a4..d4484213 100644
--- a/tools/psalm/composer.json
+++ b/tools/psalm/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "vimeo/psalm": "^4.23.0"
+        "vimeo/psalm": "^5.13.1"
     }
 }