From 1da7b4116c76e29de540c76033c712f7a429e49e Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Mon, 27 Nov 2023 15:28:04 -0500
Subject: [PATCH 1/5] feat: Symfony 7 support

---
 .github/workflows/ci.yml | 5 ++++-
 composer.json            | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6baf9f8..6d1a26a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,10 @@ jobs:
       max-parallel: 10
       matrix:
         php: [ '8.1', '8.2', '8.3']
-        sf_version: [ '5.4.*', '6.4.*']
+        sf_version: [ '5.4.*', '6.4.*', '7.*' ]
+        exclude:
+          - php: 8.1
+            sf_version: '7.*'
 
     steps:
       - name: Set up PHP
diff --git a/composer.json b/composer.json
index 3755bfe..682ecd3 100644
--- a/composer.json
+++ b/composer.json
@@ -17,13 +17,13 @@
     "require": {
         "php": ">=8.1",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0"
+        "symfony/config": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "nyholm/symfony-bundle-test": "^2.0",
-        "symfony/phpunit-bridge": "^6.4.11"
+        "symfony/phpunit-bridge": "^6.0 || ^7.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

From eaaf97b40ea3bdbd0012324ca620acd922f5de19 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 8 Oct 2024 19:33:31 +0200
Subject: [PATCH 2/5] chore: trigger ci


From 0109098e23aa9b1647d8afaaf7d1807d3ad33565 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 8 Oct 2024 19:54:40 +0200
Subject: [PATCH 3/5] fix

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 682ecd3..f4b255f 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "nyholm/symfony-bundle-test": "^2.0",
-        "symfony/phpunit-bridge": "^6.0 || ^7.0"
+        "symfony/phpunit-bridge": "^6.4.11 || ^7.1.4"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

From 58e10ffd3b497f99209e28fdf2ce7efad6c366ba Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 8 Oct 2024 19:55:17 +0200
Subject: [PATCH 4/5] support test-bundle 3.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f4b255f..8737a2f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "nyholm/symfony-bundle-test": "^2.0",
+        "nyholm/symfony-bundle-test": "^2.0 || ^3.0",
         "symfony/phpunit-bridge": "^6.4.11 || ^7.1.4"
     },
     "minimum-stability": "dev",

From f4d9f70e73650024b0360943109d562e21f0afaa Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 8 Oct 2024 19:56:54 +0200
Subject: [PATCH 5/5] fix psalm

---
 psalm.baseline.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/psalm.baseline.xml b/psalm.baseline.xml
index d90c9cd..3679ce3 100644
--- a/psalm.baseline.xml
+++ b/psalm.baseline.xml
@@ -5,6 +5,11 @@
       <code><![CDATA[children]]></code>
     </UndefinedMethod>
   </file>
+  <file src="src/DependencyInjection/HappyrServiceMockingExtension.php">
+    <InternalClass>
+      <code><![CDATA[Extension]]></code>
+    </InternalClass>
+  </file>
   <file src="src/ServiceMock.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[getWrappedValueHolderValue]]></code>