Added support for Symfony 5.4

.gitignore

@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+.phpunit.result.cache

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.0.0 2024-02-08
+### Added 
+- Added support for Symfony ^5.4
+
 ## 1.0.2
 ### Added
 - Deprecated \Symfony\Component\DependencyInjection\DefinitionDecorator class removed and 

README.md

@@ -12,22 +12,51 @@ $bundles = [
 
 ## Samples
 
-Sample `security.yml`
-```yml
+Sample `security.yml` for symfony 3/4
+```yaml
 security:
     providers:
         bearer_user:
             id: paysera_bearer_authentication.security_user.bearer_user_provider
 
     firewalls:
         bearer_secured:
-            patter: ^/api/
+            pattern: ^/api/
             stateless: true
             bearer: true
 ```
 
+Sample security.yml for Symfony 5
+```yaml
+security:
+    enable_authenticator_manager: true
+    providers:
+      bearer_user:
+            id: paysera_bearer_authentication.security_user.bearer_user_provider    
+
+    firewalls:
+      bearer_secured:
+            pattern: ^/api
+            stateless: true
+            custom_authenticators:
+                - paysera_bearer_authentication.authenticator.bearer_passport
+            provider: bearer_user
+
+    access_control:
+        # require ROLE_ADMIN for /admin*
+        - { path: '^/api', roles: ROLE_ADMIN }
+```
+
 All bearer handlers must be tagged with:
 ```xml
 <tag name="paysera_bearer_authentication.handler" />
 ```
 and implement `\Paysera\BearerAuthenticationBundle\Security\User\HandlerInterface` 
+
+Example of a handler services.yaml
+```yaml
+    paysera_auth_token.security.auth_token_handler:
+        class: 'App\Services\BearerHandler'
+        tags:
+            - { name: 'paysera_bearer_authentication.handler' }
+```

composer.json

@@ -7,8 +7,12 @@
     }
   },
   "require": {
-    "php": ">=5.5",
-    "symfony/symfony": "^2.8 || ^3.0 || ^4.0",
-    "paysera/lib-dependency-injection": "^1.0"
+    "php": ">= 7.4",
+    "symfony/security-bundle": "^v5.4",
+    "symfony/http-kernel": "^v5.4",
+    "paysera/lib-dependency-injection": "^1.4"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.6|^10.0"
   }
 }

phpunit.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" cacheResult="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+    <testsuites>
+        <testsuite name="Package test suite">
+            <directory>Tests</directory>
+            <directory>Tests/*</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/DependencyInjection/Configuration.php

@@ -15,18 +15,8 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder('paysera_bearer_authentication');
-        $rootNode = method_exists($treeBuilder, 'getRootNode')
-            ? $treeBuilder->getRootNode()
-            : $treeBuilder->root('paysera_bearer_authentication')
-        ;
-
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
-
-        return $treeBuilder;
+        return new TreeBuilder('paysera_bearer_authentication');
     }
 }

src/DependencyInjection/PayseraBearerAuthenticationExtension.php

@@ -1,26 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-/**
- * This is the class that loads and manages your bundle configuration.
- *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
- */
 class PayseraBearerAuthenticationExtension extends Extension
 {
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+        $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');

src/DependencyInjection/Security/Factory/BearerFactory.php

@@ -1,50 +1,39 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\DependencyInjection\Security\Factory;
 
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 
-class BearerFactory implements SecurityFactoryInterface
+class BearerFactory implements AuthenticatorFactoryInterface
 {
-    public function create(
-        ContainerBuilder $container,
-        $id,
-        $config,
-        $userProvider,
-        $defaultEntryPoint
-    ) {
-        $providerId = 'security.authentication.provider.bearer.'.$id;
-        $container
-            ->setDefinition(
-                $providerId,
-                new ChildDefinition('paysera_bearer_authentication.security_authentication_provider.bearer_provider')
-            )
-            ->replaceArgument(0, new Reference($userProvider));
-
-        $listenerId = 'security.authentication.listener.bearer.'.$id;
-        $listener = $container->setDefinition(
-            $listenerId,
-            new ChildDefinition('paysera_bearer_authentication.listener.bearer_listener')
-        );
-
-        return [$providerId, $listenerId, $defaultEntryPoint];
+    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
+    {
+        $authenticatorId = 'security.authentication.provider.bearer.' . $firewallName;
+
+        $authenticator = (new ChildDefinition('paysera_bearer_authentication.authenticator.bearer_passport'));
+
+        $container->setDefinition($authenticatorId, $authenticator);
+
+        return $authenticatorId;
     }
 
-    public function getPosition()
+    public function getPriority(): int
     {
-        return 'pre_auth';
+        return -10;
     }
 
-    public function getKey()
+    public function getKey(): string
     {
         return 'bearer';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $builder): void
     {
 
     }

src/Entity/BearerUser.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle\Entity;
 
 class BearerUser implements BearerUserInterface
 {
-    private $username;
-    private $token;
-    private $roles;
+    private string $username;
+    private string $token;
+    private array $roles;
 
     public function __construct($username, $token, array $roles = [])
     {
@@ -15,32 +17,35 @@ public function __construct($username, $token, array $roles = [])
         $this->roles = $roles;
     }
 
-    public function getRoles()
+    public function getRoles(): array
     {
         return $this->roles;
     }
 
-    public function getPassword()
+    public function getPassword(): ?string
     {
         // bearer has token
+        return null;
     }
 
-    public function getSalt()
+    public function getSalt(): ?string
     {
         // no salt
+
+        return null;
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
         return $this->username;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
 
     }
 
-    public function getToken()
+    public function getToken(): string
     {
         return $this->token;
     }

src/Entity/BearerUserInterface.php

@@ -6,8 +6,5 @@
 
 interface BearerUserInterface extends UserInterface
 {
-    /**
-     * @return string
-     */
-    public function getToken();
+    public function getToken(): string;
 }

src/PayseraBearerAuthenticationBundle.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Paysera\BearerAuthenticationBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -9,12 +11,12 @@
 
 class PayseraBearerAuthenticationBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
         $extension = $container->getExtension('security');
-        $extension->addSecurityListenerFactory(new BearerFactory());
+        $extension->addAuthenticatorFactory(new BearerFactory());
 
         $container->addCompilerPass(new AddTaggedCompilerPass(
             'paysera_bearer_authentication.security_user.bearer_user_provider',

src/Resources/config/services.xml

@@ -6,6 +6,5 @@
 
     <imports>
         <import resource="services/security.xml"/>
-        <import resource="services/listeners.xml"/>
     </imports>
 </container>