From 3886af3a2f82111d65b01fbe3e733b62c99254df Mon Sep 17 00:00:00 2001
From: core23 <mail@core23.de>
Date: Thu, 21 Dec 2023 15:10:40 +0100
Subject: [PATCH] Bump to symfony ^6.4 || ^7.0

---
 .github/workflows/continuous-integration.yml |  1 +
 composer.json                                | 16 ++++++++--------
 phpstan-baseline.neon                        |  5 +++++
 psalm-baseline.xml                           |  8 +++++++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 77b884d..d951a5f 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -13,5 +13,6 @@ jobs:
     uses: "nucleos/actions/.github/workflows/continuous-integration.yml@main"
     with:
       PHP_EXTENSIONS: "mbstring"
+      SYMFONY_VERSIONS: "6.4,7.0"
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/composer.json b/composer.json
index 99888db..8893617 100644
--- a/composer.json
+++ b/composer.json
@@ -43,18 +43,18 @@
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/expression-language": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2"
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/expression-language": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/http-foundation": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.0.1",
         "nyholm/psr7": "^1.0",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/http-client": "^5.4 || ^6.2"
+        "symfony/browser-kit": "^6.4 || ^7.0",
+        "symfony/http-client": "^6.4 || ^7.0"
     },
     "suggest": {
         "cache/adapter-bundle": "Symfony cache adapter",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e353aad..3778867 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Method Nucleos\\\\SetlistFmBundle\\\\NucleosSetlistFmBundle\\:\\:getContainerExtension\\(\\) should return Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\|null but returns Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\|false\\.$#"
+			count: 1
+			path: src/NucleosSetlistFmBundle.php
+
 		-
 			message: "#^Method Nucleos\\\\SetlistFmBundle\\\\Tests\\\\App\\\\AppKernel\\:\\:configureContainer\\(\\) has parameter \\$container with no type specified\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index ecbd3ec..3019799 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591"/>
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
+  <file src="src/NucleosSetlistFmBundle.php">
+    <FalsableReturnStatement>
+      <code><![CDATA[$this->extension]]></code>
+    </FalsableReturnStatement>
+  </file>
+</files>