Fix static analysis

Author: ajgarlag

composer.json

@@ -35,7 +35,7 @@
         "doctrine/orm": "^2.14|^3.0",
         "php-cs-fixer/shim": "^3.38",
         "phpstan/phpstan": "^2.1",
-        "phpstan/phpstan-symfony": "2.0",
+        "phpstan/phpstan-symfony": "^2.0",
         "symfony/browser-kit": "^6.4|^7.0|^8.0",
         "symfony/phpunit-bridge": "^7.3"
     },

src/DependencyInjection/Configuration.php

@@ -7,12 +7,16 @@
 use Defuse\Crypto\Key;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 final class Configuration implements ConfigurationInterface
 {
+    /**
+     * @return TreeBuilder<'array'>
+     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('league_oauth2_server');
@@ -36,6 +40,9 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
+    /**
+     * @return ArrayNodeDefinition<TreeBuilder<'array'>>
+     */
     private function createAuthorizationServerNode(): NodeDefinition
     {
         $treeBuilder = new TreeBuilder('authorization_server');
@@ -121,6 +128,9 @@ private function createAuthorizationServerNode(): NodeDefinition
         return $node;
     }
 
+    /**
+     * @return ArrayNodeDefinition<TreeBuilder<'array'>>
+     */
     private function createResourceServerNode(): NodeDefinition
     {
         $treeBuilder = new TreeBuilder('resource_server');
@@ -146,6 +156,9 @@ private function createResourceServerNode(): NodeDefinition
         return $node;
     }
 
+    /**
+     * @return ArrayNodeDefinition<TreeBuilder<'array'>>
+     */
     private function createScopesNode(): NodeDefinition
     {
         $treeBuilder = new TreeBuilder('scopes');
@@ -176,6 +189,9 @@ private function createScopesNode(): NodeDefinition
         return $node;
     }
 
+    /**
+     * @return ArrayNodeDefinition<TreeBuilder<'array'>>
+     */
     private function createPersistenceNode(): NodeDefinition
     {
         $treeBuilder = new TreeBuilder('persistence');
@@ -240,6 +256,9 @@ private function createPersistenceNode(): NodeDefinition
         return $node;
     }
 
+    /**
+     * @return ArrayNodeDefinition<TreeBuilder<'array'>>
+     */
     private function createClientNode(): NodeDefinition
     {
         $treeBuilder = new TreeBuilder('client');

src/DependencyInjection/Security/OAuth2Factory.php

@@ -6,7 +6,9 @@
 
 use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -45,6 +47,9 @@ public function getKey(): string
         return 'oauth2';
     }
 
+    /**
+     * @param ArrayNodeDefinition<TreeBuilder<'array'>> $builder
+     */
     public function addConfiguration(NodeDefinition $builder): void
     {
     }

src/Security/Authenticator/OAuth2Authenticator.php

@@ -76,7 +76,7 @@ public function authenticate(Request $request): Passport
             /**
              * BC layer for Symfony < 8.0
              */
-            if (is_a(ChainUserProvider::class, AttributesBasedUserProviderInterface::class, true)) {
+            if (is_a(ChainUserProvider::class, AttributesBasedUserProviderInterface::class, true)) { // @phpstan-ignore function.alreadyNarrowedType
                 throw OAuth2AuthenticationFailedException::create('The access token has either an empty or missing "oauth_user_id" attribute.');
             }
         }
@@ -93,7 +93,10 @@ public function authenticate(Request $request): Passport
         $userLoader = function (string $userIdentifier) use ($oauthClientId): UserInterface {
             if (
                 $oauthClientId === $userIdentifier
-                || ('' === $userIdentifier && is_a(ChainUserProvider::class, AttributesBasedUserProviderInterface::class, true)) // BC layer for Symfony < 8.0
+                /**
+                 * BC layer for Symfony < 8.0
+                 */
+                || ('' === $userIdentifier && is_a(ChainUserProvider::class, AttributesBasedUserProviderInterface::class, true)) // @phpstan-ignore function.alreadyNarrowedType
             ) {
                 return new ClientCredentialsUser($oauthClientId);
             }