Merge branch '4.0'

.gitignore

@@ -4,3 +4,5 @@ vendor/
 composer.lock
 /.php-cs-fixer.cache
 /.phpunit.result.cache
+
+.DS_Store

.travis.yml

@@ -2,8 +2,8 @@ language: php
 
 sudo: true
 php:
-  - 7.4
   - 8.0
+  - 8.1
 
 service:
   - docker
@@ -12,13 +12,9 @@ service:
 matrix:
   fast_finish: true
   include:
-    - php: 7.4
-      env: SYMFONY_VERSION=5.4.*
     - php: 8.0
-      env: SYMFONY_VERSION=5.4.*
-    - php: 7.4
       env: SYMFONY_VERSION=6.0.*
-    - php: 8.0
+    - php: 8.1
       env: SYMFONY_VERSION=6.0.*
 
 cache:

Controller/AuthorizeController.php

@@ -185,7 +185,7 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for
         try {
             return $this->oAuth2Server
                 ->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope())
-                ;
+            ;
         } catch (OAuth2ServerException $e) {
             return $e->getHttpResponse();
         }

README.md

@@ -12,8 +12,8 @@ The bulk of the documentation is stored in the `Resources/doc/index.md` file in
 
 ## Repository history
 
-This repository has been created to remove the deprecated warnings on Symfony 4.2 since several pull requests were not reviewed on FriendsOfSymfony/FOSOAuthServerBundle.
-It is actively maintained and works on Symfony 5 (branch 3.0) and Symfony 6 will come soon (branch 4.0).
+This repository has been initialy created to remove the deprecated warnings on Symfony 4.2 since several pull requests were not reviewed on FriendsOfSymfony/FOSOAuthServerBundle.
+It is actively maintained and works on Symfony 5 (branch 3.0) and Symfony 6 (branch 4.0).
 
 Feel free to PR.
 
@@ -26,7 +26,9 @@ This bundle is under the MIT license. See the complete license in the bundle:
 
 ## TODO
 
-- More tests
+Even if this bundle works perfectly in my professionnal application, I would like to :
+- bring back Travis CI to green
+- make phpunit tests works again
 
 
 ## Credits

Security/Authenticator/Oauth2Authenticator.php

@@ -28,6 +28,7 @@
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Http\Authenticator\AbstractAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
 use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
 
@@ -60,7 +61,7 @@ public function supports(Request $request): ?bool
     /**
      * {@inheritDoc}
      */
-    public function authenticate(Request $request): PassportInterface
+    public function authenticate(Request $request): Passport
     {
         try {
             $tokenString = str_replace('Bearer ', '', $request->headers->get('Authorization'));

composer.json

@@ -20,12 +20,12 @@
         }
     ],
     "require": {
-        "php": "^7.4.25|^8.0",
+        "php": "^8.0",
         "klapaudius/oauth2-php": "~1.4",
-        "symfony/dependency-injection": "~5.3|~6.0",
-        "symfony/framework-bundle": "~5.3|~6.0",
-        "symfony/security-bundle": "~5.3|~6.0",
-        "symfony/twig-bundle": "~5.3|~6.0"
+        "symfony/dependency-injection": "~6.0",
+        "symfony/framework-bundle": "~6.0",
+        "symfony/security-bundle": "~6.0",
+        "symfony/twig-bundle": "~6.0"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "~2.0",
@@ -37,11 +37,11 @@
         "phpstan/phpstan-phpunit": "^0.12.20",
         "phpunit/phpunit": "~6.0|~8.0",
         "symfony/class-loader": "^2.0",
-        "symfony/console": "^5.3",
-        "symfony/form": "^5.3",
-        "symfony/phpunit-bridge": "^5.3",
-        "symfony/templating": "^5.3",
-        "symfony/yaml": "^5.3"
+        "symfony/console": "~6.0",
+        "symfony/form": "~6.0",
+        "symfony/phpunit-bridge": "~6.0",
+        "symfony/templating": "~6.0",
+        "symfony/yaml": "~6.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "*",