From 7966f17c964dbcf5a53da60d342c11a590b149e2 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Tue, 28 Nov 2023 20:03:31 +0100
Subject: [PATCH] Allow Symfony 7 (#425)

* Allow Symfony 7

* Drop PHPStan dep - we don't use it directly

* Revert "Drop PHPStan dep - we don't use it directly"

This reverts commit 4ee2282ed454fc036c74dbee5fcd374e593e44d9.

* Add void return type for eraseCredentials()
---
 composer.json                                 | 22 +++++++++----------
 src/Security/User/OAuthUser.php               |  2 +-
 .../Authenticator/SocialAuthenticatorTest.php |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 1899c15d..6b2e1f84 100644
--- a/composer.json
+++ b/composer.json
@@ -14,25 +14,25 @@
     ],
     "require": {
         "php": ">=7.4",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-        "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-        "symfony/routing": "^4.4|^5.0|^6.0",
-        "symfony/http-foundation": "^4.4|^5.0|^6.0",
+        "symfony/framework-bundle": "^4.4|^5.0|^6.0|^7.0",
+        "symfony/dependency-injection": "^4.4|^5.0|^6.0|^7.0",
+        "symfony/routing": "^4.4|^5.0|^6.0|^7.0",
+        "symfony/http-foundation": "^4.4|^5.0|^6.0|^7.0",
         "league/oauth2-client": "^2.0"
     },
+    "require-dev": {
+        "league/oauth2-facebook": "^1.1|^2.0",
+        "symfony/phpunit-bridge": "^5.3.1|^6.0|^7.0",
+        "symfony/security-guard": "^4.4|^5.0|^6.0|^7.0",
+        "symfony/yaml": "^4.4|^5.0|^6.0|^7.0",
+        "phpstan/phpstan": "^0.12"
+    },
     "autoload": {
         "psr-4": { "KnpU\\OAuth2ClientBundle\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "KnpU\\OAuth2ClientBundle\\Tests\\": "tests/" }
     },
-    "require-dev": {
-        "league/oauth2-facebook": "^1.1|^2.0",
-        "symfony/phpunit-bridge": "^5.3.1|^6.0",
-        "symfony/security-guard": "^4.4|^5.0|^6.0",
-        "symfony/yaml": "^4.4|^5.0|^6.0",
-        "phpstan/phpstan": "^0.12"
-    },
     "suggest": {
         "symfony/security-guard": "For integration with Symfony's Guard Security layer"
     },
diff --git a/src/Security/User/OAuthUser.php b/src/Security/User/OAuthUser.php
index b3c4ad71..ed21b591 100644
--- a/src/Security/User/OAuthUser.php
+++ b/src/Security/User/OAuthUser.php
@@ -51,7 +51,7 @@ public function getUsername(): string
         return $this->username;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
         // Do nothing.
     }
diff --git a/tests/Security/Authenticator/SocialAuthenticatorTest.php b/tests/Security/Authenticator/SocialAuthenticatorTest.php
index 5dbc233b..5a26d3f5 100644
--- a/tests/Security/Authenticator/SocialAuthenticatorTest.php
+++ b/tests/Security/Authenticator/SocialAuthenticatorTest.php
@@ -141,7 +141,7 @@ public function getUsername(): string
     {
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }